diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000000..a0e39ffd165
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,47 @@
+*.iml
+out/
+*.ipr
+*.iws
+classpath.txt
+version.properties
+.project
+.classpath
+lib/*
+build/*
+generated-files/*
+generated-sources/*
+generated-code/*
+*.swp
+*.swo
+
+/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-java/hello.txt
+samples/client/petstore/objc/Build
+samples/client/petstore/objc/Pods
+samples/server/petstore/nodejs/node_modules
+target
+.idea
+.lib
+atlassian-ide-plugin.xml
+.DS_Store
+
+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/
diff --git a/.gitignore b/.gitignore
index 8f160116e5b..b4d421e3c55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ version.properties
 lib/*
 build/*
 generated-files/*
+generated-sources/*
 generated-code/*
 *.swp
 *.swo
@@ -30,8 +31,10 @@ samples/client/petstore/qt5cpp/PetStore/PetStore
 samples/client/petstore/qt5cpp/PetStore/Makefile
 samples/client/petstore/java/hello.txt
 samples/client/petstore/android-java/hello.txt
-samples/client/petstore/objc/Build
-samples/client/petstore/objc/Pods
+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
 target
 .idea
@@ -41,3 +44,9 @@ atlassian-ide-plugin.xml
 
 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/
diff --git a/.travis.yml b/.travis.yml
index 73c80821ba5..73dc7fdd26d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 sudo: false
 language: java
-script: mvn verify
+script: mvn verify -Psamples
 jdk:
   - oraclejdk7
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000000..0a3d093290e
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,13 @@
+FROM maven:3.3-jdk-7
+
+WORKDIR /src
+VOLUME  /src
+VOLUME  /root/.m2/repository
+
+ADD . /opt/swagger-codegen
+
+RUN cd /opt/swagger-codegen && mvn package
+
+ENTRYPOINT ["java", "-jar", "/opt/swagger-codegen/modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"]
+
+CMD ["help"]
diff --git a/README.md b/README.md
index a0045247e7a..f288e847b09 100644
--- a/README.md
+++ b/README.md
@@ -7,15 +7,34 @@ This is the swagger codegen project, which allows generation of client libraries
 
 Check out [Swagger-Spec](https://github.com/swagger-api/swagger-spec) for additional information about the Swagger project, including additional libraries with support for other languages and more. 
 
+## Build and run using docker
+
+```
+git clone https://github.com/swagger-api/swagger-codegen
+
+cd swagger-codegen
+
+./run-in-docker.sh mvn package
+ ```
+
+Build a nodejs server stub:
+
+ ```
+./run-in-docker.sh generate \
+  -i http://petstore.swagger.io/v2/swagger.json \
+  -l nodejs \
+  -o samples/server/petstore/nodejs
+ ```
 
 ## Compatibility
 The Swagger Specification has undergone 3 revisions since initial creation in 2010.  The swagger-codegen project has the following compatibilies with the swagger specification:
 
-Swagger Codegen Version | Release Date | Swagger Spec compatibility | Notes
------------------------ | ------------ | -------------------------- | -----
-2.1.2                   | 2015-06-09   | 1.0, 1.1, 1.2, 2.0   | [master](https://github.com/swagger-api/swagger-codegen)
-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)
+Swagger Codegen Version    | Release Date | Swagger Spec compatibility | Notes
+-------------------------- | ------------ | -------------------------- | -----
+2.1.4-SNAPSHOT                      |              | 1.0, 1.1, 1.2, 2.0   | [master](https://github.com/swagger-api/swagger-codegen)
+2.1.3 (**current stable**) | 2015-08-24   | 1.0, 1.1, 1.2, 2.0   | [tag v2.1.3](https://github.com/swagger-api/swagger-codegen/tree/v2.1.3)
+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
@@ -73,6 +92,7 @@ SYNOPSIS
                 [(-o <output directory> | --output <output directory>)]
                 [(-t <template directory> | --template-dir <template directory>)]
                 [(-v | --verbose)]
+                [(-s | --skip-overwrite)]
 
 OPTIONS
         -a <authorization>, --auth <authorization>
@@ -105,7 +125,11 @@ OPTIONS
 
         -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:
 
@@ -161,11 +185,16 @@ There are different aspects of customizing the code generator beyond just creati
 
 ```
 $ ls -1 modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/
+AbstractTypeScriptClientCodegen.java
 AkkaScalaClientCodegen.java
 AndroidClientCodegen.java
 AsyncScalaClientCodegen.java
 CSharpClientCodegen.java
+CodeGenStatus.java
+CsharpDotNet2ClientCodegen.java
+FlashClientCodegen.java
 JavaClientCodegen.java
+JavaInflectorServerCodegen.java
 JaxRSServerCodegen.java
 NodeJSServerCodegen.java
 ObjcClientCodegen.java
@@ -178,13 +207,17 @@ RetrofitClientCodegen.java
 RubyClientCodegen.java
 ScalaClientCodegen.java
 ScalatraServerCodegen.java
+SilexServerCodegen.java
+SinatraServerCodegen.java
 SpringMVCServerCodegen.java
 StaticDocCodegen.java
 StaticHtmlGenerator.java
 SwaggerGenerator.java
 SwaggerYamlGenerator.java
-SwiftGenerator.java
+SwiftCodegen.java
 TizenClientCodegen.java
+TypeScriptAngularClientCodegen.java
+TypeScriptNodeClientCodegen.java
 ```
 
 Each of these files creates reasonable defaults so you can get running quickly.  But if you want to configure package names, prefixes, model folders, etc. you can use a json config file to pass the values.
@@ -226,6 +259,12 @@ CONFIG OPTIONS
 
 	sourceFolder
 	    source folder for generated code
+
+	library
+	    library template (sub-template) to use:
+	    <default> - HTTP client: Jersey client 1.18. JSON processing: Jackson 2.4.2
+	    jersey2 - HTTP client: Jersey client 2.6
+	    okhttp-gson - HTTP client: OkHttp 2.4.0. JSON processing: Gson 2.3.1
 ```
 
 Your config file for java can look like
diff --git a/bin/all-petstore.sh b/bin/all-petstore.sh
index 8937200c77f..5b044167e7b 100755
--- a/bin/all-petstore.sh
+++ b/bin/all-petstore.sh
@@ -18,19 +18,30 @@ if [ ! -d "${APP_DIR}" ]; then
 fi
 
 cd $APP_DIR
+./bin/akka-scala-petstore.sh
 ./bin/android-java-petstore.sh
 ./bin/csharp-petstore.sh
 ./bin/dynamic-html.sh
 ./bin/html-petstore.sh
-./bin/jaxrs-petstore-server.sh
 ./bin/java-petstore.sh
-./bin/qt5-petstore.sh
+./bin/java-petstore-jersey2.sh
+./bin/java-petstore-okhttp-gson.sh
+./bin/jaxrs-petstore-server.sh
+./bin/nodejs-petstore-server.sh
+./bin/objc-petstore.sh
 ./bin/perl-petstore.sh
 ./bin/php-petstore.sh
 ./bin/python-petstore.sh
+./bin/python3-petstore.sh
+./bin/qt5-petstore.sh
 ./bin/retrofit-petstore.sh
 ./bin/ruby-petstore.sh
-./bin/objc-petstore.sh
+./bin/scala-async-petstore.sh
 ./bin/scala-petstore.sh
+./bin/scalatra-petstore-server.sh
+./bin/silex-petstore-server.sh
 ./bin/spring-mvc-petstore-server.sh
+./bin/swift-petstore.sh
 ./bin/tizen-petstore.sh
+./bin/typescript-angular-petstore.sh
+./bin/typescript-node-petstore.sh
diff --git a/bin/csharp-dotnet2-petstore.sh b/bin/csharp-dotnet2-petstore.sh
new file mode 100755
index 00000000000..fdab8bc413b
--- /dev/null
+++ b/bin/csharp-dotnet2-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 -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l CsharpDotNet2 -o samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient"
+
+java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/csharp-petstore.sh b/bin/csharp-petstore.sh
index a72a6cf84f0..c3fe78f0f36 100755
--- a/bin/csharp-petstore.sh
+++ b/bin/csharp-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 csharp -o samples/client/petstore/csharp"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l csharp -o samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/flash-petstore.sh b/bin/flash-petstore.sh
new file mode 100755
index 00000000000..20d75e8a8ac
--- /dev/null
+++ b/bin/flash-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/flash -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l flash -o samples/client/petstore/flash"
+
+java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/java-inflector-petstore-server.sh b/bin/java-inflector-petstore-server.sh
new file mode 100755
index 00000000000..5200ab26bb1
--- /dev/null
+++ b/bin/java-inflector-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/JavaInflector -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l inflector -o samples/server/petstore/java-inflector"
+
+java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/java-petstore-jersey2.json b/bin/java-petstore-jersey2.json
new file mode 100644
index 00000000000..af343e1d6b8
--- /dev/null
+++ b/bin/java-petstore-jersey2.json
@@ -0,0 +1,4 @@
+{
+    "library": "jersey2",
+    "artifactId": "swagger-petstore-jersey2"
+}
\ No newline at end of file
diff --git a/bin/java-petstore-jersey2.sh b/bin/java-petstore-jersey2.sh
new file mode 100755
index 00000000000..cb51c1e1a8d
--- /dev/null
+++ b/bin/java-petstore-jersey2.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-jersey2.json -o samples/client/petstore/java/jersey2"
+
+java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/java-petstore-okhttp-gson.json b/bin/java-petstore-okhttp-gson.json
new file mode 100644
index 00000000000..b894d172630
--- /dev/null
+++ b/bin/java-petstore-okhttp-gson.json
@@ -0,0 +1,4 @@
+{
+    "library": "okhttp-gson",
+    "artifactId": "swagger-petstore-okhttp-gson"
+}
diff --git a/bin/java-petstore-okhttp-gson.sh b/bin/java-petstore-okhttp-gson.sh
new file mode 100755
index 00000000000..17a48ddee53
--- /dev/null
+++ b/bin/java-petstore-okhttp-gson.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-okhttp-gson.json -o samples/client/petstore/java/okhttp-gson"
+
+java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/java-petstore.sh b/bin/java-petstore.sh
index 3beff2f07ce..f842d9ca3b0 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"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l java -o samples/client/petstore/java/default"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/ruby-petstore.json b/bin/ruby-petstore.json
new file mode 100644
index 00000000000..ddb753471a1
--- /dev/null
+++ b/bin/ruby-petstore.json
@@ -0,0 +1,5 @@
+{
+  "gemName": "petstore",
+  "moduleName": "Petstore",
+  "gemVersion": "1.0.0"
+}
diff --git a/bin/ruby-petstore.sh b/bin/ruby-petstore.sh
index 971cc154fb9..05cf1ee995e 100755
--- a/bin/ruby-petstore.sh
+++ b/bin/ruby-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/ruby -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l ruby -o samples/client/petstore/ruby"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/ruby -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l ruby -c bin/ruby-petstore.json -o samples/client/petstore/ruby"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/silex-petstore-server.sh b/bin/silex-petstore-server.sh
new file mode 100755
index 00000000000..ffa030b88c3
--- /dev/null
+++ b/bin/silex-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/silex -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l silex -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
new file mode 100755
index 00000000000..4f7e19cee39
--- /dev/null
+++ b/bin/sinatra-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/sinatra -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l sinatra -o samples/server/petstore/sinatra"
+
+java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/swift-petstore.json b/bin/swift-petstore.json
new file mode 100644
index 00000000000..700fdeff061
--- /dev/null
+++ b/bin/swift-petstore.json
@@ -0,0 +1,4 @@
+{
+  "projectName": "PetstoreClient",
+  "responseAs": "PromiseKit"
+}
\ No newline at end of file
diff --git a/bin/swift-petstore.sh b/bin/swift-petstore.sh
index ce6a7e702f0..96433e5b72d 100755
--- a/bin/swift-petstore.sh
+++ b/bin/swift-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/swift -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l swift -o samples/client/petstore/swift"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/swift -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l swift -c ./bin/swift-petstore.json -o samples/client/petstore/swift"
 
-java -DappName=PetstoreClient $JAVA_OPTS -jar $executable $ags
+java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/typescript-angular-petstore.sh b/bin/typescript-angular-petstore.sh
new file mode 100755
index 00000000000..60c10790c90
--- /dev/null
+++ b/bin/typescript-angular-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 -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l typescript-angular -o samples/client/petstore/typescript-angular"
+
+java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/typescript-node-petstore.sh b/bin/typescript-node-petstore.sh
new file mode 100755
index 00000000000..53c5a6f8d82
--- /dev/null
+++ b/bin/typescript-node-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 -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l typescript-node -o samples/client/petstore/typescript-node"
+
+java $JAVA_OPTS -jar $executable $ags
diff --git a/modules/swagger-codegen-cli/pom.xml b/modules/swagger-codegen-cli/pom.xml
index 5a9efbdd59d..5193e39531a 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.2</version>
+        <version>2.1.4-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -41,7 +41,7 @@
                 <version>2.3</version>
                 <executions>
                     <execution>
-                        <id>reduced-pom</id>
+                        <id>process-resources</id>
                         <phase>package</phase>
                         <goals>
                             <goal>shade</goal>
@@ -52,15 +52,6 @@
                             <dependencyReducedPomLocation>
                                 ${java.io.tmpdir}/dependency-reduced-pom.xml
                             </dependencyReducedPomLocation>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>process-resources</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
                             <transformers>
                                 <transformer
                                         implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
@@ -79,26 +70,34 @@
             <artifactId>swagger-codegen</artifactId>
             <version>${project.version}</version>
         </dependency>
-
         <!--https://github.com/airlift/airline-->
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>airline</artifactId>
             <version>0.7</version>
         </dependency>
-
         <dependency>
             <groupId>com.googlecode.lambdaj</groupId>
             <artifactId>lambdaj</artifactId>
             <version>2.3.3</version>
         </dependency>
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
             <version>${slf4j-version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>${testng-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jmockit</groupId>
+            <artifactId>jmockit</artifactId>
+            <version>${jmockit-version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/ConfigHelp.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/ConfigHelp.java
index 6b34a4bf56d..f7a128613b9 100644
--- a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/ConfigHelp.java
+++ b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/ConfigHelp.java
@@ -4,10 +4,7 @@
 import io.airlift.airline.Option;
 import io.swagger.codegen.CliOption;
 import io.swagger.codegen.CodegenConfig;
-
-import java.util.ServiceLoader;
-
-import static java.util.ServiceLoader.load;
+import io.swagger.codegen.CodegenConfigLoader;
 
 @Command(name = "config-help", description = "Config help for chosen lang")
 public class ConfigHelp implements Runnable {
@@ -16,36 +13,14 @@ public class ConfigHelp implements Runnable {
             description = "language to get config help for")
     private String lang;
 
-    /**
-     * Tries to load config class with SPI first, then with class name directly from classpath
-     *
-     * @param name name of config, or full qualified class name in classpath
-     * @return config class
-     */
-    private static CodegenConfig forName(String name) {
-        ServiceLoader<CodegenConfig> loader = load(CodegenConfig.class);
-        for (CodegenConfig config : loader) {
-            if (config.getName().equals(name)) {
-                return config;
-            }
-        }
-
-        // else try to load directly
-        try {
-            return (CodegenConfig) Class.forName(name).newInstance();
-        } catch (Exception e) {
-            throw new RuntimeException("Can't load config class with name ".concat(name), e);
-        }
-    }
-
     @Override
     public void run() {
         System.out.println();
-        CodegenConfig config = forName(lang);
+        CodegenConfig config = CodegenConfigLoader.forName(lang);
         System.out.println("CONFIG OPTIONS");
         for (CliOption langCliOption : config.cliOptions()) {
             System.out.println("\t" + langCliOption.getOpt());
-            System.out.println("\t    " + langCliOption.getDescription());
+            System.out.println("\t    " + langCliOption.getDescription().replaceAll("\n", "\n\t    "));
             System.out.println();
         }
     }
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 0d7e94e8f28..d6790a6aa8f 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
@@ -8,16 +8,21 @@
 import io.swagger.codegen.ClientOptInput;
 import io.swagger.codegen.ClientOpts;
 import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenConfigLoader;
+import io.swagger.codegen.CodegenConstants;
 import io.swagger.codegen.DefaultGenerator;
+import io.swagger.codegen.cmd.utils.OptionUtils;
 import io.swagger.models.Swagger;
 import io.swagger.parser.SwaggerParser;
+import org.apache.commons.lang3.tuple.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
-import java.util.ServiceLoader;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
-import static java.util.ServiceLoader.load;
 import static org.apache.commons.lang3.StringUtils.isNotEmpty;
 
 /**
@@ -31,8 +36,6 @@ public class Generate implements Runnable {
 
     public static final Logger LOG = LoggerFactory.getLogger(Generate.class);
 
-    public static final String TEMPLATE_DIR_PARAM = "templateDir";
-
     @Option(name = {"-v", "--verbose"}, description = "verbose mode")
     private boolean verbose;
 
@@ -66,27 +69,46 @@ public class Generate implements Runnable {
             "Supported options can be different for each language. Run config-help -l {lang} command for language specific config options.")
     private String configFile;
 
-    /**
-     * Tries to load config class with SPI first, then with class name directly from classpath
-     *
-     * @param name name of config, or full qualified class name in classpath
-     * @return config class
-     */
-    private static CodegenConfig forName(String name) {
-        ServiceLoader<CodegenConfig> loader = load(CodegenConfig.class);
-        for (CodegenConfig config : loader) {
-            if (config.getName().equals(name)) {
-                return config;
-            }
-        }
+    @Option(name = {"-s", "--skip-overwrite"}, title = "skip overwrite", description = "specifies if the existing files should be " +
+            "overwritten during the generation.")
+    private boolean skipOverwrite;
 
-        // else try to load directly
-        try {
-            return (CodegenConfig) Class.forName(name).newInstance();
-        } catch (Exception e) {
-            throw new RuntimeException("Can't load config class with name ".concat(name), e);
-        }
-    }
+    @Option(name = {"--api-package"}, title = "api package", description = CodegenConstants.API_PACKAGE_DESC)
+    private String apiPackage;
+
+    @Option(name = {"--model-package"}, title = "model package", description = CodegenConstants.MODEL_PACKAGE_DESC)
+    private String modelPackage;
+
+    @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;
+
+    @Option(name = {"--type-mappings"}, title = "type mappings", description = "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")
+    private String typeMappings;
+
+    @Option(name = {"--additional-properties"}, title = "additional properties", description = "sets additional properties that can be referenced by the mustache templates in the format of name=value,name=value")
+    private String additionalProperties;
+
+    @Option(name = {"--language-specific-primitives"}, title = "language specific primitives",
+            description = "specifies additional language specific primitive types in the format of type1,type2,type3,type3. For example: String,boolean,Boolean,Double")
+    private String languageSpecificPrimitives;
+
+    @Option(name = {"--import-mappings"}, title = "import mappings",
+            description = "specifies mappings between a given class and the import that should be used for that class in the format of type=import,type=import")
+    private String importMappings;
+
+    @Option(name = {"--invoker-package"}, title = "invoker package", description = CodegenConstants.INVOKER_PACKAGE_DESC)
+    private String invokerPackage;
+
+    @Option(name = {"--group-id"}, title = "group id", description = CodegenConstants.GROUP_ID_DESC)
+    private String groupId;
+
+    @Option(name = {"--artifact-id"}, title = "artifact id", description = CodegenConstants.ARTIFACT_ID_DESC)
+    private String artifactId;
+
+    @Option(name = {"--artifact-version"}, title = "artifact version", description = CodegenConstants.ARTIFACT_VERSION_DESC)
+    private String artifactVersion;
 
     @Override
     public void run() {
@@ -94,47 +116,92 @@ public void run() {
 
         setSystemProperties();
 
-        ClientOptInput input = new ClientOptInput();
+        CodegenConfig config = CodegenConfigLoader.forName(lang);
 
-        if (isNotEmpty(auth)) {
-            input.setAuth(auth);
-        }
-
-        CodegenConfig config = forName(lang);
         config.setOutputDir(new File(output).getAbsolutePath());
+        config.setSkipOverwrite(skipOverwrite);
+
+        putKeyValuePairsInMap(config.instantiationTypes(), instantiationTypes);
+        putKeyValuePairsInMap(config.typeMapping(), typeMappings);
+        putKeyValuePairsInMap(config.additionalProperties(), additionalProperties);
+        putKeyValuePairsInMap(config.importMapping(), importMappings);
+
+        addValuesToSet(config.languageSpecificPrimitives(), languageSpecificPrimitives);
 
-        if (null != templateDir) {
-            config.additionalProperties().put(TEMPLATE_DIR_PARAM, new File(templateDir).getAbsolutePath());
+        checkAndSetAdditionalProperty(config, apiPackage, CodegenConstants.API_PACKAGE);
+        checkAndSetAdditionalProperty(config, modelPackage, CodegenConstants.MODEL_PACKAGE);
+
+        if(isNotEmpty(templateDir)) {
+            config.additionalProperties().put(CodegenConstants.TEMPLATE_DIR, new File(templateDir).getAbsolutePath());
         }
 
+        checkAndSetAdditionalProperty(config, invokerPackage, CodegenConstants.INVOKER_PACKAGE);
+        checkAndSetAdditionalProperty(config, groupId, CodegenConstants.GROUP_ID);
+        checkAndSetAdditionalProperty(config, artifactId, CodegenConstants.ARTIFACT_ID);
+        checkAndSetAdditionalProperty(config, artifactVersion, CodegenConstants.ARTIFACT_VERSION);
+
         if (null != configFile) {
             Config genConfig = ConfigParser.read(configFile);
             if (null != genConfig) {
                 for (CliOption langCliOption : config.cliOptions()) {
-                    if (genConfig.hasOption(langCliOption.getOpt())) {
-                        config.additionalProperties().put(langCliOption.getOpt(), genConfig.getOption(langCliOption.getOpt()));
+                    String opt = langCliOption.getOpt();
+                    if (genConfig.hasOption(opt)) {
+                        config.additionalProperties().put(opt, genConfig.getOption(opt));
+                        // the "library" config option is for library template (sub-template)
+                        if ("library".equals(opt)) {
+                            config.setLibrary(genConfig.getOption(opt));
+                        }
                     }
                 }
             }
         }
 
-        input.setConfig(config);
+        ClientOptInput input = new ClientOptInput().config(config);
+
+        if (isNotEmpty(auth)) {
+            input.setAuth(auth);
+        }
 
         Swagger swagger = new SwaggerParser().read(spec, input.getAuthorizationValues(), true);
         new DefaultGenerator().opts(input.opts(new ClientOpts()).swagger(swagger)).generate();
     }
 
+    private void addValuesToSet(Set<String> set, String csvProperty) {
+        final List<String> values = OptionUtils.splitCommaSeparatedList(csvProperty);
+
+        for (String value : values) {
+            set.add(value);
+        }
+    }
+
+    private void checkAndSetAdditionalProperty(CodegenConfig config, String property, String propertyKey) {
+        checkAndSetAdditionalProperty(config, property, property, propertyKey);
+    }
+
+    private void checkAndSetAdditionalProperty(CodegenConfig config, String property, String valueToSet, String propertyKey) {
+        if(isNotEmpty(property)) {
+            config.additionalProperties().put(propertyKey, valueToSet);
+        }
+    }
+
     private void setSystemProperties() {
-        if (systemProperties != null && systemProperties.length() > 0) {
-            for (String property : systemProperties.split(",")) {
-                int ix = property.indexOf('=');
-                if (ix > 0 && ix < property.length() - 1) {
-                    System.setProperty(property.substring(0, ix), property.substring(ix + 1));
-                }
-            }
+
+        final List<Pair<String, String>> systemPropertyPairs = OptionUtils.parseCommaSeparatedTuples(systemProperties);
+
+        for (Pair<String, String> pair : systemPropertyPairs) {
+            System.setProperty(pair.getLeft(), pair.getRight());
+        }
+    }
+
+    private void putKeyValuePairsInMap(Map map, String commaSeparatedKVPairs) {
+        final List<Pair<String, String>> pairs = OptionUtils.parseCommaSeparatedTuples(commaSeparatedKVPairs);
+
+        for (Pair<String, String> pair : pairs) {
+            map.put(pair.getLeft(), pair.getRight());
         }
     }
 
+
     /**
      * If true parameter, adds system properties which enables debug mode in generator
      *
diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/utils/OptionUtils.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/utils/OptionUtils.java
new file mode 100644
index 00000000000..34d56727412
--- /dev/null
+++ b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/utils/OptionUtils.java
@@ -0,0 +1,43 @@
+package io.swagger.codegen.cmd.utils;
+
+import org.apache.commons.lang3.tuple.Pair;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.apache.commons.lang3.StringUtils.isNotEmpty;
+
+public class OptionUtils {
+
+    public static List<Pair<String, String>> parseCommaSeparatedTuples(String input) {
+
+        List<Pair<String, String>> results = new ArrayList<Pair<String, String>>();
+
+        final List<String> tuples = splitCommaSeparatedList(input);
+
+        for (String tuple : tuples) {
+            int ix = tuple.indexOf('=');
+            if (ix > 0 && ix < tuple.length() - 1) {
+                final Pair<String, String> pair = Pair.of(tuple.substring(0, ix), tuple.substring(ix + 1));
+                results.add(pair);
+            }
+        }
+
+        return results;
+    }
+
+    public static List<String> splitCommaSeparatedList(String input) {
+
+        List<String> results = new ArrayList<String>();
+
+        if(input != null && !input.isEmpty()) {
+            for (String value : input.split(",")) {
+                if(isNotEmpty(value))
+                results.add(value);
+            }
+        }
+
+        return results;
+    }
+
+}
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
new file mode 100644
index 00000000000..94a397df700
--- /dev/null
+++ b/modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/cmd/GenerateTest.java
@@ -0,0 +1,352 @@
+package io.swagger.codegen.cmd;
+
+import config.Config;
+import config.ConfigParser;
+import io.swagger.codegen.ClientOptInput;
+import io.swagger.codegen.ClientOpts;
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenConstants;
+import io.swagger.codegen.DefaultGenerator;
+import io.swagger.codegen.SwaggerCodegen;
+import io.swagger.codegen.CodegenConfigLoader;
+import io.swagger.codegen.languages.JavaClientCodegen;
+import io.swagger.models.Swagger;
+import io.swagger.models.auth.AuthorizationValue;
+import io.swagger.parser.SwaggerParser;
+import mockit.Expectations;
+import mockit.FullVerifications;
+import mockit.Injectable;
+import mockit.Mocked;
+import mockit.StrictExpectations;
+import org.apache.commons.lang3.ArrayUtils;
+import org.testng.annotations.Test;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+public class GenerateTest {
+
+    @Mocked
+    SwaggerParser parser;
+
+    @Injectable
+    Swagger swagger;
+
+    @Mocked
+    DefaultGenerator defaultGenerator;
+
+    @Mocked
+    CodegenConfigLoader codegenConfigLoader;
+
+    @Mocked
+    ClientOptInput clientOptInput;
+
+    @Injectable
+    List<AuthorizationValue> authorizationValues;
+
+    @Test
+    public void testVerbose_ShortArg() throws Exception {
+        doVerboseTest("-v");
+    }
+
+    @Test
+    public void testVerbose_LongArg() throws Exception {
+        doVerboseTest("--verbose");
+    }
+
+    @Test
+    public void testRequiredArgs_ShortArgs() throws Exception {
+        doRequiredArgsTest("-l", "-o", "-i");
+    }
+
+    @Test
+    public void testRequiredArgs_LongArgs() throws Exception {
+        doRequiredArgsTest("--lang", "--output", "--input-spec");
+    }
+
+    @Test
+    public void testTemplateDir() throws Exception {
+        final String absolutePath = new File("src").getAbsolutePath();
+
+        doSingleAdditionalPropertyTest("--template-dir", CodegenConstants.TEMPLATE_DIR, "src", absolutePath);
+        doSingleAdditionalPropertyTest("--template-dir", CodegenConstants.TEMPLATE_DIR, absolutePath, absolutePath);
+        doSingleAdditionalPropertyTest("-t", CodegenConstants.TEMPLATE_DIR, "src", absolutePath);
+        doSingleAdditionalPropertyTest("-t", CodegenConstants.TEMPLATE_DIR, absolutePath, absolutePath);
+    }
+
+    @Test
+    public void testAuth() throws Exception {
+
+        final String auth = "hello:world";
+
+        new StrictExpectations() {{
+            clientOptInput.setAuth(auth);
+            times = 1;
+        }};
+
+        setupAndRunGenericTest("-a", auth);
+
+        new StrictExpectations() {{
+            clientOptInput.setAuth(auth);
+            times = 1;
+        }};
+
+        setupAndRunGenericTest("--auth", auth);
+    }
+
+    @Test
+    public void testSystemProperties() throws Exception {
+
+        new StrictExpectations(System.class) {{
+            System.setProperty("hello", "world");
+            times = 1;
+            System.setProperty("foo", "bar");
+            times = 1;
+        }};
+
+        setupAndRunGenericTest("-D", "hello=world,foo=bar");
+    }
+
+    @Test
+    public void testConfig(@Mocked final ConfigParser parser) throws Exception {
+
+        final String configFilePath = "config.json";
+        final String invokerPackage = "com.foo.bar.invoker";
+        final String groupId = "com.foo.bar";
+        Map<String, String> configMap = new HashMap<String, String>();
+        configMap.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
+        configMap.put(CodegenConstants.GROUP_ID, groupId);
+        final Config config = new Config(configMap);
+
+        final String[] configArgs = {"-c", "--config"};
+
+        for (String configArg : configArgs) {
+            new StrictExpectations() {{
+                parser.read(configFilePath);
+                times = 1;
+                result = config;
+
+            }};
+
+            final CodegenConfig codegenConfig = setupAndRunGenericTest(configArg, configFilePath);
+
+            assertValueInMap(codegenConfig.additionalProperties(), CodegenConstants.INVOKER_PACKAGE, invokerPackage);
+            assertValueInMap(codegenConfig.additionalProperties(), CodegenConstants.GROUP_ID, groupId);
+        }
+    }
+
+    @Test
+    public void testSkipOverwrite() throws Exception {
+
+        CodegenConfig codegenConfig1 = setupAndRunGenericTest();
+        assertFalse(codegenConfig1.isSkipOverwrite());
+
+        CodegenConfig codegenConfig2 = setupAndRunGenericTest("-s");
+        assertTrue(codegenConfig2.isSkipOverwrite());
+
+        CodegenConfig codegenConfig3 = setupAndRunGenericTest("--skip-overwrite");
+        assertTrue(codegenConfig3.isSkipOverwrite());
+    }
+
+    @Test
+    public void testApiPackage() throws Exception {
+        doSingleAdditionalPropertyTest("--api-package", CodegenConstants.API_PACKAGE, "io.foo.bar.api");
+    }
+
+    @Test
+    public void testModelPackage() throws Exception {
+        doSingleAdditionalPropertyTest("--model-package", CodegenConstants.MODEL_PACKAGE, "io.foo.bar.models");
+    }
+
+    @Test
+    public void testInstantiationTypes() throws Exception {
+
+        final CodegenConfig codegenConfig = setupAndRunGenericTest("--instantiation-types", "foo=bar,hello=world");
+
+        assertValueInMap(codegenConfig.instantiationTypes(), "foo", "bar");
+        assertValueInMap(codegenConfig.instantiationTypes(), "hello", "world");
+    }
+
+    @Test
+    public void testTypeMappings() throws Exception {
+        final CodegenConfig codegenConfig = setupAndRunGenericTest("--type-mappings", "foo=bar,hello=world");
+
+        assertValueInMap(codegenConfig.typeMapping(), "foo", "bar");
+        assertValueInMap(codegenConfig.typeMapping(), "hello", "world");
+    }
+
+    @Test
+    public void testAdditionalProperties() throws Exception {
+        final CodegenConfig codegenConfig = setupAndRunGenericTest("--additional-properties", "foo=bar,hello=world");
+
+        assertValueInMap(codegenConfig.additionalProperties(), "foo", "bar");
+        assertValueInMap(codegenConfig.additionalProperties(), "hello", "world");
+    }
+
+    @Test
+    public void testLanguageSpecificPrimitives() throws Exception {
+        final CodegenConfig codegenConfig = setupAndRunGenericTest("--language-specific-primitives", "foo,bar,hello,world");
+
+        final Set<String> languageSpecificPrimitives = codegenConfig.languageSpecificPrimitives();
+
+        assertTrue(languageSpecificPrimitives.contains("foo"));
+        assertTrue(languageSpecificPrimitives.contains("bar"));
+        assertTrue(languageSpecificPrimitives.contains("hello"));
+        assertTrue(languageSpecificPrimitives.contains("world"));
+    }
+
+    @Test
+    public void testImportMappings() throws Exception {
+        final CodegenConfig codegenConfig = setupAndRunGenericTest("--import-mappings", "foo=bar,hello=world");
+
+        assertValueInMap(codegenConfig.importMapping(), "foo", "bar");
+        assertValueInMap(codegenConfig.importMapping(), "hello", "world");
+    }
+
+    @Test
+    public void testInvokerPackage() throws Exception {
+        doSingleAdditionalPropertyTest("--invoker-package", CodegenConstants.INVOKER_PACKAGE, "io.foo.bar.invoker");
+    }
+
+    @Test
+    public void testGroupId() throws Exception {
+        doSingleAdditionalPropertyTest("--group-id", CodegenConstants.GROUP_ID, "io.foo.bar");
+    }
+
+    @Test
+    public void testArtifactId() throws Exception {
+        doSingleAdditionalPropertyTest("--artifact-id", CodegenConstants.ARTIFACT_ID, "awesome-api");
+    }
+
+    @Test
+    public void testArtifactVersion() throws Exception {
+        doSingleAdditionalPropertyTest("--artifact-version", CodegenConstants.ARTIFACT_VERSION, "1.2.3");
+    }
+
+    private void doVerboseTest(String verboseFlag) {
+        new StrictExpectations(System.class) {{
+            System.setProperty("debugSwagger", "");
+            times = 1;
+            System.setProperty("debugModels", "");
+            times = 1;
+            System.setProperty("debugOperations", "");
+            times = 1;
+            System.setProperty("debugSupportingFiles", "");
+            times = 1;
+        }};
+
+        setupAndRunGenericTest(verboseFlag);
+    }
+
+    private void doRequiredArgsTest(String langFlag, String outputDirFlag, String inputSpecFlag) {
+        final String spec = "swagger.yaml";
+        final String lang = "java";
+        final String outputDir = "src/main/java";
+
+        final String[] args = {"generate", langFlag, lang, outputDirFlag, outputDir, inputSpecFlag, spec};
+
+        final CodegenConfig config = new JavaClientCodegen();
+
+        setupStandardExpectations(spec, lang, config);
+
+        SwaggerCodegen.main(args);
+
+        new FullVerifications() {{
+        }};
+
+        assertEquals(config.getOutputDir(), new File(outputDir).getAbsolutePath());
+    }
+
+    private void doSingleAdditionalPropertyTest(String cliArg, String additionalPropertyKey, String expectedValue) {
+        doSingleAdditionalPropertyTest(cliArg, additionalPropertyKey, expectedValue, expectedValue);
+    }
+
+    private void doSingleAdditionalPropertyTest(String cliArg, String additionalPropertyKey, String cliValue, String additionalPropertyValue) {
+
+        final CodegenConfig config = setupAndRunGenericTest(cliArg, cliValue);
+
+        assertValueInMap(config.additionalProperties(), additionalPropertyKey, additionalPropertyValue);
+    }
+
+    private CodegenConfig setupAndRunGenericTest(String... additionalParameters) {
+
+        final String spec = "swagger.yaml";
+        final String lang = "java";
+
+        final String[] commonArgs = {"generate", "-l", lang, "-o", "path/to/some/directory", "-i", spec};
+
+        String[] argsToUse = ArrayUtils.addAll(commonArgs, additionalParameters);
+
+        final CodegenConfig config = new JavaClientCodegen();
+
+        setupStandardExpectations(spec, lang, config);
+
+        SwaggerCodegen.main(argsToUse);
+
+        new FullVerifications() {{
+        }};
+
+        return config;
+    }
+
+    private void assertValueInMap(Map map, String propertyKey, String expectedPropertyValue) {
+        assertTrue(map.containsKey(propertyKey));
+        assertEquals(map.get(propertyKey), expectedPropertyValue);
+    }
+
+    private void setupStandardExpectations(final String spec, final String languageName, final CodegenConfig config) {
+
+        new Expectations() {{
+            CodegenConfigLoader.forName(languageName);
+            times = 1;
+            result = config;
+
+            new ClientOptInput();
+            times = 1;
+            result = clientOptInput;
+
+            clientOptInput.config(config);
+            times = 1;
+            result = clientOptInput;
+
+            new SwaggerParser();
+            times = 1;
+            result = parser;
+
+            clientOptInput.getAuthorizationValues();
+            times = 1;
+            result = authorizationValues;
+
+            parser.read(spec, authorizationValues, true);
+            times = 1;
+            result = swagger;
+
+            new DefaultGenerator();
+            times = 1;
+            result = defaultGenerator;
+
+            clientOptInput.opts((ClientOpts) any);
+            times = 1;
+            result = clientOptInput;
+
+            clientOptInput.swagger(swagger);
+            times = 1;
+            result = clientOptInput;
+
+            defaultGenerator.opts(clientOptInput);
+            times = 1;
+            result = defaultGenerator;
+
+            defaultGenerator.generate();
+            times = 1;
+        }};
+    }
+
+}
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
new file mode 100644
index 00000000000..a7dc4d7f1cd
--- /dev/null
+++ b/modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/cmd/utils/OptionUtilsTest.java
@@ -0,0 +1,52 @@
+package io.swagger.codegen.cmd.utils;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+
+public class OptionUtilsTest {
+
+    @Test
+    public void splitCommaSeparatedList() throws Exception {
+        doCommaSeparatedListTest("a,b,c", Arrays.asList("a", "b", "c"));
+        doCommaSeparatedListTest("a,,c", Arrays.asList("a", "c"));
+        doCommaSeparatedListTest("", new ArrayList<String>());
+        doCommaSeparatedListTest(null, new ArrayList<String>());
+    }
+
+    @Test
+    public void testParseCommaSeparatedTuples() throws Exception {
+        doTupleListTest("a=1,b=2,c=3", Arrays.asList(Pair.of("a", "1"), Pair.of("b", "2"), Pair.of("c", "3")));
+        doTupleListTest("a=1,,c=3", Arrays.asList(Pair.of("a", "1"), Pair.of("c", "3")));
+        doTupleListTest("a=1,xyz,c=3", Arrays.asList(Pair.of("a", "1"), Pair.of("c", "3")));
+        doTupleListTest("a=1,=,c=3", Arrays.asList(Pair.of("a", "1"), Pair.of("c", "3")));
+        doTupleListTest("", new ArrayList<Pair<String, String>>());
+        doTupleListTest(null, new ArrayList<Pair<String, String>>());
+    }
+
+    private 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());
+        for (int i = 0; i < expectedResults.size(); i++) {
+            final Pair<String, String> actualPair = result.get(i);
+            final Pair<String, String> expected = expectedResults.get(i);
+            assertEquals(actualPair, expected);
+        }
+    }
+
+    private void doCommaSeparatedListTest(String csvStr, List<String> expectedResults) {
+        final List<String> result = OptionUtils.splitCommaSeparatedList(csvStr);
+        assertNotNull(result);
+        assertEquals(result.size(), expectedResults.size());
+        for (int i = 0; i < expectedResults.size(); i++) {
+            assertEquals(result.get(i), expectedResults.get(i));
+        }
+    }
+}
diff --git a/modules/swagger-codegen-maven-plugin/README.md b/modules/swagger-codegen-maven-plugin/README.md
new file mode 100644
index 00000000000..372b2c90adf
--- /dev/null
+++ b/modules/swagger-codegen-maven-plugin/README.md
@@ -0,0 +1,55 @@
+swagger-codegen-maven-plugin
+============================
+
+A Maven plugin to support the [swagger](http://swagger.io) code generation project
+
+Usage
+============================
+
+Add to your `build->plugins` section (default phase is `generate-sources` phase)
+```xml
+<plugin>
+    <groupId>io.swagger</groupId>
+    <artifactId>swagger-codegen-maven-plugin</artifactId>
+    <version>${project.version}</version>
+    <executions>
+        <execution>
+            <goals>
+                <goal>generate</goal>
+            </goals>
+            <configuration>
+                <inputSpec>src/main/resources/api.yaml</inputSpec>
+                <language>java</language>
+                <configOptions>
+                   <sourceFolder>src/gen/java/main</sourceFolder>
+                </configOptions>
+            </configuration>
+        </execution>
+    </executions>
+</plugin>
+```
+
+Followed by:
+
+```
+mvn clean compile
+```
+
+### General Configuration parameters
+
+- `inputSpec` - swagger spec file path
+- `language` - target generation language
+- `output` - target output path (default is `${project.build.directory}/generated-sources/swagger`)
+- `templateDirectory` - directory with mustache templates
+- `addCompileSourceRoot` - add the output directory to the project as a source root (`true` by default)
+- `modelPackage` - the package to use for generated model objects/classes
+- `apiPackage` - the package to use for generated api objects/classes
+- `invokerPackage` - the package to use for the generated invoker objects
+- `configOptions` - a map of language-specific parameters (see below)
+
+### Java-specific parameters (under configOptions)
+
+- `sourceFolder` - the folder to use for generated sources under the output folder
+- `groupId` - groupId in generated pom.xml
+- `artifactId` - artifactId in generated pom.xml
+- `artifactVersion` - artifact version in generated pom.xml
diff --git a/modules/swagger-codegen-maven-plugin/pom.xml b/modules/swagger-codegen-maven-plugin/pom.xml
new file mode 100644
index 00000000000..4d7107dba7e
--- /dev/null
+++ b/modules/swagger-codegen-maven-plugin/pom.xml
@@ -0,0 +1,87 @@
+<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>
+
+    <parent>
+        <groupId>io.swagger</groupId>
+        <artifactId>swagger-codegen-project</artifactId>
+        <version>2.1.4-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
+    </parent>
+    <artifactId>swagger-codegen-maven-plugin</artifactId>
+    <name>swagger-codegen (maven-plugin)</name>
+    <packaging>maven-plugin</packaging>
+    <description>maven plugin to build modules from swagger codegen</description>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-core</artifactId>
+            <version>3.2.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-artifact</artifactId>
+            <version>3.2.5</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-compat</artifactId>
+            <version>3.2.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-plugin-api</artifactId>
+            <version>3.2.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugin-tools</groupId>
+            <artifactId>maven-plugin-annotations</artifactId>
+            <version>3.4</version>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-codegen</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-plugin-plugin</artifactId>
+                    <version>3.4</version>
+                    <configuration>
+                        <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>mojo-descriptor</id>
+                            <phase>process-classes</phase>
+                            <goals>
+                                <goal>descriptor</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>help-goal</id>
+                            <goals>
+                                <goal>helpmojo</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+</project>
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
new file mode 100644
index 00000000000..f3678e783e0
--- /dev/null
+++ b/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/AdditionalParams.java
@@ -0,0 +1,16 @@
+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";
+
+    private AdditionalParams() {
+    }
+}
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
new file mode 100644
index 00000000000..7500fcfeb39
--- /dev/null
+++ b/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java
@@ -0,0 +1,171 @@
+package io.swagger.codegen.plugin;
+
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * 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 io.swagger.codegen.CliOption;
+import io.swagger.codegen.ClientOptInput;
+import io.swagger.codegen.ClientOpts;
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenConfigLoader;
+import io.swagger.codegen.DefaultGenerator;
+import io.swagger.models.Swagger;
+import io.swagger.parser.SwaggerParser;
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.MavenProject;
+
+import config.Config;
+import config.ConfigParser;
+
+import java.io.File;
+import java.util.Map;
+import java.util.ServiceLoader;
+
+import static io.swagger.codegen.plugin.AdditionalParams.API_PACKAGE_PARAM;
+import static io.swagger.codegen.plugin.AdditionalParams.INVOKER_PACKAGE_PARAM;
+import static io.swagger.codegen.plugin.AdditionalParams.MODEL_PACKAGE_PARAM;
+import static io.swagger.codegen.plugin.AdditionalParams.TEMPLATE_DIR_PARAM;
+
+/**
+ * Goal which generates client/server code from a swagger json/yaml definition.
+ */
+@Mojo(name = "generate", defaultPhase = LifecyclePhase.GENERATE_SOURCES)
+public class CodeGenMojo extends AbstractMojo {
+    /**
+     * Location of the output directory.
+     */
+    @Parameter(name = "output",
+            property = "swagger.codegen.maven.plugin.output",
+            defaultValue = "${project.build.directory}/generated-sources/swagger")
+    private File output;
+
+    /**
+     * Location of the swagger spec, as URL or file.
+     */
+    @Parameter(name = "inputSpec", required = true)
+    private String inputSpec;
+
+    /**
+     * Folder containing the template files.
+     */
+    @Parameter(name = "templateDirectory")
+    private File templateDirectory;
+
+    /**
+     * The package to use for generated model objects/classes
+     */
+    @Parameter(name = "modelPackage")
+    private String modelPackage;
+
+    /**
+     * The package to use for generated api objects/classes
+     */
+    @Parameter(name = "apiPackage")
+    private String apiPackage;
+
+    /**
+     * The package to use for the generated invoker objects
+     */
+    @Parameter(name = "invokerPackage")
+    private String invokerPackage;
+
+    /**
+     * Client language to generate.
+     */
+    @Parameter(name = "language", required = true)
+    private String language;
+
+    /**
+     * Path to separate json configuration file.
+     */
+    @Parameter(name = "configurationFile", required = false)
+    private String configurationFile;
+
+    /**
+     * A map of language-specific parameters as passed with the -c option to the command line
+     */
+    @Parameter(name = "configOptions")
+    private Map configOptions;
+
+    /**
+     * Add the output directory to the project as a source root, so that the
+     * generated java types are compiled and included in the project artifact.
+     */
+    @Parameter(defaultValue = "true")
+    private boolean addCompileSourceRoot = true;
+
+    /**
+     * The project being built.
+     */
+    @Parameter(readonly = true, required = true, defaultValue = "${project}")
+    private MavenProject project;
+
+    @Override
+    public void execute() throws MojoExecutionException {
+        Swagger swagger = new SwaggerParser().read(inputSpec);
+
+        CodegenConfig config = CodegenConfigLoader.forName(language);
+        config.setOutputDir(output.getAbsolutePath());
+
+        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);
+        }
+
+        if (configOptions != null) {
+            for (CliOption langCliOption : config.cliOptions()) {
+                if (configOptions.containsKey(langCliOption.getOpt())) {
+                    config.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);
+        new DefaultGenerator().opts(input).generate();
+
+        if (addCompileSourceRoot) {
+            project.addCompileSourceRoot(output.toString());
+        }
+    }
+}
diff --git a/modules/swagger-codegen/pom.xml b/modules/swagger-codegen/pom.xml
index 195c0c0fe07..b6caa0a684a 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.2</version>
+        <version>2.1.4-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -83,9 +83,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <configuration>
-                        <recompileMode>incremental</recompileMode>
-                    </configuration>
+                    <recompileMode>incremental</recompileMode>
                     <jvmArgs>
                         <jvmArg>-Xmx384m</jvmArg>
                     </jvmArgs>
@@ -149,14 +147,6 @@
                     <artifactId>scala-maven-plugin</artifactId>
                     <version>${scala-maven-plugin-version}</version>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-gpg-plugin</artifactId>
-                    <configuration>
-                        <releaseProfiles>release</releaseProfiles>
-                        <goals>sign</goals>
-                    </configuration>
-                </plugin>
             </plugins>
         </pluginManagement>
     </build>
@@ -180,7 +170,7 @@
                             </execution>
                         </executions>
                         <configuration>
-                            <scala-version>${scala-version}</scala-version>
+                            <scalaVersion>${scala-version}</scalaVersion>
                         </configuration>
                     </plugin>
                     <plugin>
@@ -344,6 +334,18 @@
             <version>${scala-version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>${testng-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.reflections</groupId>
+            <artifactId>reflections</artifactId>
+            <version>${reflections-version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>
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 54a2f7efae0..2c90f4255ec 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
@@ -60,10 +60,31 @@ public Reader getTemplateReader(String name) {
         throw new RuntimeException("can't load template " + name);
     }
 
-    private String getCPResourcePath(String name) {
+    /**
+     * Get the template file path with template dir prepended, and use the
+     * library template if exists.
+     */
+    public String getFullTemplateFile(CodegenConfig config, String templateFile) {
+        String library = config.getLibrary();
+        if (library != null && !"".equals(library)) {
+            String libTemplateFile = config.templateDir() + File.separator +
+                "libraries" + File.separator + library + File.separator +
+                templateFile;
+            if (templateExists(libTemplateFile)) {
+                return libTemplateFile;
+            }
+        }
+        return config.templateDir() + File.separator + templateFile;
+    }
+
+    public boolean templateExists(String name) {
+        return this.getClass().getClassLoader().getResource(getCPResourcePath(name)) != null;
+    }
+
+    public String getCPResourcePath(String name) {
         if (!"/".equals(File.separator)) {
             return name.replaceAll(Pattern.quote(File.separator), "/");
         }
         return name;
     }
-}
\ No newline at end of file
+}
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 da026c7f040..56c4c66835a 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
@@ -10,7 +10,7 @@
 import java.util.List;
 
 public class ClientOptInput {
-    protected CodegenConfig config;
+    private CodegenConfig config;
     private ClientOpts opts;
     private Swagger swagger;
     private List<AuthorizationValue> auths;
@@ -25,6 +25,11 @@ public ClientOptInput opts(ClientOpts opts) {
         return this;
     }
 
+    public ClientOptInput config(CodegenConfig codegenConfig) {
+        this.setConfig(codegenConfig);
+        return this;
+    }
+
     public String getAuth() {
         if (auths != null) {
             StringBuilder b = new StringBuilder();
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 c99e04e5494..d4c0707f1a7 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
@@ -85,7 +85,7 @@ public static void main(String[] args) {
                 swagger = new SwaggerParser().read(cmd.getOptionValue("i"), clientOptInput.getAuthorizationValues(), true);
             }
             if (cmd.hasOption("t")) {
-                clientOpts.getProperties().put("templateDir", String.valueOf(cmd.getOptionValue("t")));
+                clientOpts.getProperties().put(CodegenConstants.TEMPLATE_DIR, String.valueOf(cmd.getOptionValue("t")));
             }
         } catch (Exception e) {
             usage(options);
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 6f96bd82b5d..1b0e349daca 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
@@ -65,6 +65,8 @@ public interface CodegenConfig {
 
     CodegenModel fromModel(String name, Model model);
 
+    CodegenModel fromModel(String name, Model model, Map<String, Model> allDefinitions);
+
     CodegenOperation fromOperation(String resourcePath, String httpMethod, Operation operation, Map<String, Model> definitions);
 
     List<CodegenSecurity> fromSecurity(Map<String, SecuritySchemeDefinition> schemes);
@@ -81,6 +83,8 @@ public interface CodegenConfig {
 
     Map<String, String> modelTemplateFiles();
 
+    Set<String> languageSpecificPrimitives();
+
     void processSwagger(Swagger swagger);
 
     String toApiFilename(String name);
@@ -102,4 +106,17 @@ public interface CodegenConfig {
     String apiFilename(String templateName, String tag);
 
     boolean shouldOverwrite(String filename);
+
+    boolean isSkipOverwrite();
+
+    void setSkipOverwrite(boolean skipOverwrite);
+
+    Map<String, String> supportedLibraries();
+
+    void setLibrary(String library);
+
+    /**
+     * Library template (sub-template).
+     */
+    String getLibrary();
 }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfigLoader.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfigLoader.java
new file mode 100644
index 00000000000..45a57e7bb3a
--- /dev/null
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfigLoader.java
@@ -0,0 +1,34 @@
+package io.swagger.codegen;
+
+import java.util.ServiceLoader;
+
+import static java.util.ServiceLoader.load;
+
+public class CodegenConfigLoader {
+    /**
+     * Tries to load config class with SPI first, then with class name directly from classpath
+     *
+     * @param name name of config, or full qualified class name in classpath
+     * @return config class
+     */
+    public static CodegenConfig forName(String name) {
+        ServiceLoader<CodegenConfig> loader = load(CodegenConfig.class);
+
+        StringBuilder availableConfigs = new StringBuilder();
+
+        for (CodegenConfig config : loader) {
+            if (config.getName().equals(name)) {
+                return config;
+            }
+
+            availableConfigs.append(config.getName()).append("\n");
+        }
+
+        // else try to load directly
+        try {
+            return (CodegenConfig) Class.forName(name).newInstance();
+        } catch (Exception e) {
+            throw new RuntimeException("Can't load config class with name ".concat(name) + " Available: " + availableConfigs.toString(), e);
+        }
+    }
+}
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
new file mode 100644
index 00000000000..c4bdad9c6ea
--- /dev/null
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java
@@ -0,0 +1,36 @@
+package io.swagger.codegen;
+
+/**
+ * A class for storing constants that are used throughout the project.
+ */
+public class CodegenConstants {
+    public static final String API_PACKAGE = "apiPackage";
+    public static final String API_PACKAGE_DESC = "package for generated api classes";
+
+    public static final String MODEL_PACKAGE = "modelPackage";
+    public static final String MODEL_PACKAGE_DESC = "package for generated models";
+
+    public static final String TEMPLATE_DIR = "templateDir";
+
+
+    public static final String INVOKER_PACKAGE = "invokerPackage";
+    public static final String INVOKER_PACKAGE_DESC = "root package for generated code";
+
+    public static final String GROUP_ID = "groupId";
+    public static final String GROUP_ID_DESC = "groupId in generated pom.xml";
+
+    public static final String ARTIFACT_ID = "artifactId";
+    public static final String ARTIFACT_ID_DESC = "artifactId in generated pom.xml";
+
+    public static final String ARTIFACT_VERSION = "artifactVersion";
+    public static final String ARTIFACT_VERSION_DESC = "artifact version in generated pom.xml";
+
+    public static final String SOURCE_FOLDER = "sourceFolder";
+    public static final String SOURCE_FOLDER_DESC = "source folder for generated code";
+
+    public static final String LOCAL_VARIABLE_PREFIX = "localVariablePrefix";
+    public static final String LOCAL_VARIABLE_PREFIX_DESC = "prefix for generated code members and local variables";
+
+    public static final String SERIALIZABLE_MODEL = "serializableModel";
+    public static final String SERIALIZABLE_MODEL_DESC = "boolean - toggle \"implements Serializable\" for generated models";
+}
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 b795f8e38e2..0f24759db3e 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
@@ -12,7 +12,7 @@ public class CodegenOperation {
     public final List<CodegenProperty> responseHeaders = new ArrayList<CodegenProperty>();
     public Boolean hasConsumes, hasProduces, hasParams, returnTypeIsPrimitive,
             returnSimpleType, subresourceOperation, isMapContainer, isListContainer,
-            hasMore = Boolean.TRUE, isMultipart;
+            hasMore = Boolean.TRUE, isMultipart, isResponseBinary = Boolean.FALSE;
     public String path, operationId, returnType, httpMethod, returnBaseType,
             returnContainer, summary, notes, baseName, defaultResponse;
     public List<Map<String, String>> consumes, produces;
@@ -29,6 +29,24 @@ public class CodegenOperation {
     public Set<String> imports = new HashSet<String>();
     public List<Map<String, String>> examples;
     public ExternalDocs externalDocs;
+    public Map<String, Object> vendorExtensions;
+
+    private boolean nonempty(List<CodegenParameter> params)
+    {
+        return params != null && params.size() > 0;
+    }
+    public boolean getHasBodyParam() {
+        return nonempty(bodyParams);
+    }
+    public boolean getHasQueryParams() {
+        return nonempty(bodyParams);
+    }
+    public boolean getHasHeaderParams() {
+        return nonempty(bodyParams);
+    }
+    public boolean getHasPathParams() {
+        return nonempty(bodyParams);
+    }
 
     // legacy support
     public String nickname;
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 6777d1028da..6dd85d10c27 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
@@ -1,10 +1,19 @@
 package io.swagger.codegen;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.List;
+
 public class CodegenParameter {
     public Boolean isFormParam, isQueryParam, isPathParam, isHeaderParam,
-            isCookieParam, isBodyParam, isFile, notFile, hasMore, isContainer, secondaryParam;
+            isCookieParam, isBodyParam, isFile, notFile, hasMore, isContainer, secondaryParam, isBinary;
     public String baseName, paramName, dataType, collectionFormat, description, baseType, defaultValue;
     public String jsonSchema;
+    public boolean isEnum;
+    public List<String> _enum;
+    public Map<String, Object> allowableValues;
+    public Map<String, Object> vendorExtensions;
 
     /**
      * Determines whether this parameter is mandatory. If the parameter is in "path",
@@ -35,6 +44,14 @@ public CodegenParameter copy() {
         output.required = this.required;
         output.jsonSchema = this.jsonSchema;
         output.defaultValue = this.defaultValue;
+        output.isEnum = this.isEnum;
+        if (this._enum != null) {
+            output._enum = new ArrayList<String>(this._enum);
+        }
+        if (this.allowableValues != null) {
+            output.allowableValues = new HashMap<String, Object>(this.allowableValues);
+        }
+        output.vendorExtensions = this.vendorExtensions;
 
         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 7872da2c707..076d6cbfbdb 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
@@ -34,4 +34,107 @@ public class CodegenProperty {
     public boolean isEnum;
     public List<String> _enum;
     public Map<String, Object> allowableValues;
+    public CodegenProperty items;
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final CodegenProperty other = (CodegenProperty) obj;
+        if ((this.baseName == null) ? (other.baseName != null) : !this.baseName.equals(other.baseName)) {
+            return false;
+        }
+        if ((this.complexType == null) ? (other.complexType != null) : !this.complexType.equals(other.complexType)) {
+            return false;
+        }
+        if ((this.getter == null) ? (other.getter != null) : !this.getter.equals(other.getter)) {
+            return false;
+        }
+        if ((this.setter == null) ? (other.setter != null) : !this.setter.equals(other.setter)) {
+            return false;
+        }
+        if ((this.description == null) ? (other.description != null) : !this.description.equals(other.description)) {
+            return false;
+        }
+        if ((this.datatype == null) ? (other.datatype != null) : !this.datatype.equals(other.datatype)) {
+            return false;
+        }
+        if ((this.datatypeWithEnum == null) ? (other.datatypeWithEnum != null) : !this.datatypeWithEnum.equals(other.datatypeWithEnum)) {
+            return false;
+        }
+        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
+            return false;
+        }
+        if ((this.min == null) ? (other.min != null) : !this.min.equals(other.min)) {
+            return false;
+        }
+        if ((this.max == null) ? (other.max != null) : !this.max.equals(other.max)) {
+            return false;
+        }
+        if ((this.defaultValue == null) ? (other.defaultValue != null) : !this.defaultValue.equals(other.defaultValue)) {
+            return false;
+        }
+        if ((this.baseType == null) ? (other.baseType != null) : !this.baseType.equals(other.baseType)) {
+            return false;
+        }
+        if ((this.containerType == null) ? (other.containerType != null) : !this.containerType.equals(other.containerType)) {
+            return false;
+        }
+        if (this.maxLength != other.maxLength && (this.maxLength == null || !this.maxLength.equals(other.maxLength))) {
+            return false;
+        }
+        if (this.minLength != other.minLength && (this.minLength == null || !this.minLength.equals(other.minLength))) {
+            return false;
+        }
+        if ((this.pattern == null) ? (other.pattern != null) : !this.pattern.equals(other.pattern)) {
+            return false;
+        }
+        if ((this.example == null) ? (other.example != null) : !this.example.equals(other.example)) {
+            return false;
+        }
+        if ((this.jsonSchema == null) ? (other.jsonSchema != null) : !this.jsonSchema.equals(other.jsonSchema)) {
+            return false;
+        }
+        if (this.minimum != other.minimum && (this.minimum == null || !this.minimum.equals(other.minimum))) {
+            return false;
+        }
+        if (this.maximum != other.maximum && (this.maximum == null || !this.maximum.equals(other.maximum))) {
+            return false;
+        }
+        if (this.exclusiveMinimum != other.exclusiveMinimum && (this.exclusiveMinimum == null || !this.exclusiveMinimum.equals(other.exclusiveMinimum))) {
+            return false;
+        }
+        if (this.exclusiveMaximum != other.exclusiveMaximum && (this.exclusiveMaximum == null || !this.exclusiveMaximum.equals(other.exclusiveMaximum))) {
+            return false;
+        }
+        if (this.required != other.required && (this.required == null || !this.required.equals(other.required))) {
+            return false;
+        }
+        if (this.secondaryParam != other.secondaryParam && (this.secondaryParam == null || !this.secondaryParam.equals(other.secondaryParam))) {
+            return false;
+        }
+        if (this.isPrimitiveType != other.isPrimitiveType && (this.isPrimitiveType == null || !this.isPrimitiveType.equals(other.isPrimitiveType))) {
+            return false;
+        }
+        if (this.isContainer != other.isContainer && (this.isContainer == null || !this.isContainer.equals(other.isContainer))) {
+            return false;
+        }
+        if (this.isNotContainer != other.isNotContainer && (this.isNotContainer == null || !this.isNotContainer.equals(other.isNotContainer))) {
+            return false;
+        }
+        if (this.isEnum != other.isEnum) {
+            return false;
+        }
+        if (this._enum != other._enum && (this._enum == null || !this._enum.equals(other._enum))) {
+            return false;
+        }
+        if (this.allowableValues != other.allowableValues && (this.allowableValues == null || !this.allowableValues.equals(other.allowableValues))) {
+            return false;
+        }
+        return true;
+    }
 }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenResponse.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenResponse.java
index 6d90152f514..e20735b1418 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenResponse.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenResponse.java
@@ -15,6 +15,7 @@ public class CodegenResponse {
     public Boolean primitiveType;
     public Boolean isMapContainer;
     public Boolean isListContainer;
+    public Boolean isBinary = Boolean.FALSE;
     public Object schema;
     public String jsonSchema;
 
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenSecurity.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenSecurity.java
index 8613e0a8d41..edd65cc0603 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenSecurity.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenSecurity.java
@@ -1,5 +1,7 @@
 package io.swagger.codegen;
 
+import java.util.Set;
+
 public class CodegenSecurity {
     public String name;
     public String type;
@@ -7,4 +9,7 @@ public class CodegenSecurity {
     // ApiKey specific
     public String keyParamName;
     public Boolean isKeyInQuery, isKeyInHeader;
+    // Oauth specific
+    public String flow, authorizationUrl, tokenUrl;
+    public Set<String> scopes;
 }
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 71b6295c9be..8fb6eee2964 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
@@ -14,6 +14,7 @@
 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;
@@ -26,6 +27,7 @@
 import io.swagger.models.properties.AbstractNumericProperty;
 import io.swagger.models.properties.ArrayProperty;
 import io.swagger.models.properties.BooleanProperty;
+import io.swagger.models.properties.ByteArrayProperty;
 import io.swagger.models.properties.DateProperty;
 import io.swagger.models.properties.DateTimeProperty;
 import io.swagger.models.properties.DecimalProperty;
@@ -36,6 +38,7 @@
 import io.swagger.models.properties.MapProperty;
 import io.swagger.models.properties.Property;
 import io.swagger.models.properties.PropertyBuilder;
+import io.swagger.models.properties.PropertyBuilder.PropertyId;
 import io.swagger.models.properties.RefProperty;
 import io.swagger.models.properties.StringProperty;
 import io.swagger.util.Json;
@@ -49,9 +52,11 @@
 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;
@@ -60,7 +65,7 @@
 
 
 public class DefaultCodegen {
-    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultCodegen.class);
+    protected static final Logger LOGGER = LoggerFactory.getLogger(DefaultCodegen.class);
 
     protected String outputFolder = "";
     protected Set<String> defaultIncludes = new HashSet<String>();
@@ -76,22 +81,27 @@ public class DefaultCodegen {
     protected Map<String, Object> additionalProperties = new HashMap<String, Object>();
     protected List<SupportingFile> supportingFiles = new ArrayList<SupportingFile>();
     protected List<CliOption> cliOptions = new ArrayList<CliOption>();
+    protected boolean skipOverwrite;
+    protected boolean supportsInheritance = false;
+    protected Map<String, String> supportedLibraries = new LinkedHashMap<String, String>();
+    protected String library = null;
+    protected Boolean sortParamsByRequiredFlag = true;
 
     public List<CliOption> cliOptions() {
         return cliOptions;
     }
 
     public void processOpts() {
-        if (additionalProperties.containsKey("templateDir")) {
-            this.setTemplateDir((String) additionalProperties.get("templateDir"));
+        if (additionalProperties.containsKey(CodegenConstants.TEMPLATE_DIR)) {
+            this.setTemplateDir((String) additionalProperties.get(CodegenConstants.TEMPLATE_DIR));
         }
 
-        if (additionalProperties.containsKey("modelPackage")) {
-            this.setModelPackage((String) additionalProperties.get("modelPackage"));
+        if (additionalProperties.containsKey(CodegenConstants.MODEL_PACKAGE)) {
+            this.setModelPackage((String) additionalProperties.get(CodegenConstants.MODEL_PACKAGE));
         }
 
-        if (additionalProperties.containsKey("apiPackage")) {
-            this.setApiPackage((String) additionalProperties.get("apiPackage"));
+        if (additionalProperties.containsKey(CodegenConstants.API_PACKAGE)) {
+            this.setApiPackage((String) additionalProperties.get(CodegenConstants.API_PACKAGE));
         }
     }
 
@@ -117,6 +127,7 @@ public void processSwagger(Swagger swagger) {
     // override with any special text escaping logic
     public String escapeText(String input) {
         if (input != null) {
+            input = input.trim();
             String output = input.replaceAll("\n", "\\\\n");
             output = output.replace("\"", "\\\"");
             return output;
@@ -225,6 +236,11 @@ public String toModelFilename(String name) {
     }
 
     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");
+        }
+
         return operationId;
     }
 
@@ -298,6 +314,8 @@ public DefaultCodegen() {
         typeMapping.put("double", "Double");
         typeMapping.put("object", "Object");
         typeMapping.put("integer", "Integer");
+        typeMapping.put("ByteArray", "byte[]");
+
 
         instantiationTypes = new HashMap<String, String>();
 
@@ -320,8 +338,8 @@ public DefaultCodegen() {
         importMapping.put("LocalDate", "org.joda.time.*");
         importMapping.put("LocalTime", "org.joda.time.*");
 
-        cliOptions.add(new CliOption("modelPackage", "package for generated models"));
-        cliOptions.add(new CliOption("apiPackage", "package for generated api classes"));
+        cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC));
+        cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC));
     }
 
 
@@ -378,7 +396,13 @@ public String generateExamplePath(String path, Operation operation) {
     public String toInstantiationType(Property p) {
         if (p instanceof MapProperty) {
             MapProperty ap = (MapProperty) p;
-            String inner = getSwaggerType(ap.getAdditionalProperties());
+            Property additionalProperties2 = ap.getAdditionalProperties();
+            String type = additionalProperties2.getType();
+            if (null == type) {
+                LOGGER.error("No Type defined for Additional Property " + additionalProperties2 + "\n" //
+                      + "\tIn Property: " + p);
+            }
+            String inner = getSwaggerType(additionalProperties2);
             return instantiationTypes.get("map") + "<String, " + inner + ">";
         } else if (p instanceof ArrayProperty) {
             ArrayProperty ap = (ArrayProperty) p;
@@ -422,14 +446,6 @@ public String toDefaultValue(Property p) {
                 return dp.getDefault().toString();
             }
             return "null";
-        } else if (p instanceof MapProperty) {
-            MapProperty ap = (MapProperty) p;
-            String inner = getSwaggerType(ap.getAdditionalProperties());
-            return "new HashMap<String, " + inner + ">() ";
-        } else if (p instanceof ArrayProperty) {
-            ArrayProperty ap = (ArrayProperty) p;
-            String inner = getSwaggerType(ap.getItems());
-            return "new ArrayList<" + inner + ">() ";
         } else {
             return "null";
         }
@@ -442,6 +458,8 @@ public String getSwaggerType(Property p) {
         String datatype = null;
         if (p instanceof StringProperty) {
             datatype = "string";
+        } else if (p instanceof ByteArrayProperty) {
+            datatype = "ByteArray";
         } else if (p instanceof BooleanProperty) {
             datatype = "boolean";
         } else if (p instanceof DateProperty) {
@@ -506,6 +524,10 @@ public String toModelName(String name) {
     }
 
     public CodegenModel fromModel(String name, Model model) {
+        return fromModel(name, model, null);
+    }
+
+    public CodegenModel fromModel(String name, Model model, Map<String, Model> allDefinitions) {
         CodegenModel m = CodegenModelFactory.newInstance(CodegenModelType.MODEL);
         if (reservedWords.contains(name)) {
             m.name = escapeReservedWord(name);
@@ -520,17 +542,65 @@ public CodegenModel fromModel(String name, Model model) {
         if (model instanceof ArrayModel) {
             ArrayModel am = (ArrayModel) model;
             ArrayProperty arrayProperty = new ArrayProperty(am.getItems());
+            m.hasEnums = false; // Otherwise there will be a NullPointerException in JavaClientCodegen.fromModel
             addParentContainer(m, name, arrayProperty);
         } else if (model instanceof RefModel) {
             // TODO
         } else if (model instanceof ComposedModel) {
             final ComposedModel composed = (ComposedModel) model;
+            Map<String, Property> properties = new HashMap<String, Property>();
+            List<String> required = new ArrayList<String>();
+            // parent model
             final RefModel parent = (RefModel) composed.getParent();
-            final String parentModel = toModelName(parent.getSimpleRef());
-            m.parent = parentModel;
-            addImport(m, parentModel);
-            final ModelImpl child = (ModelImpl) composed.getChild();
-            addVars(m, child.getProperties(), child.getRequired());
+            if (parent != null) {
+                final String parentRef = toModelName(parent.getSimpleRef());
+                m.parent = parentRef;
+                addImport(m, parentRef);
+                if (!supportsInheritance && allDefinitions != null) {
+                    final Model parentModel = allDefinitions.get(parentRef);
+                    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());
+                        }
+                    }
+                }
+            }
+            // interfaces (intermediate models)
+            if (allDefinitions != null) {
+                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());
+                        }
+                    }
+                }
+            }
+            // child model (properties owned by the model itself)
+            Model child = composed.getChild();
+            if (child != null && child instanceof RefModel && allDefinitions != null) {
+                final String childRef = ((RefModel) child).getSimpleRef();
+                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());
+                }
+            }
+            addVars(m, properties, required);
         } else {
             ModelImpl impl = (ModelImpl) model;
             if (impl.getAdditionalProperties() != null) {
@@ -553,7 +623,7 @@ public String getterAndSetterCapitalize(String name) {
 
     public CodegenProperty fromProperty(String name, Property p) {
         if (p == null) {
-            LOGGER.error("unexpected missing property for name " + null);
+            LOGGER.error("unexpected missing property for name " + name);
             return null;
         }
         CodegenProperty property = CodegenModelFactory.newInstance(CodegenModelType.PROPERTY);
@@ -583,7 +653,9 @@ public CodegenProperty fromProperty(String name, Property p) {
             if (np.getMaximum() != null) {
                 allowableValues.put("max", np.getMaximum());
             }
-            property.allowableValues = allowableValues;
+            if(allowableValues.size() > 0) {
+              property.allowableValues = allowableValues;
+            }
         }
 
         if (p instanceof StringProperty) {
@@ -602,7 +674,102 @@ public CodegenProperty fromProperty(String name, Property p) {
                 property.allowableValues = allowableValues;
             }
         }
+        if(p instanceof IntegerProperty) {
+            IntegerProperty sp = (IntegerProperty) p;
+            if(sp.getEnum() != null) {
+                List<Integer> _enum = sp.getEnum();
+                property._enum = new ArrayList<String>();
+                for(Integer i : _enum) {
+                  property._enum.add(i.toString());
+                }
+                property.isEnum = true;
+
+                // legacy support
+                Map<String, Object> allowableValues = new HashMap<String, Object>();
+                allowableValues.put("values", _enum);
+                property.allowableValues = allowableValues;
+            }
+        }
+        if(p instanceof LongProperty) {
+            LongProperty sp = (LongProperty) p;
+            if(sp.getEnum() != null) {
+                List<Long> _enum = sp.getEnum();
+                property._enum = new ArrayList<String>();
+                for(Long i : _enum) {
+                  property._enum.add(i.toString());
+                }
+                property.isEnum = true;
+
+                // legacy support
+                Map<String, Object> allowableValues = new HashMap<String, Object>();
+                allowableValues.put("values", _enum);
+                property.allowableValues = allowableValues;
+            }
+        }
+        if(p instanceof DoubleProperty) {
+            DoubleProperty sp = (DoubleProperty) p;
+            if(sp.getEnum() != null) {
+                List<Double> _enum = sp.getEnum();
+                property._enum = new ArrayList<String>();
+                for(Double i : _enum) {
+                  property._enum.add(i.toString());
+                }
+                property.isEnum = true;
 
+                // legacy support
+                Map<String, Object> allowableValues = new HashMap<String, Object>();
+                allowableValues.put("values", _enum);
+                property.allowableValues = allowableValues;
+            }
+        }
+        if(p instanceof FloatProperty) {
+            FloatProperty sp = (FloatProperty) p;
+            if(sp.getEnum() != null) {
+                List<Float> _enum = sp.getEnum();
+                property._enum = new ArrayList<String>();
+                for(Float i : _enum) {
+                  property._enum.add(i.toString());
+                }
+                property.isEnum = true;
+
+                // legacy support
+                Map<String, Object> allowableValues = new HashMap<String, Object>();
+                allowableValues.put("values", _enum);
+                property.allowableValues = allowableValues;
+            }
+        }
+        if(p instanceof DateProperty) {
+            DateProperty sp = (DateProperty) p;
+            if(sp.getEnum() != null) {
+                List<String> _enum = sp.getEnum();
+                property._enum = new ArrayList<String>();
+                for(String i : _enum) {
+                  property._enum.add(i.toString());
+                }
+                property.isEnum = true;
+
+                // legacy support
+                Map<String, Object> allowableValues = new HashMap<String, Object>();
+                allowableValues.put("values", _enum);
+                property.allowableValues = allowableValues;
+            }
+        }
+        if(p instanceof DateTimeProperty) {
+            DateTimeProperty sp = (DateTimeProperty) p;
+            if(sp.getEnum() != null) {
+                List<String> _enum = sp.getEnum();
+                property._enum = new ArrayList<String>();
+                for(String i : _enum) {
+                  property._enum.add(i.toString());
+                }
+                property.isEnum = true;
+
+                // legacy support
+                Map<String, Object> allowableValues = new HashMap<String, Object>();
+                allowableValues.put("values", _enum);
+                property.allowableValues = allowableValues;
+            }
+        }
         property.datatype = getTypeDeclaration(p);
 
         // this can cause issues for clients which don't support enums
@@ -614,22 +781,28 @@ public CodegenProperty fromProperty(String name, Property p) {
 
         property.baseType = getSwaggerType(p);
 
-        if (p instanceof ArrayProperty) {
-            property.isContainer = true;
-            property.containerType = "array";
-            ArrayProperty ap = (ArrayProperty) p;
-            CodegenProperty cp = fromProperty("inner", ap.getItems());
-            if (cp == null) {
-                LOGGER.warn("skipping invalid property " + Json.pretty(p));
-            } else {
-                property.baseType = getSwaggerType(p);
-                if (!languageSpecificPrimitives.contains(cp.baseType)) {
-                    property.complexType = cp.baseType;
-                } else {
-                    property.isPrimitiveType = true;
-                }
-            }
-        } else if (p instanceof MapProperty) {
+      	if (p instanceof ArrayProperty) {
+        		property.isContainer = 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));
+        		} else {
+          			property.baseType = getSwaggerType(p);
+          			if (!languageSpecificPrimitives.contains(cp.baseType)) {
+          				  property.complexType = cp.baseType;
+          			} else {
+          				  property.isPrimitiveType = true;
+          			}
+          			property.items = cp;
+          			if (property.items.isEnum) {
+          				  property.datatypeWithEnum = property.datatypeWithEnum.replace(property.items.baseType,
+          						property.items.datatypeWithEnum);
+          				  property.defaultValue = property.defaultValue.replace(property.items.baseType, property.items.datatypeWithEnum);
+          			}
+        		}
+      	} else if (p instanceof MapProperty) {
             property.isContainer = true;
             property.containerType = "map";
             MapProperty ap = (MapProperty) p;
@@ -675,6 +848,7 @@ private Response findMethodResponse(Map<String, Response> responses) {
     public CodegenOperation fromOperation(String path, String httpMethod, Operation operation, Map<String, Model> definitions) {
         CodegenOperation op = CodegenModelFactory.newInstance(CodegenModelType.OPERATION);
         Set<String> imports = new HashSet<String>();
+        op.vendorExtensions = operation.getVendorExtensions();
 
         String operationId = operation.getOperationId();
         if (operationId == null) {
@@ -699,7 +873,7 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
                 }
             }
             operationId = builder.toString();
-            LOGGER.warn("generated operationId " + operationId);
+            LOGGER.info("generated operationId " + operationId + "\tfor Path: " + httpMethod + " " + path);
         }
         operationId = removeNonNameElementToCamelCase(operationId);
         op.path = path;
@@ -758,6 +932,9 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
                 }
                 r.isDefault = response == methodResponse;
                 op.responses.add(r);
+                if (r.isBinary && r.isDefault){
+                    op.isResponseBinary = Boolean.TRUE;
+                }
             }
             op.responses.get(op.responses.size() - 1).hasMore = false;
 
@@ -850,6 +1027,20 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
         }
         op.bodyParam = bodyParam;
         op.httpMethod = httpMethod.toUpperCase();
+        // move "required" parameters in front of "optional" parameters
+
+        if(sortParamsByRequiredFlag) {
+          Collections.sort(allParams, new Comparator<CodegenParameter>() {
+              @Override
+              public int compare(CodegenParameter one, CodegenParameter another) {
+                  boolean oneRequired = one.required == null ? false : one.required;
+                  boolean anotherRequired = another.required == null ? false : another.required;
+                  if (oneRequired == anotherRequired) return 0;
+                  else if (oneRequired) return -1;
+                  else return 1;
+              }
+          });
+        }
         op.allParams = addHasMore(allParams);
         op.bodyParams = addHasMore(bodyParams);
         op.pathParams = addHasMore(pathParams);
@@ -899,6 +1090,7 @@ public CodegenResponse fromResponse(String responseCode, Response response) {
                 }
             }
             r.dataType = cm.datatype;
+            r.isBinary = cm.datatype.equals("byte[]");
             if (cm.isContainer != null) {
                 r.simpleType = false;
                 r.containerType = cm.containerType;
@@ -927,6 +1119,10 @@ public CodegenParameter fromParameter(Parameter param, Set<String> imports) {
         }
         p.jsonSchema = Json.pretty(param);
 
+        if (System.getProperty("debugParser") != null) {
+            LOGGER.info("working on Parameter " + param);
+        }
+
         // move the defaultValue for headers, forms and params
         if (param instanceof QueryParameter) {
             p.defaultValue = ((QueryParameter) param).getDefaultValue();
@@ -936,11 +1132,17 @@ public CodegenParameter fromParameter(Parameter param, Set<String> imports) {
             p.defaultValue = ((FormParameter) param).getDefaultValue();
         }
 
+        p.vendorExtensions = param.getVendorExtensions();
+
         if (param instanceof SerializableParameter) {
             SerializableParameter qp = (SerializableParameter) param;
             Property property = null;
             String collectionFormat = null;
-            if ("array".equals(qp.getType())) {
+            String type = qp.getType();
+            if (null == type) {
+                LOGGER.warn("Type is NULL for Serializable Parameter: " + param);
+            }
+            if ("array".equals(type)) {
                 Property inner = qp.getItems();
                 if (inner == null) {
                     LOGGER.warn("warning!  No inner type supplied for array parameter \"" + qp.getName() + "\", using String");
@@ -952,7 +1154,7 @@ public CodegenParameter fromParameter(Parameter param, Set<String> imports) {
                 p.baseType = pr.datatype;
                 p.isContainer = true;
                 imports.add(pr.baseType);
-            } else if ("object".equals(qp.getType())) {
+            } else if ("object".equals(type)) {
                 Property inner = qp.getItems();
                 if (inner == null) {
                     LOGGER.warn("warning!  No inner type supplied for map parameter \"" + qp.getName() + "\", using String");
@@ -964,22 +1166,32 @@ public CodegenParameter fromParameter(Parameter param, Set<String> imports) {
                 p.baseType = pr.datatype;
                 imports.add(pr.baseType);
             } else {
-                property = PropertyBuilder.build(qp.getType(), qp.getFormat(), null);
+                Map<PropertyId, Object> args = new HashMap<PropertyId, Object>();
+                String format = qp.getFormat();
+                args.put(PropertyId.ENUM, qp.getEnum());
+                property = PropertyBuilder.build(type, format, args);
             }
             if (property == null) {
-                LOGGER.warn("warning!  Property type \"" + qp.getType() + "\" not found for parameter \"" + param.getName() + "\", using String");
-                property = new StringProperty().description("//TODO automatically added by swagger-codegen.  Type was " + qp.getType() + " but not supported");
+                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);
-            p.collectionFormat = collectionFormat;
             p.dataType = model.datatype;
+            p.isEnum = model.isEnum;
+            p._enum = model._enum;
+            p.allowableValues = model.allowableValues;
+            p.collectionFormat = collectionFormat;
             p.paramName = toParamName(qp.getName());
 
             if (model.complexType != null) {
                 imports.add(model.complexType);
             }
         } else {
+            if (!(param instanceof BodyParameter)) {
+                LOGGER.error("Cannot use Parameter " + param + " as Body Parameter");
+            }
+
             BodyParameter bp = (BodyParameter) param;
             Model model = bp.getSchema();
 
@@ -990,12 +1202,17 @@ public CodegenParameter fromParameter(Parameter param, Set<String> imports) {
                     p.dataType = getTypeDeclaration(cm.classname);
                     imports.add(p.dataType);
                 } else {
-                    // TODO: missing format, so this will not always work
-                    Property prop = PropertyBuilder.build(impl.getType(), null, null);
+                    Property prop = PropertyBuilder.build(impl.getType(), impl.getFormat(), null);
                     prop.setRequired(bp.getRequired());
                     CodegenProperty cp = fromProperty("property", prop);
                     if (cp != null) {
                         p.dataType = cp.datatype;
+                        if (p.dataType.equals("byte[]")) {
+                            p.isBinary = true;
+                        }
+                        else {
+                            p.isBinary = false;
+                        }
                     }
                 }
             } else if (model instanceof ArrayModel) {
@@ -1056,10 +1273,17 @@ public List<CodegenSecurity> fromSecurity(Map<String, SecuritySchemeDefinition>
                 sec.keyParamName = apiKeyDefinition.getName();
                 sec.isKeyInHeader = apiKeyDefinition.getIn() == In.HEADER;
                 sec.isKeyInQuery = !sec.isKeyInHeader;
+            } else if(schemeDefinition instanceof BasicAuthDefinition) {
+                sec.isKeyInHeader = sec.isKeyInQuery = sec.isApiKey = sec.isOAuth = false;
+                sec.isBasic = true;
             } else {
-                sec.isKeyInHeader = sec.isKeyInQuery = sec.isApiKey = false;
-                sec.isBasic = schemeDefinition instanceof BasicAuthDefinition;
-                sec.isOAuth = !sec.isBasic;
+            	final OAuth2Definition oauth2Definition = (OAuth2Definition) schemeDefinition;
+            	sec.isKeyInHeader = sec.isKeyInQuery = sec.isApiKey = sec.isBasic = false;
+                sec.isOAuth = true;
+                sec.flow = oauth2Definition.getFlow();
+                sec.authorizationUrl = oauth2Definition.getAuthorizationUrl();
+                sec.tokenUrl = oauth2Definition.getTokenUrl();
+                sec.scopes = oauth2Definition.getScopes().keySet();
             }
 
             sec.hasMore = it.hasNext();
@@ -1146,7 +1370,9 @@ private void addParentContainer(CodegenModel m, String name, Property property)
         if (mappedType != null) {
             addImport(m, mappedType);
         }
-    }    /**
+    }
+
+    /**
      * Underscore the given word.
      *
      * @param word The word
@@ -1208,10 +1434,9 @@ private void addVars(CodegenModel m, Map<String, Property> properties, Collectio
         } else {
             m.emptyVars = true;
         }
-    }    public static String camelize(String word) {
-        return camelize(word, false);
     }
 
+
     /**
      * Remove characters not suitable for variable or method name from the input and camelize it
      *
@@ -1231,7 +1456,13 @@ public String apply(String input) {
             name = name.substring(0, 1).toLowerCase() + name.substring(1);
         }
         return name;
-    }    public static String camelize(String word, boolean lowercaseFirstLetter) {
+    }
+
+    public static String camelize(String word) {
+        return camelize(word, false);
+    }
+
+    public static String camelize(String word, boolean lowercaseFirstLetter) {
         // Replace all slashes with dots (package separator)
         Pattern p = Pattern.compile("\\/(.?)");
         Matcher m = p.matcher(word);
@@ -1294,6 +1525,81 @@ public String apiFilename(String templateName, String tag) {
     }
 
     public boolean shouldOverwrite(String filename) {
-        return true;
+        return !(skipOverwrite && new File(filename).exists());
+    }
+
+    public boolean isSkipOverwrite() {
+        return skipOverwrite;
+    }
+
+    public void setSkipOverwrite(boolean skipOverwrite) {
+        this.skipOverwrite = skipOverwrite;
+    }
+
+    /**
+     * All library templates supported.
+     * (key: library name, value: library description)
+     */
+    public Map<String, String> supportedLibraries() {
+        return supportedLibraries;
+    }
+
+    public void setLibrary(String library) {
+        if (library != null && !supportedLibraries.containsKey(library))
+            throw new RuntimeException("unknown library: " + library);
+        this.library = library;
+    }
+
+    /**
+     * Library template (sub-template).
+     */
+    public String getLibrary() {
+        return library;
+    }
+
+    protected CliOption buildLibraryCliOption(Map<String, String> supportedLibraries) {
+        StringBuilder sb = new StringBuilder("library template (sub-template) to use:");
+        for (String lib : supportedLibraries.keySet()) {
+            sb.append("\n").append(lib).append(" - ").append(supportedLibraries.get(lib));
+        }
+        return new CliOption("library", sb.toString());
+    }
+
+    /**
+     * sanitize name (parameter, property, method, etc)
+     *
+     * @param name string to be sanitize
+     * @return sanitized string
+     */
+    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.
+
+        // input[] => input
+        name = name.replaceAll("\\[\\]", "");
+
+        // input[a][b] => input_a_b
+        name = name.replaceAll("\\[", "_");
+        name = name.replaceAll("\\]", "");
+
+        // input(a)(b) => input_a_b
+        name = name.replaceAll("\\(", "_");
+        name = name.replaceAll("\\)", "");
+
+        // input.name => input_name
+        name = name.replaceAll("\\.", "_");
+
+        // input-name => input_name
+        name = name.replaceAll("-", "_");
+
+        // input name and age => input_name_and_age
+        name = name.replaceAll(" ", "_");
+        
+        // remove everything else other than word, number and _
+        // $php_variable => php_variable
+        return name.replaceAll("[^a-zA-Z0-9_]", "");
+
     }
 }
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 a04e517bee5..e5a49f4eba4 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
@@ -1,7 +1,12 @@
 package io.swagger.codegen;
 
+import static org.apache.commons.lang3.StringUtils.capitalize;
+import static org.apache.commons.lang3.StringUtils.isNotEmpty;
+
 import com.samskivert.mustache.Mustache;
 import com.samskivert.mustache.Template;
+import io.swagger.codegen.languages.CodeGenStatus;
+import io.swagger.models.ComposedModel;
 import io.swagger.models.Contact;
 import io.swagger.models.Info;
 import io.swagger.models.License;
@@ -9,9 +14,14 @@
 import io.swagger.models.Operation;
 import io.swagger.models.Path;
 import io.swagger.models.Swagger;
+import io.swagger.models.auth.OAuth2Definition;
 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.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -20,6 +30,8 @@
 import java.io.OutputStream;
 import java.io.Reader;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -28,14 +40,16 @@
 import java.util.Map;
 import java.util.Set;
 
-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 CodegenConfig config;
     protected ClientOptInput opts = null;
     protected Swagger swagger = null;
 
+    public CodeGenStatus status = CodeGenStatus.UNRUN;
+
+    @Override
     public Generator opts(ClientOptInput opts) {
         this.opts = opts;
 
@@ -46,6 +60,7 @@ public Generator opts(ClientOptInput opts) {
         return this;
     }
 
+    @Override
     public List<File> generate() {
         if (swagger == null || config == null) {
             throw new RuntimeException("missing swagger input or config!");
@@ -56,6 +71,10 @@ public List<File> generate() {
         List<File> files = new ArrayList<File>();
         try {
             config.processOpts();
+
+            config.additionalProperties().put("generatedDate", DateTime.now().toString());
+            config.additionalProperties().put("generatorClass", config.getClass().toString());
+
             if (swagger.getInfo() != null) {
                 Info info = swagger.getInfo();
                 if (info.getTitle() != null) {
@@ -105,10 +124,8 @@ public List<File> generate() {
             }
             if (swagger.getBasePath() != null) {
                 hostBuilder.append(swagger.getBasePath());
-            } else {
-                hostBuilder.append("/");
             }
-            String contextPath = swagger.getBasePath() == null ? "/" : swagger.getBasePath();
+            String contextPath = swagger.getBasePath() == null ? "" : swagger.getBasePath();
             String basePath = hostBuilder.toString();
 
 
@@ -118,11 +135,13 @@ public List<File> generate() {
             // models
             Map<String, Model> definitions = swagger.getDefinitions();
             if (definitions != null) {
-                for (String name : definitions.keySet()) {
+            	List<String> sortedModelKeys = sortModelsByInheritance(definitions);
+
+                for (String name : sortedModelKeys) {
                     Model model = definitions.get(name);
                     Map<String, Model> modelMap = new HashMap<String, Model>();
                     modelMap.put(name, model);
-                    Map<String, Object> models = processModels(config, modelMap);
+                    Map<String, Object> models = processModels(config, modelMap, definitions);
                     models.putAll(config.additionalProperties());
 
                     allModels.add(((List<Object>) models.get("models")).get(0));
@@ -130,9 +149,14 @@ public List<File> generate() {
                     for (String templateName : config.modelTemplateFiles().keySet()) {
                         String suffix = config.modelTemplateFiles().get(templateName);
                         String filename = config.modelFileFolder() + File.separator + config.toModelFilename(name) + suffix;
-                        String template = readTemplate(config.templateDir() + File.separator + templateName);
+                        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(config.templateDir() + File.separator + name + ".mustache");
                                     }
@@ -178,13 +202,15 @@ public Reader getTemplate(String name) {
                 for (String templateName : config.apiTemplateFiles().keySet()) {
 
                     String filename = config.apiFilename(templateName, tag);
-                    if (new File(filename).exists() && !config.shouldOverwrite(filename)) {
+                    if (!config.shouldOverwrite(filename) && new File(filename).exists()) {
                         continue;
                     }
 
-                    String template = readTemplate(config.templateDir() + File.separator + templateName);
+                    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(config.templateDir() + File.separator + name + ".mustache");
                                 }
@@ -218,7 +244,11 @@ public Reader getTemplate(String name) {
             bundle.put("models", allModels);
             bundle.put("apiFolder", config.apiPackage().replace('.', File.separatorChar));
             bundle.put("modelPackage", config.modelPackage());
-            bundle.put("authMethods", config.fromSecurity(swagger.getSecurityDefinitions()));
+            List<CodegenSecurity> authMethods = config.fromSecurity(swagger.getSecurityDefinitions());
+            if (authMethods != null && !authMethods.isEmpty()) {
+                bundle.put("authMethods", authMethods);
+                bundle.put("hasAuthMethods", true);
+            }
             if (swagger.getExternalDocs() != null) {
                 bundle.put("externalDocs", swagger.getExternalDocs());
             }
@@ -245,11 +275,17 @@ public Reader getTemplate(String name) {
                     of.mkdirs();
                 }
                 String outputFilename = outputFolder + File.separator + support.destinationFilename;
+                if (!config.shouldOverwrite(outputFilename)) {
+                    continue;
+                }
+
+                String templateFile = getFullTemplateFile(config, support.templateFile);
 
-                if (support.templateFile.endsWith("mustache")) {
-                    String template = readTemplate(config.templateDir() + File.separator + support.templateFile);
+                if (templateFile.endsWith("mustache")) {
+                    String template = readTemplate(templateFile);
                     Template tmpl = Mustache.compiler()
                             .withLoader(new Mustache.TemplateLoader() {
+                                @Override
                                 public Reader getTemplate(String name) {
                                     return getTemplateReader(config.templateDir() + File.separator + name + ".mustache");
                                 }
@@ -263,20 +299,21 @@ public Reader getTemplate(String name) {
                     InputStream in = null;
 
                     try {
-                        in = new FileInputStream(config.templateDir() + File.separator + support.templateFile);
+                        in = new FileInputStream(templateFile);
                     } catch (Exception e) {
                         // continue
                     }
                     if (in == null) {
-                        in = this.getClass().getClassLoader().getResourceAsStream(config.templateDir() + File.separator + support.templateFile);
+                        in = this.getClass().getClassLoader().getResourceAsStream(getCPResourcePath(templateFile));
                     }
                     File outputFile = new File(outputFilename);
                     OutputStream out = new FileOutputStream(outputFile, false);
                     if (in != null && out != null) {
+                        System.out.println("writing file " + outputFile);
                         IOUtils.copy(in, out);
                     } else {
                         if (in == null) {
-                            System.out.println("can't open " + config.templateDir() + File.separator + support.templateFile + " for input");
+                            System.out.println("can't open " + templateFile + " for input");
                         }
                         if (out == null) {
                             System.out.println("can't open " + outputFile + " for output");
@@ -288,8 +325,10 @@ public Reader getTemplate(String name) {
             }
 
             config.processSwagger(swagger);
+
+            status = CodeGenStatus.SUCCESSFUL;
         } catch (Exception e) {
-            e.printStackTrace();
+            status = CodeGenStatus.FAILED;
         }
         return files;
     }
@@ -315,17 +354,63 @@ private void processMimeTypes(List<String> mimeTypeList, Map<String, Object> ope
         }
     }
 
+    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>>();
 
         for (String resourcePath : paths.keySet()) {
             Path path = paths.get(resourcePath);
-            processOperation(resourcePath, "get", path.getGet(), ops);
-            processOperation(resourcePath, "put", path.getPut(), ops);
-            processOperation(resourcePath, "post", path.getPost(), ops);
-            processOperation(resourcePath, "delete", path.getDelete(), ops);
-            processOperation(resourcePath, "patch", path.getPatch(), ops);
-            processOperation(resourcePath, "options", path.getOptions(), ops);
+            processOperation(resourcePath, "get", path.getGet(), ops, path);
+            processOperation(resourcePath, "put", path.getPut(), ops, path);
+            processOperation(resourcePath, "post", path.getPost(), ops, path);
+            processOperation(resourcePath, "delete", path.getDelete(), ops, path);
+            processOperation(resourcePath, "patch", path.getPatch(), ops, path);
+            processOperation(resourcePath, "options", path.getOptions(), ops, path);
         }
         return ops;
     }
@@ -338,44 +423,97 @@ public SecuritySchemeDefinition fromSecurity(String name) {
         return map.get(name);
     }
 
-
-    public void processOperation(String resourcePath, String httpMethod, Operation operation, Map<String, List<CodegenOperation>> operations) {
+    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");
+            }
             List<String> tags = operation.getTags();
             if (tags == null) {
                 tags = new ArrayList<String>();
                 tags.add("default");
             }
+            
+            /*
+             build up a set of parameter "ids" defined at the operation level
+             per the swagger 2.0 spec "A unique parameter is defined by a combination of a name and location"
+              i'm assuming "location" == "in"
+            */
+            Set<String> operationParameters = new HashSet<String>();
+            if (operation.getParameters() != null) {
+                for (Parameter parameter : operation.getParameters()) {
+                    operationParameters.add(generateParameterId(parameter));
+                }
+            }
 
-            for (String tag : tags) {
-                CodegenOperation co = config.fromOperation(resourcePath, httpMethod, operation, swagger.getDefinitions());
-                co.tags = new ArrayList<String>();
-                co.tags.add(sanitizeTag(tag));
-                config.addOperationToGroup(sanitizeTag(tag), resourcePath, operation, co, operations);
-
-                List<Map<String, List<String>>> securities = operation.getSecurity();
-                if (securities == null) {
-                    continue;
+            //need to propagate path level down to the operation
+            if(path.getParameters() != null) {
+                for (Parameter parameter : path.getParameters()) {
+                    //skip propagation if a parameter with the same name is already defined at the operation level
+                    if (!operationParameters.contains(generateParameterId(parameter))) {
+                        operation.addParameter(parameter);
+                    }
                 }
-                Map<String, SecuritySchemeDefinition> authMethods = new HashMap<String, SecuritySchemeDefinition>();
-                for (Map<String, List<String>> security : securities) {
-                    if (security.size() != 1) {
-                        //Not sure what to do
+            }
+
+            for (String tag : tags) {
+                CodegenOperation co = null;
+                try {
+                    co = config.fromOperation(resourcePath, httpMethod, operation, swagger.getDefinitions());
+                    co.tags = new ArrayList<String>();
+                    co.tags.add(sanitizeTag(tag));
+                    config.addOperationToGroup(sanitizeTag(tag), resourcePath, operation, co, operations);
+
+                    List<Map<String, List<String>>> securities = operation.getSecurity();
+                    if (securities == null) {
                         continue;
                     }
-                    String securityName = security.keySet().iterator().next();
-                    SecuritySchemeDefinition securityDefinition = fromSecurity(securityName);
-                    if (securityDefinition != null) {
-                        authMethods.put(securityName, securityDefinition);
+                    Map<String, SecuritySchemeDefinition> authMethods = new HashMap<String, SecuritySchemeDefinition>();
+                    for (Map<String, List<String>> security : securities) {
+                        if (security.size() != 1) {
+                            //Not sure what to do
+                            continue;
+                        }
+                        String securityName = security.keySet().iterator().next();
+                        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());
+                        		for (String scope : security.values().iterator().next()) {
+                        			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);
                     }
                 }
-                if (!authMethods.isEmpty()) {
-                    co.authMethods = config.fromSecurity(authMethods);
+                catch (Exception ex) {
+                   LOGGER.error("Error while trying to get Config from Operation for tag(" + tag + ")\n" //
+                         + "\tResource: " + httpMethod + " " + resourcePath + "\n"//
+                         + "\tOperation:" + operation + "\n" //
+                         + "\tDefinitions: " + swagger.getDefinitions() + "\n");
+                   ex.printStackTrace();
                 }
             }
         }
     }
 
+    private String generateParameterId(Parameter parameter) {
+        return parameter.getName() + ":" + parameter.getIn();
+    }
+
     protected String sanitizeTag(String tag) {
         // remove spaces and make strong case
         String[] parts = tag.split(" ");
@@ -392,6 +530,7 @@ public Map<String, Object> processOperations(CodegenConfig config, String tag, L
         Map<String, Object> operations = new HashMap<String, Object>();
         Map<String, Object> objs = new HashMap<String, Object>();
         objs.put("classname", config.toApiName(tag));
+        objs.put("pathPrefix", config.toApiVarName(tag));
 
         // check for operationId uniqueness
         Set<String> opIds = new HashSet<String>();
@@ -429,6 +568,12 @@ public Map<String, Object> processOperations(CodegenConfig config, String tag, L
         }
 
         operations.put("imports", imports);
+
+        // add a flag to indicate whether there's any {{import}}
+        if (imports.size() > 0) {
+            operations.put("hasImport", true);
+        }
+
         config.postProcessOperations(operations);
         if (objs.size() > 0) {
             List<CodegenOperation> os = (List<CodegenOperation>) objs.get("operation");
@@ -441,14 +586,14 @@ public Map<String, Object> processOperations(CodegenConfig config, String tag, L
         return operations;
     }
 
-    public Map<String, Object> processModels(CodegenConfig config, Map<String, Model> definitions) {
+    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());
         List<Object> models = new ArrayList<Object>();
         Set<String> allImports = new LinkedHashSet<String>();
         for (String key : definitions.keySet()) {
             Model mm = definitions.get(key);
-            CodegenModel cm = config.fromModel(key, mm);
+            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));
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 73294268f39..a6bfc7d5ddd 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
@@ -128,7 +128,7 @@ protected String toXml(String name, Property property, int indent, Collection<St
             ArrayProperty p = (ArrayProperty) property;
             Property inner = p.getItems();
             boolean wrapped = false;
-            if (property.getXml() != null && property.getXml().getWrapped()) {
+            if (property.getXml() != null && property.getXml().getWrapped() != null && property.getXml().getWrapped()) {
                 wrapped = true;
             }
             if (wrapped) {
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
new file mode 100644
index 00000000000..38c0c5307ba
--- /dev/null
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java
@@ -0,0 +1,144 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.*;
+import io.swagger.models.properties.*;
+
+import java.util.*;
+import java.io.File;
+
+public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen implements CodegenConfig {
+	@Override
+	public CodegenType getTag() {
+		return CodegenType.CLIENT;
+	}
+
+	public AbstractTypeScriptClientCodegen() {
+	    super();
+		supportsInheritance = true;
+		reservedWords = new HashSet<String>(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",
+				"Boolean",
+				"Double",
+				"Integer",
+				"Long",
+				"Float",
+				"Object"));
+		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", "any");
+	    typeMapping.put("integer", "number");
+	    typeMapping.put("Map", "any");
+	    typeMapping.put("DateTime", "Date");
+	   
+	}
+
+	@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 (reservedWords.contains(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) {
+		// 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 "{ [key: string]: "+ getTypeDeclaration(inner) + "; }";
+		} else if (p instanceof FileProperty) {
+			return "any";
+		}
+		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))
+				return type;
+		} else
+			type = swaggerType;
+		return type;
+	}
+}
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 efcd771ac10..c40eb653543 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
@@ -4,6 +4,7 @@
 import com.samskivert.mustache.Mustache;
 import com.samskivert.mustache.Template;
 import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenConstants;
 import io.swagger.codegen.CodegenOperation;
 import io.swagger.codegen.CodegenProperty;
 import io.swagger.codegen.CodegenResponse;
@@ -80,10 +81,10 @@ public AkkaScalaClientCodegen() {
                         "trait", "try", "true", "type", "val", "var", "while", "with", "yield")
         );
 
-        additionalProperties.put("invokerPackage", invokerPackage);
-        additionalProperties.put("groupId", groupId);
-        additionalProperties.put("artifactId", artifactId);
-        additionalProperties.put("artifactVersion", artifactVersion);
+        additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
+        additionalProperties.put(CodegenConstants.GROUP_ID, groupId);
+        additionalProperties.put(CodegenConstants.ARTIFACT_ID, artifactId);
+        additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion);
         additionalProperties.put("configKey", configKey);
         additionalProperties.put("configKeyPath", configKeyPath);
         additionalProperties.put("defaultTimeout", defaultTimeoutInMs);
@@ -251,6 +252,11 @@ public List<CodegenSecurity> fromSecurity(Map<String, SecuritySchemeDefinition>
 
     @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");
+        }
+
         return super.toOperationId(CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, operationId));
     }
 
@@ -396,4 +402,4 @@ public String formatFragment(String fragment) {
         }
     }
 
-}
\ No newline at end of file
+}
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 9a3237d92ca..9c55053e59c 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
@@ -2,6 +2,7 @@
 
 import io.swagger.codegen.CliOption;
 import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenConstants;
 import io.swagger.codegen.CodegenType;
 import io.swagger.codegen.DefaultCodegen;
 import io.swagger.codegen.SupportingFile;
@@ -13,6 +14,8 @@
 import java.util.Arrays;
 import java.util.HashSet;
 
+import org.apache.commons.lang.StringUtils;
+
 public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfig {
     protected String invokerPackage = "io.swagger.client";
     protected String groupId = "io.swagger";
@@ -56,11 +59,11 @@ public AndroidClientCodegen() {
         instantiationTypes.put("array", "ArrayList");
         instantiationTypes.put("map", "HashMap");
 
-        cliOptions.add(new CliOption("invokerPackage", "root package to use for the generated code"));
-        cliOptions.add(new CliOption("groupId", "groupId for use in the generated build.gradle and pom.xml"));
-        cliOptions.add(new CliOption("artifactId", "artifactId for use in the generated build.gradle and pom.xml"));
-        cliOptions.add(new CliOption("artifactVersion", "artifact version for use in the generated build.gradle and pom.xml"));
-        cliOptions.add(new CliOption("sourceFolder", "source folder for generated code"));
+        cliOptions.add(new CliOption(CodegenConstants.INVOKER_PACKAGE, CodegenConstants.INVOKER_PACKAGE_DESC));
+        cliOptions.add(new CliOption(CodegenConstants.GROUP_ID, "groupId for use in the generated build.gradle and pom.xml"));
+        cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_ID, "artifactId for use in the generated build.gradle and pom.xml"));
+        cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_VERSION, "artifact version for use in the generated build.gradle and pom.xml"));
+        cliOptions.add(new CliOption(CodegenConstants.SOURCE_FOLDER, CodegenConstants.SOURCE_FOLDER_DESC));
         cliOptions.add(new CliOption("useAndroidMavenGradlePlugin", "A flag to toggle android-maven gradle plugin. Default is true."));
     }
 
@@ -168,6 +171,11 @@ public String toModelFilename(String name) {
 
     @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
         if (reservedWords.contains(operationId)) {
             throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
@@ -180,36 +188,36 @@ public String toOperationId(String operationId) {
     public void processOpts() {
         super.processOpts();
 
-        if (additionalProperties.containsKey("invokerPackage")) {
-            this.setInvokerPackage((String) additionalProperties.get("invokerPackage"));
+        if (additionalProperties.containsKey(CodegenConstants.INVOKER_PACKAGE)) {
+            this.setInvokerPackage((String) additionalProperties.get(CodegenConstants.INVOKER_PACKAGE));
         } else {
             //not set, use default to be passed to template
-            additionalProperties.put("invokerPackage", invokerPackage);
+            additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
         }
 
-        if (additionalProperties.containsKey("groupId")) {
-            this.setGroupId((String) additionalProperties.get("groupId"));
+        if (additionalProperties.containsKey(CodegenConstants.GROUP_ID)) {
+            this.setGroupId((String) additionalProperties.get(CodegenConstants.GROUP_ID));
         } else {
             //not set, use to be passed to template
-            additionalProperties.put("groupId", groupId);
+            additionalProperties.put(CodegenConstants.GROUP_ID, groupId);
         }
 
-        if (additionalProperties.containsKey("artifactId")) {
-            this.setArtifactId((String) additionalProperties.get("artifactId"));
+        if (additionalProperties.containsKey(CodegenConstants.ARTIFACT_ID)) {
+            this.setArtifactId((String) additionalProperties.get(CodegenConstants.ARTIFACT_ID));
         } else {
             //not set, use to be passed to template
-            additionalProperties.put("artifactId", artifactId);
+            additionalProperties.put(CodegenConstants.ARTIFACT_ID, artifactId);
         }
 
-        if (additionalProperties.containsKey("artifactVersion")) {
-            this.setArtifactVersion((String) additionalProperties.get("artifactVersion"));
+        if (additionalProperties.containsKey(CodegenConstants.ARTIFACT_VERSION)) {
+            this.setArtifactVersion((String) additionalProperties.get(CodegenConstants.ARTIFACT_VERSION));
         } else {
             //not set, use to be passed to template
-            additionalProperties.put("artifactVersion", artifactVersion);
+            additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion);
         }
 
-        if (additionalProperties.containsKey("sourceFolder")) {
-            this.setSourceFolder((String) additionalProperties.get("sourceFolder"));
+        if (additionalProperties.containsKey(CodegenConstants.SOURCE_FOLDER)) {
+            this.setSourceFolder((String) additionalProperties.get(CodegenConstants.SOURCE_FOLDER));
         }
 
         if (additionalProperties.containsKey("useAndroidMavenGradlePlugin")) {
@@ -232,6 +240,8 @@ public void processOpts() {
                 (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "JsonUtil.java"));
         supportingFiles.add(new SupportingFile("apiException.mustache",
                 (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiException.java"));
+        supportingFiles.add(new SupportingFile("Pair.mustache",
+                (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "Pair.java"));
     }
 
     public Boolean getUseAndroidMavenGradlePlugin() {
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 c941d8b8d97..38e6328a8e5 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
@@ -1,6 +1,7 @@
 package io.swagger.codegen.languages;
 
 import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenConstants;
 import io.swagger.codegen.CodegenType;
 import io.swagger.codegen.DefaultCodegen;
 import io.swagger.codegen.SupportingFile;
@@ -21,6 +22,8 @@
 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";
@@ -50,10 +53,10 @@ public AsyncScalaClientCodegen() {
                         "trait", "try", "true", "type", "val", "var", "while", "with", "yield")
         );
 
-        additionalProperties.put("invokerPackage", invokerPackage);
-        additionalProperties.put("groupId", groupId);
-        additionalProperties.put("artifactId", artifactId);
-        additionalProperties.put("artifactVersion", artifactVersion);
+        additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
+        additionalProperties.put(CodegenConstants.GROUP_ID, groupId);
+        additionalProperties.put(CodegenConstants.ARTIFACT_ID, artifactId);
+        additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion);
         additionalProperties.put("asyncHttpClient", asyncHttpClient);
         additionalProperties.put("authScheme", authScheme);
         additionalProperties.put("authPreemptive", authPreemptive);
@@ -204,4 +207,4 @@ public String toDefaultValue(Property p) {
             return "null";
         }
     }
-}
\ No newline at end of file
+}
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 a564ec5f883..f10d9a0f299 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
@@ -7,22 +7,24 @@
 import io.swagger.models.properties.ArrayProperty;
 import io.swagger.models.properties.MapProperty;
 import io.swagger.models.properties.Property;
+import io.swagger.codegen.CliOption;
 
 import java.io.File;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 
+import org.apache.commons.lang.StringUtils;
+
 public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig {
-    protected String invokerPackage = "IO.Swagger.Client";
-    protected String groupId = "io.swagger";
-    protected String artifactId = "swagger-csharp-client";
-    protected String artifactVersion = "1.0.0";
-    protected String sourceFolder = "src/main/csharp";
+    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";
 
     public CSharpClientCodegen() {
         super();
-        outputFolder = "generated-code/csharp";
+        outputFolder = "generated-code" + File.separator + "csharp";
         modelTemplateFiles.put("model.mustache", ".cs");
         apiTemplateFiles.put("api.mustache", ".cs");
         templateDir = "csharp";
@@ -34,20 +36,10 @@ public CSharpClientCodegen() {
                         "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")
         );
 
-        additionalProperties.put("invokerPackage", invokerPackage);
-
-        supportingFiles.add(new SupportingFile("Configuration.mustache",
-                (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "Configuration.cs"));
-        supportingFiles.add(new SupportingFile("ApiClient.mustache",
-                (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiClient.cs"));
-        supportingFiles.add(new SupportingFile("ApiException.mustache",
-                (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiException.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"));
 
         languageSpecificPrimitives = new HashSet<String>(
                 Arrays.asList(
+                        "String",
                         "string",
                         "bool?",
                         "double?",
@@ -64,6 +56,7 @@ public CSharpClientCodegen() {
                         "Integer",
                         "Long",
                         "Float",
+                        "Stream", // not really a primitive, we include it to avoid model import
                         "Object")
         );
         instantiationTypes.put("array", "List");
@@ -79,12 +72,50 @@ public CSharpClientCodegen() {
         typeMapping.put("number", "double?");
         typeMapping.put("datetime", "DateTime?");
         typeMapping.put("date", "DateTime?");
-        typeMapping.put("file", "string"); // path to file
+        typeMapping.put("file", "Stream");
         typeMapping.put("array", "List");
         typeMapping.put("list", "List");
         typeMapping.put("map", "Dictionary");
         typeMapping.put("object", "Object");
 
+        cliOptions.clear();
+        cliOptions.add(new CliOption("packageName", "C# package name (convention: Camel.Case), default: IO.Swagger"));
+        cliOptions.add(new CliOption("packageVersion", "C# package version, default: 1.0.0"));
+
+    }
+
+    @Override
+    public void processOpts() {
+        super.processOpts();
+
+        if (additionalProperties.containsKey("packageVersion")) {
+            packageVersion = (String) additionalProperties.get("packageVersion");
+        } else {
+            additionalProperties.put("packageVersion", packageVersion);
+        }
+
+        if (additionalProperties.containsKey("packageName")) {
+            packageName = (String) additionalProperties.get("packageName");
+            apiPackage = packageName + ".Api";
+            modelPackage = packageName + ".Model";
+            clientPackage = packageName + ".Client";
+        } else {
+            additionalProperties.put("packageName", packageName);
+        }
+
+        additionalProperties.put("clientPackage", clientPackage);
+
+        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("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"));
+
     }
 
     public CodegenType getTag() {
@@ -106,17 +137,18 @@ public String escapeReservedWord(String name) {
 
     @Override
     public String apiFileFolder() {
-        return (outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', '/')).replace('.', File.separatorChar);
+
+        return outputFolder + File.separator + (sourceFolder + File.separator + apiPackage()).replace('.', File.separatorChar);
     }
 
     public String modelFileFolder() {
-        return (outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', '/')).replace('.', File.separatorChar);
+        return outputFolder + File.separator + (sourceFolder + File.separator + modelPackage()).replace('.', File.separatorChar);
     }
 
     @Override
     public String toVarName(String name) {
-        // replace - with _ e.g. created-at => created_at
-        name = name.replaceAll("-", "_");
+        // sanitize name 
+        name = sanitizeName(name);
 
         // if it's all uppper case, do nothing
         if (name.matches("^[A-Z_]*$")) {
@@ -137,8 +169,24 @@ public String toVarName(String name) {
 
     @Override
     public String toParamName(String name) {
-        // should be the same as variable name
-        return toVarName(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 (reservedWords.contains(name) || name.matches("^\\d.*")) {
+            name = escapeReservedWord(name);
+        }
+
+        return name;
     }
 
     @Override
@@ -192,12 +240,17 @@ public String getSwaggerType(Property p) {
 
     @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
         if (reservedWords.contains(operationId)) {
             throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
         }
 
-        return camelize(operationId);
+        return camelize(sanitizeName(operationId));
     }
 
 }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CodeGenStatus.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CodeGenStatus.java
new file mode 100644
index 00000000000..aa22958517f
--- /dev/null
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CodeGenStatus.java
@@ -0,0 +1,5 @@
+package io.swagger.codegen.languages;
+
+public enum CodeGenStatus {
+    UNRUN, SUCCESSFUL, FAILED
+}
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
new file mode 100644
index 00000000000..432e7ae3fa2
--- /dev/null
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java
@@ -0,0 +1,255 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CodegenConfig;
+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.MapProperty;
+import io.swagger.models.properties.Property;
+import io.swagger.codegen.CliOption;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+
+public class CsharpDotNet2ClientCodegen extends DefaultCodegen implements CodegenConfig {
+    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 + "CsharpDotNet2";
+
+    public CsharpDotNet2ClientCodegen() {
+        super();
+        outputFolder = "generated-code" + File.separator + "CsharpDotNet2";
+        modelTemplateFiles.put("model.mustache", ".cs");
+        apiTemplateFiles.put("api.mustache", ".cs");
+        templateDir = "CsharpDotNet2";
+        apiPackage = "IO.Swagger.Api";
+        modelPackage = "IO.Swagger.Model";
+
+        reservedWords = new HashSet<String>(
+                Arrays.asList(
+                        "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")
+        );
+
+
+        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");
+
+        cliOptions.clear();
+        cliOptions.add(new CliOption("packageName", "C# package name (convention: Camel.Case), default: IO.Swagger"));
+        cliOptions.add(new CliOption("packageVersion", "C# package version, default: 1.0.0"));
+
+    }
+
+    @Override
+    public void processOpts() {
+        super.processOpts();
+
+        if (additionalProperties.containsKey("packageVersion")) {
+            packageVersion = (String) additionalProperties.get("packageVersion");
+        } else {
+            additionalProperties.put("packageVersion", packageVersion);
+        }
+
+        if (additionalProperties.containsKey("packageName")) {
+            packageName = (String) additionalProperties.get("packageName");
+            apiPackage = packageName + ".Api";
+            modelPackage = packageName + ".Model";
+            clientPackage = packageName + ".Client";
+        } else {
+            additionalProperties.put("packageName", packageName);
+        }
+
+        if (additionalProperties.containsKey("clientPackage")) {
+            this.setClientPackage((String) additionalProperties.get("clientPackage"));
+        } else {
+            additionalProperties.put("clientPackage", clientPackage);
+        }
+        
+        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("packages.config.mustache", "vendor", "packages.config"));
+        supportingFiles.add(new SupportingFile("compile-mono.sh.mustache", "", "compile-mono.sh"));
+        supportingFiles.add(new SupportingFile("README.md", "", "README.md"));
+
+    }
+
+    public void setClientPackage(String clientPackage) {
+        this.clientPackage = clientPackage;
+    }
+
+    public CodegenType getTag() {
+        return CodegenType.CLIENT;
+    }
+
+    public String getName() {
+        return "CsharpDotNet2";
+    }
+
+    public String getHelp() {
+        return "Generates a C# .Net 2.0 client library.";
+    }
+
+    @Override
+    public String escapeReservedWord(String name) {
+        return "_" + name;
+    }
+
+    @Override
+    public String apiFileFolder() {
+        return (outputFolder + File.separator + sourceFolder + File.separator + apiPackage()).replace('.', File.separatorChar);
+    }
+
+    public String modelFileFolder() {
+        return (outputFolder + File.separator + sourceFolder + File.separator + 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);
+
+        // for reserved word or word starting with number, append _
+        if (reservedWords.contains(name) || name.matches("^\\d.*")) {
+            name = escapeReservedWord(name);
+        }
+
+        return name;
+    }
+
+    @Override
+    public String toParamName(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) the variable name
+        // pet_id => petId
+        name = camelize(name, true);
+
+        // 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;
+            }
+        } else {
+            type = swaggerType;
+        }
+        return toModelName(type);
+    }
+
+    @Override
+    public String toOperationId(String 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");
+        }
+
+        return camelize(operationId);
+    }
+
+}
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
new file mode 100755
index 00000000000..7c484c38a0b
--- /dev/null
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlashClientCodegen.java
@@ -0,0 +1,360 @@
+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;
+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.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.StringProperty;
+import org.apache.commons.lang.StringUtils;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+
+public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig {
+    protected String packageName = "io.swagger";
+    protected String packageVersion = null;
+
+    protected String invokerPackage = "io.swagger";
+    protected String sourceFolder = "src/main/flex";
+
+    public FlashClientCodegen() {
+        super();
+
+        modelPackage = "io.swagger.client.model";
+        apiPackage = "io.swagger.client.api";
+        outputFolder = "generated-code" + File.separatorChar + "flash";
+        modelTemplateFiles.put("model.mustache", ".as");
+        modelTemplateFiles.put("modelList.mustache", "List.as");
+        apiTemplateFiles.put("api.mustache", ".as");
+        templateDir = "flash";
+
+        languageSpecificPrimitives.clear();
+        languageSpecificPrimitives.add("Number");
+        languageSpecificPrimitives.add("Boolean");
+        languageSpecificPrimitives.add("String");
+        languageSpecificPrimitives.add("Date");
+        languageSpecificPrimitives.add("Array");
+        languageSpecificPrimitives.add("Dictionary");
+
+        typeMapping.clear();
+        typeMapping.put("integer", "Number");
+        typeMapping.put("float", "Number");
+        typeMapping.put("long", "Number");
+        typeMapping.put("double", "Number");
+        typeMapping.put("array", "Array");
+        typeMapping.put("map", "Dictionary");
+        typeMapping.put("boolean", "Boolean");
+        typeMapping.put("string", "String");
+        typeMapping.put("date", "Date");
+        typeMapping.put("DateTime", "Date");
+        typeMapping.put("object", "Object");
+        typeMapping.put("file", "File");
+
+        importMapping = new HashMap<String, String>();
+        importMapping.put("File", "flash.filesystem.File");
+
+        // from 
+        reservedWords = new HashSet<String>(
+                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"));
+
+        cliOptions.clear();
+        cliOptions.add(new CliOption("packageName", "flash package name (convention: package.name), default: io.swagger"));
+        cliOptions.add(new CliOption("packageVersion", "flash package version, default: 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"));
+
+    }
+
+    @Override
+    public void processOpts() {
+        super.processOpts();
+
+        if (additionalProperties.containsKey(CodegenConstants.INVOKER_PACKAGE)) {
+            this.setInvokerPackage((String) additionalProperties.get(CodegenConstants.INVOKER_PACKAGE));
+        } else {
+            //not set, use default to be passed to template
+            additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
+        }
+
+        if (additionalProperties.containsKey(CodegenConstants.SOURCE_FOLDER)) {
+            this.setSourceFolder((String) additionalProperties.get(CodegenConstants.SOURCE_FOLDER));
+        }
+
+        if (additionalProperties.containsKey("packageName")) {
+            setPackageName((String) additionalProperties.get("packageName"));
+            apiPackage = packageName + ".client.api";
+            modelPackage = packageName + ".client.model";
+        }
+        else {
+            setPackageName("io.swagger");
+        }
+
+        if (additionalProperties.containsKey("packageVersion")) {
+            setPackageVersion((String) additionalProperties.get("packageVersion"));
+        }
+        else {
+            setPackageVersion("1.0.0");
+        }
+
+        additionalProperties.put("packageName", packageName);
+        additionalProperties.put("packageVersion", packageVersion);
+
+        //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);
+
+        supportingFiles.add(new SupportingFile("ApiInvoker.as", invokerFolder + "common", "ApiInvoker.as"));
+        supportingFiles.add(new SupportingFile("ApiUrlHelper.as", invokerFolder + "common", "ApiUrlHelper.as"));
+        supportingFiles.add(new SupportingFile("ApiUserCredentials.as", invokerFolder + "common", "ApiUserCredentials.as"));
+        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("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("ASAXB-0.1.1.swc", sourceFolder + File.separatorChar + "lib", "ASAXB-0.1.1.swc"));
+        supportingFiles.add(new SupportingFile("as3corelib.swc", sourceFolder + File.separatorChar + "lib", "as3corelib.swc"));
+        supportingFiles.add(new SupportingFile("flexunit-4.1.0_RC2-28-flex_3.5.0.12683.swc", sourceFolder + File.separator + "lib" + File.separator + "ext", "flexunit-4.1.0_RC2-28-flex_3.5.0.12683.swc"));
+        supportingFiles.add(new SupportingFile("flexunit-aircilistener-4.1.0_RC2-28-3.5.0.12683.swc", sourceFolder + File.separator + "lib" + File.separator + "ext", "flexunit-aircilistener-4.1.0_RC2-28-3.5.0.12683.swc"));
+        supportingFiles.add(new SupportingFile("flexunit-cilistener-4.1.0_RC2-28-3.5.0.12683.swc", sourceFolder + 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"));
+    }
+
+    private static String dropDots(String str) {
+        return str.replaceAll("\\.", "_");
+    }
+
+    public CodegenType getTag() {
+        return CodegenType.CLIENT;
+    }
+
+    public String getName() {
+        return "flash";
+    }
+
+    public String getHelp() {
+        return "Generates a Flash client library.";
+    }
+
+    @Override
+    public String escapeReservedWord(String name) {
+        return name + "_";
+    }
+
+    @Override
+    public String apiFileFolder() {
+        return (outputFolder + File.separatorChar + sourceFolder + File.separatorChar + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
+    }
+
+    public String modelFileFolder() {
+        return (outputFolder + File.separatorChar + sourceFolder + File.separatorChar + 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();
+
+            return getSwaggerType(p);
+        }
+        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)) {
+                return type;
+            }
+        } else {
+            type = toModelName(swaggerType);
+        }
+        return type;
+    }
+
+    public String toDefaultValue(Property p) {
+        if (p instanceof StringProperty) {
+            return "null";
+        } else if (p instanceof BooleanProperty) {
+            return "false";
+        } 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.getDefault() != null) {
+                return dp.getDefault().toString();
+            }
+            return "0.0";
+        } else if (p instanceof FloatProperty) {
+            FloatProperty dp = (FloatProperty) p;
+            if (dp.getDefault() != null) {
+                return dp.getDefault().toString();
+            }
+            return "0.0";
+        } else if (p instanceof IntegerProperty) {
+            IntegerProperty dp = (IntegerProperty) p;
+            if (dp.getDefault() != null) {
+                return dp.getDefault().toString();
+            }
+            return "0";
+        } else if (p instanceof LongProperty) {
+            LongProperty dp = (LongProperty) p;
+            if (dp.getDefault() != null) {
+                return dp.getDefault().toString();
+            }
+            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";
+        }
+    }
+
+    @Override
+    public String toVarName(String name) {
+        // replace - with _ e.g. created-at => created_at
+        name = name.replaceAll("-", "_");
+
+        // if it's all uppper case, convert to lower case
+        if (name.matches("^[A-Z_]*$")) {
+            name = name.toLowerCase();
+        }
+
+        // underscore the variable name
+        // petId => pet_id
+        name = camelize(dropDots(name), true);
+
+        // for reserved word or word starting with number, append _
+        if (reservedWords.contains(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) {
+        // 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) {
+        // 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));
+    }
+
+    @Override
+    public String toApiFilename(String name) {
+        // replace - with _ e.g. created-at => created_at
+        name = name.replaceAll("-", "_");
+
+        // e.g. PhoneNumberApi.rb => phone_number_api.rb
+        return camelize(name) + "Api";
+    }
+
+    @Override
+    public String toApiName(String name) {
+        if (name.length() == 0) {
+            return "DefaultApi";
+        }
+        // e.g. phone_number_api => PhoneNumberApi
+        return camelize(name) + "Api";
+    }
+
+    @Override
+    public String toApiVarName(String name) {
+        if (name.length() == 0) {
+            return "DefaultApi";
+        }
+        return camelize(name) + "Api";
+    }
+
+    @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
+        if (reservedWords.contains(operationId)) {
+            throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+        }
+
+        return underscore(operationId);
+    }
+
+    public void setPackageName(String packageName) {
+        this.packageName = packageName;
+    }
+
+    public void setPackageVersion(String packageVersion) {
+        this.packageVersion = packageVersion;
+    }
+
+    public void setInvokerPackage(String invokerPackage) {
+        this.invokerPackage = invokerPackage;
+    }
+
+    public void setSourceFolder(String sourceFolder) {
+        this.sourceFolder = sourceFolder;
+    }
+
+}
+
+
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 fcec455e9b3..fc72cbd21c5 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
@@ -1,24 +1,42 @@
 package io.swagger.codegen.languages;
 
+import com.google.common.base.Strings;
 import io.swagger.codegen.CliOption;
 import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenConstants;
+import io.swagger.codegen.CodegenModel;
+import io.swagger.codegen.CodegenProperty;
 import io.swagger.codegen.CodegenType;
 import io.swagger.codegen.DefaultCodegen;
 import io.swagger.codegen.SupportingFile;
+import io.swagger.models.Model;
 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.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.HashSet;
+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 JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
+    private static final Logger LOGGER = LoggerFactory.getLogger(JavaClientCodegen.class);
+
     protected String invokerPackage = "io.swagger.client";
     protected String groupId = "io.swagger";
     protected String artifactId = "swagger-java-client";
     protected String artifactVersion = "1.0.0";
     protected String sourceFolder = "src/main/java";
+    protected String localVariablePrefix = "";
+    protected Boolean serializableModel = false;
 
     public JavaClientCodegen() {
         super();
@@ -49,26 +67,37 @@ public JavaClientCodegen() {
                         "Integer",
                         "Long",
                         "Float",
-                        "Object")
+                        "Object",
+                        "byte[]")
         );
         instantiationTypes.put("array", "ArrayList");
         instantiationTypes.put("map", "HashMap");
 
-        cliOptions.add(new CliOption("invokerPackage", "root package for generated code"));
-        cliOptions.add(new CliOption("groupId", "groupId in generated pom.xml"));
-        cliOptions.add(new CliOption("artifactId", "artifactId in generated pom.xml"));
-        cliOptions.add(new CliOption("artifactVersion", "artifact version in generated pom.xml"));
-        cliOptions.add(new CliOption("sourceFolder", "source folder for generated code"));
+        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));
+        cliOptions.add(new CliOption(CodegenConstants.SOURCE_FOLDER, CodegenConstants.SOURCE_FOLDER_DESC));
+        cliOptions.add(new CliOption(CodegenConstants.LOCAL_VARIABLE_PREFIX, CodegenConstants.LOCAL_VARIABLE_PREFIX_DESC));
+        cliOptions.add(new CliOption(CodegenConstants.SERIALIZABLE_MODEL, CodegenConstants.SERIALIZABLE_MODEL_DESC));
+
+        supportedLibraries.put("<default>", "HTTP client: Jersey client 1.18. JSON processing: Jackson 2.4.2");
+        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");
+        cliOptions.add(buildLibraryCliOption(supportedLibraries));
     }
 
+    @Override
     public CodegenType getTag() {
         return CodegenType.CLIENT;
     }
 
+    @Override
     public String getName() {
         return "java";
     }
 
+    @Override
     public String getHelp() {
         return "Generates a Java client library.";
     }
@@ -76,47 +105,75 @@ public String getHelp() {
     @Override
     public void processOpts() {
         super.processOpts();
-
-        if (additionalProperties.containsKey("invokerPackage")) {
-            this.setInvokerPackage((String) additionalProperties.get("invokerPackage"));
+        
+        if (additionalProperties.containsKey(CodegenConstants.INVOKER_PACKAGE)) {
+            this.setInvokerPackage((String) additionalProperties.get(CodegenConstants.INVOKER_PACKAGE));
         } else {
             //not set, use default to be passed to template
-            additionalProperties.put("invokerPackage", invokerPackage);
+            additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
         }
 
-        if (additionalProperties.containsKey("groupId")) {
-            this.setGroupId((String) additionalProperties.get("groupId"));
+        if (additionalProperties.containsKey(CodegenConstants.GROUP_ID)) {
+            this.setGroupId((String) additionalProperties.get(CodegenConstants.GROUP_ID));
         } else {
             //not set, use to be passed to template
-            additionalProperties.put("groupId", groupId);
+            additionalProperties.put(CodegenConstants.GROUP_ID, groupId);
         }
 
-        if (additionalProperties.containsKey("artifactId")) {
-            this.setArtifactId((String) additionalProperties.get("artifactId"));
+        if (additionalProperties.containsKey(CodegenConstants.ARTIFACT_ID)) {
+            this.setArtifactId((String) additionalProperties.get(CodegenConstants.ARTIFACT_ID));
         } else {
             //not set, use to be passed to template
-            additionalProperties.put("artifactId", artifactId);
+            additionalProperties.put(CodegenConstants.ARTIFACT_ID, artifactId);
         }
 
-        if (additionalProperties.containsKey("artifactVersion")) {
-            this.setArtifactVersion((String) additionalProperties.get("artifactVersion"));
+        if (additionalProperties.containsKey(CodegenConstants.ARTIFACT_VERSION)) {
+            this.setArtifactVersion((String) additionalProperties.get(CodegenConstants.ARTIFACT_VERSION));
         } else {
             //not set, use to be passed to template
-            additionalProperties.put("artifactVersion", artifactVersion);
+            additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion);
+        }
+
+        if (additionalProperties.containsKey(CodegenConstants.SOURCE_FOLDER)) {
+            this.setSourceFolder((String) additionalProperties.get(CodegenConstants.SOURCE_FOLDER));
         }
 
-        if (additionalProperties.containsKey("sourceFolder")) {
-            this.setSourceFolder((String) additionalProperties.get("sourceFolder"));
+
+        if (additionalProperties.containsKey(CodegenConstants.LOCAL_VARIABLE_PREFIX)) {
+            this.setLocalVariablePrefix((String) additionalProperties.get(CodegenConstants.LOCAL_VARIABLE_PREFIX));
+        }
+
+        if (additionalProperties.containsKey(CodegenConstants.SERIALIZABLE_MODEL)) {
+            this.setSerializableModel(Boolean.valueOf((String)additionalProperties.get(CodegenConstants.SERIALIZABLE_MODEL).toString()));
         }
 
+        // need to put back serializableModel (boolean) into additionalProperties as value in additionalProperties is string
+        additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, serializableModel);
+
+        this.sanitizeConfig();
+
         final String invokerFolder = (sourceFolder + File.separator + invokerPackage).replace(".", File.separator);
         supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
         supportingFiles.add(new SupportingFile("ApiClient.mustache", invokerFolder, "ApiClient.java"));
         supportingFiles.add(new SupportingFile("apiException.mustache", invokerFolder, "ApiException.java"));
         supportingFiles.add(new SupportingFile("Configuration.mustache", invokerFolder, "Configuration.java"));
-        supportingFiles.add(new SupportingFile("JsonUtil.mustache", invokerFolder, "JsonUtil.java"));
+        supportingFiles.add(new SupportingFile("JSON.mustache", invokerFolder, "JSON.java"));
+        supportingFiles.add(new SupportingFile("Pair.mustache", invokerFolder, "Pair.java"));
         supportingFiles.add(new SupportingFile("StringUtil.mustache", invokerFolder, "StringUtil.java"));
 
+        // library-specific files
+        if ("okhttp-gson".equals(getLibrary())) {
+            // the "okhttp-gson" library template requires "ApiCallback.mustache" for async call
+            supportingFiles.add(new SupportingFile("ApiCallback.mustache", invokerFolder, "ApiCallback.java"));
+            // "build.gradle" is for development with Gradle
+            supportingFiles.add(new SupportingFile("build.gradle.mustache", "", "build.gradle"));
+            // "build.sbt" is for development with SBT
+            supportingFiles.add(new SupportingFile("build.sbt.mustache", "", "build.sbt"));
+            // and does not require "TypeRef.mustache"
+        } else {
+            supportingFiles.add(new SupportingFile("TypeRef.mustache", invokerFolder, "TypeRef.java"));
+        }
+
         final String authFolder = (sourceFolder + File.separator + invokerPackage + ".auth").replace(".", File.separator);
         supportingFiles.add(new SupportingFile("auth/Authentication.mustache", authFolder, "Authentication.java"));
         supportingFiles.add(new SupportingFile("auth/HttpBasicAuth.mustache", authFolder, "HttpBasicAuth.java"));
@@ -124,7 +181,26 @@ public void processOpts() {
         supportingFiles.add(new SupportingFile("auth/OAuth.mustache", authFolder, "OAuth.java"));
     }
 
-
+    private void sanitizeConfig() {
+        // Sanitize any config options here. We also have to update the additionalProperties because 
+        // the whole additionalProperties object is injected into the main object passed to the mustache layer
+        
+        this.setApiPackage(sanitizePackageName(apiPackage));
+        if (additionalProperties.containsKey(CodegenConstants.API_PACKAGE)) {
+            this.additionalProperties.put(CodegenConstants.API_PACKAGE, apiPackage);
+        }
+        
+        this.setModelPackage(sanitizePackageName(modelPackage));
+        if (additionalProperties.containsKey(CodegenConstants.MODEL_PACKAGE)) {
+            this.additionalProperties.put(CodegenConstants.MODEL_PACKAGE, modelPackage);
+        }
+        
+        this.setInvokerPackage(sanitizePackageName(invokerPackage));
+        if (additionalProperties.containsKey(CodegenConstants.INVOKER_PACKAGE)) {
+            this.additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
+        }
+    }
+    
     @Override
     public String escapeReservedWord(String name) {
         return "_" + name;
@@ -135,14 +211,19 @@ public String apiFileFolder() {
         return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
     }
 
+    @Override
     public String modelFileFolder() {
         return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
     }
 
     @Override
     public String toVarName(String name) {
-        // replace - with _ e.g. created-at => created_at
-        name = name.replaceAll("-", "_");
+        // sanitize name
+        name = sanitizeName(name);
+
+        if("_".equals(name)) {
+          name = "_u";
+        }
 
         // if it's all uppper case, do nothing
         if (name.matches("^[A-Z_]*$")) {
@@ -169,6 +250,8 @@ public String toParamName(String name) {
 
     @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");
@@ -200,6 +283,18 @@ public String getTypeDeclaration(Property p) {
         return super.getTypeDeclaration(p);
     }
 
+    @Override
+    public String toDefaultValue(Property p) {
+        if (p instanceof ArrayProperty) {
+            final ArrayProperty ap = (ArrayProperty) p;
+            return String.format("new ArrayList<%s>()", getTypeDeclaration(ap.getItems()));
+        } else if (p instanceof MapProperty) {
+            final MapProperty ap = (MapProperty) p;
+            return String.format("new HashMap<String, %s>()", getTypeDeclaration(ap.getAdditionalProperties()));
+        }
+        return super.toDefaultValue(p);
+    }
+
     @Override
     public String getSwaggerType(Property p) {
         String swaggerType = super.getSwaggerType(p);
@@ -207,22 +302,108 @@ public String getSwaggerType(Property p) {
         if (typeMapping.containsKey(swaggerType)) {
             type = typeMapping.get(swaggerType);
             if (languageSpecificPrimitives.contains(type)) {
-                return toModelName(type);
+                return type;
             }
         } else {
             type = swaggerType;
         }
+        if (null == type) {
+            LOGGER.error("No Type defined for Property " + p);
+        }
         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
         if (reservedWords.contains(operationId)) {
             throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
         }
 
-        return camelize(operationId, true);
+        return camelize(sanitizeName(operationId), true);
+    }
+
+    @Override
+    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);
+        }
+
+        return codegenModel;
+    }
+
+    @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) {
+                Map<String, Object> allowableValues = var.allowableValues;
+                if (allowableValues == null)
+                    continue;
+                List<String> values = (List<String>) allowableValues.get("values");
+                // put "enumVars" map into `allowableValues", including `name` and `value`
+                if (values == null)
+                    continue;
+                List<Map<String, String>> enumVars = new ArrayList<Map<String, String>>();
+                for (String value : values) {
+                    Map<String, String> enumVar = new HashMap<String, String>();
+                    enumVar.put("name", toVarName(value.toUpperCase()));
+                    enumVar.put("value", value);
+                    enumVars.add(enumVar);
+                }
+                allowableValues.put("enumVars", enumVars);
+            }
+        }
+        return objs;
+    }
+
+    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
+            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();
+                        }
+                    }
+                }
+            }
+
+            codegenModel.vars = codegenProperties;
+        }
+
+        return codegenModel;
     }
 
     public void setInvokerPackage(String invokerPackage) {
@@ -244,4 +425,27 @@ public void setArtifactVersion(String artifactVersion) {
     public void setSourceFolder(String sourceFolder) {
         this.sourceFolder = sourceFolder;
     }
+
+    public void setLocalVariablePrefix(String localVariablePrefix) {
+        this.localVariablePrefix = localVariablePrefix;
+    }
+
+
+    public Boolean getSerializableModel() {
+        return serializableModel;
+    }
+
+    public void setSerializableModel(Boolean serializableModel) {
+        this.serializableModel = serializableModel;
+    }
+
+    private String sanitizePackageName(String packageName) {
+        packageName = packageName.trim();
+        packageName = packageName.replaceAll("[^a-zA-Z0-9_\\.]", "_");
+        if(Strings.isNullOrEmpty(packageName)) {
+            return "invalidPackageName";
+        }
+        return packageName;
+    }
+
 }
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
new file mode 100644
index 00000000000..56dbdd0e48b
--- /dev/null
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java
@@ -0,0 +1,189 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenConstants;
+import io.swagger.codegen.CodegenOperation;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.SupportingFile;
+import io.swagger.models.Operation;
+import io.swagger.models.Swagger;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.Property;
+import io.swagger.util.Json;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+public class JavaInflectorServerCodegen extends JavaClientCodegen implements CodegenConfig {
+    protected String invokerPackage = "io.swagger.handler";
+    protected String groupId = "io.swagger";
+    protected String artifactId = "swagger-inflector-server";
+    protected String artifactVersion = "1.0.0";
+    protected String title = "Swagger Inflector";
+
+    public JavaInflectorServerCodegen() {
+        super();
+
+        sourceFolder = "src/main/java";
+        modelTemplateFiles.put("model.mustache", ".java");
+        apiTemplateFiles.put("api.mustache", ".java");
+        templateDir = "JavaInflector";
+
+        apiPackage = System.getProperty("swagger.codegen.inflector.apipackage", "io.swagger.handler");
+        modelPackage = System.getProperty("swagger.codegen.inflector.modelpackage", "io.swagger.model");
+
+        additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
+        additionalProperties.put(CodegenConstants.GROUP_ID, groupId);
+        additionalProperties.put(CodegenConstants.ARTIFACT_ID, artifactId);
+        additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion);
+        additionalProperties.put("title", title);
+
+        languageSpecificPrimitives = new HashSet<String>(
+                Arrays.asList(
+                        "String",
+                        "boolean",
+                        "Boolean",
+                        "Double",
+                        "Integer",
+                        "Long",
+                        "Float")
+        );
+    }
+
+    public CodegenType getTag() {
+        return CodegenType.SERVER;
+    }
+
+    public String getName() {
+        return "inflector";
+    }
+
+    public String getHelp() {
+        return "Generates a Java Inflector Server application.";
+    }
+
+    @Override
+    public void processOpts() {
+        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"));
+    }
+
+    @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;
+        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 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.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);
+                        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);
+                        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);
+                        operation.returnContainer = "Set";
+                    }
+                }
+            }
+        }
+        return objs;
+    }
+
+    @Override
+    public void processSwagger(Swagger swagger) {
+        super.processSwagger(swagger);
+
+        try {
+            File file = new File( outputFolder + "/src/main/swagger/swagger.json" );
+            file.getParentFile().mkdirs();
+
+            FileWriter swaggerFile = new FileWriter(file);
+            swaggerFile.write( Json.pretty( swagger ));
+            swaggerFile.flush();
+            swaggerFile.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public String toApiName(String name) {
+        if (name.length() == 0) {
+            return "DefaultController";
+        }
+        name = name.replaceAll("[^a-zA-Z0-9]+", "_");
+        return camelize(name)+ "Controller";
+    }
+
+    public boolean shouldOverwrite(String filename) {
+        return super.shouldOverwrite(filename);
+    }
+}
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/JaxRSServerCodegen.java
index ac541157458..eb0f6be03e9 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/JaxRSServerCodegen.java
@@ -1,13 +1,12 @@
 package io.swagger.codegen.languages;
 
 import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenConstants;
 import io.swagger.codegen.CodegenOperation;
+import io.swagger.codegen.CodegenResponse;
 import io.swagger.codegen.CodegenType;
 import io.swagger.codegen.SupportingFile;
 import io.swagger.models.Operation;
-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.ArrayList;
@@ -38,10 +37,10 @@ public JaxRSServerCodegen() {
         apiPackage = System.getProperty("swagger.codegen.jaxrs.apipackage", "io.swagger.api");
         modelPackage = System.getProperty("swagger.codegen.jaxrs.modelpackage", "io.swagger.model");
 
-        additionalProperties.put("invokerPackage", invokerPackage);
-        additionalProperties.put("groupId", groupId);
-        additionalProperties.put("artifactId", artifactId);
-        additionalProperties.put("artifactVersion", artifactVersion);
+        additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
+        additionalProperties.put(CodegenConstants.GROUP_ID, groupId);
+        additionalProperties.put(CodegenConstants.ARTIFACT_ID, artifactId);
+        additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion);
         additionalProperties.put("title", title);
 
 
@@ -89,21 +88,6 @@ public void processOpts() {
 
     }
 
-    @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;
@@ -137,27 +121,35 @@ public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
         if (operations != null) {
             List<CodegenOperation> ops = (List<CodegenOperation>) operations.get("operation");
             for (CodegenOperation operation : ops) {
+                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);
+                        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);
+                        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);
+                        operation.returnType = rt.substring("Set<".length(), end).trim();
                         operation.returnContainer = "Set";
                     }
                 }
@@ -166,6 +158,15 @@ public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
         return objs;
     }
 
+    @Override
+    public String toApiName(String name) {
+        if (name.length() == 0) {
+            return "DefaultApi";
+        }
+        name = sanitizeName(name);
+        return camelize(name) + "Api";
+    }
+
     @Override
     public String apiFilename(String templateName, String tag) {
 
@@ -200,7 +201,6 @@ private String implFileFolder(String output) {
     }
 
     public boolean shouldOverwrite(String filename) {
-
-        return !filename.endsWith("ServiceImpl.java") && !filename.endsWith("ServiceFactory.java");
+        return super.shouldOverwrite(filename) && !filename.endsWith("ServiceImpl.java") && !filename.endsWith("ServiceFactory.java");
     }
-}
\ No newline at end of file
+}
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 28a0abfb6f7..10070ece512 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
@@ -9,11 +9,19 @@
 import io.swagger.codegen.SupportingFile;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
+
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Multimap;
 
 public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig {
     protected String apiVersion = "1.0.0";
@@ -197,4 +205,50 @@ public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
         }
         return objs;
     }
+
+    @SuppressWarnings("unchecked")
+    private 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");
+        for (Map<String, Object> api : apis) {
+            result.add((Map<String, Object>) api.get("operations"));
+        }
+        return result;
+    }
+
+    private List<Map<String, Object>> sortOperationsByPath(List<CodegenOperation> ops) {
+        Multimap<String, CodegenOperation> opsByPath = ArrayListMultimap.create();
+
+        for (CodegenOperation op : ops) {
+            opsByPath.put(op.path, op);
+        }
+
+        List<Map<String, Object>> opsByPathList = new ArrayList<Map<String, Object>>();
+        for (Entry<String, Collection<CodegenOperation>> entry : opsByPath.asMap().entrySet()) {
+            Map<String, Object> opsByPathEntry = new HashMap<String, Object>();
+            opsByPathList.add(opsByPathEntry);
+            opsByPathEntry.put("path", entry.getKey());
+            opsByPathEntry.put("operation", entry.getValue());
+            List<CodegenOperation> operationsForThisPath = Lists.newArrayList(entry.getValue());
+            operationsForThisPath.get(operationsForThisPath.size() - 1).hasMore = null;
+            if (opsByPathList.size() < opsByPath.asMap().size()) {
+                opsByPathEntry.put("hasMore", "true");
+            }
+        }
+
+        return opsByPathList;
+    }
+
+    @Override
+    public Map<String, Object> postProcessSupportingFileData(Map<String, Object> objs) {
+        for (Map<String, Object> operations : getOperations(objs)) {
+            @SuppressWarnings("unchecked")
+            List<CodegenOperation> ops = (List<CodegenOperation>) operations.get("operation");
+
+            List<Map<String, Object>> opsByPathList = sortOperationsByPath(ops);
+            operations.put("operationsByPath", opsByPathList);
+        }
+        return super.postProcessSupportingFileData(objs);
+    }
 }
\ No newline at end of file
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 f0c0a8ffa80..dfb4094f2b6 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
@@ -16,45 +16,64 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.commons.lang.StringUtils;
+
 public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
     protected Set<String> foundationClasses = new HashSet<String>();
-    protected String sourceFolder = "client";
+    protected String podName = "SwaggerClient";
+    protected String podVersion = "1.0.0";
     protected String classPrefix = "SWG";
-    protected String projectName = "swaggerClient";
 
     public ObjcClientCodegen() {
         super();
+        
         outputFolder = "generated-code" + File.separator + "objc";
         modelTemplateFiles.put("model-header.mustache", ".h");
         modelTemplateFiles.put("model-body.mustache", ".m");
         apiTemplateFiles.put("api-header.mustache", ".h");
         apiTemplateFiles.put("api-body.mustache", ".m");
         templateDir = "objc";
-        modelPackage = "";
 
-        defaultIncludes = new HashSet<String>(
-                Arrays.asList(
-                        "bool",
-                        "BOOL",
-                        "int",
-                        "NSString",
-                        "NSObject",
-                        "NSArray",
-                        "NSNumber",
-                        "NSDate",
-                        "NSDictionary",
-                        "NSMutableArray",
-                        "NSMutableDictionary")
-        );
-        languageSpecificPrimitives = new HashSet<String>(
-                Arrays.asList(
-                        "NSNumber",
-                        "NSString",
-                        "NSObject",
-                        "NSDate",
-                        "bool",
-                        "BOOL")
-        );
+        defaultIncludes.clear();
+        defaultIncludes.add("bool");
+        defaultIncludes.add("BOOL");
+        defaultIncludes.add("int");
+        defaultIncludes.add("NSURL");
+        defaultIncludes.add("NSString");
+        defaultIncludes.add("NSObject");
+        defaultIncludes.add("NSArray");
+        defaultIncludes.add("NSNumber");
+        defaultIncludes.add("NSDate");
+        defaultIncludes.add("NSDictionary");
+        defaultIncludes.add("NSMutableArray");
+        defaultIncludes.add("NSMutableDictionary");
+        
+        languageSpecificPrimitives.clear();
+        languageSpecificPrimitives.add("NSNumber");
+        languageSpecificPrimitives.add("NSString");
+        languageSpecificPrimitives.add("NSObject");
+        languageSpecificPrimitives.add("NSDate");
+        languageSpecificPrimitives.add("NSURL");
+        languageSpecificPrimitives.add("bool");
+        languageSpecificPrimitives.add("BOOL");
+
+        typeMapping.clear();
+        typeMapping.put("enum", "NSString");
+        typeMapping.put("date", "NSDate");
+        typeMapping.put("DateTime", "NSDate");
+        typeMapping.put("boolean", "NSNumber");
+        typeMapping.put("string", "NSString");
+        typeMapping.put("integer", "NSNumber");
+        typeMapping.put("int", "NSNumber");
+        typeMapping.put("float", "NSNumber");
+        typeMapping.put("long", "NSNumber");
+        typeMapping.put("double", "NSNumber");
+        typeMapping.put("array", "NSArray");
+        typeMapping.put("map", "NSDictionary");
+        typeMapping.put("number", "NSNumber");
+        typeMapping.put("List", "NSArray");
+        typeMapping.put("object", "NSObject");
+        typeMapping.put("file", "NSURL");
 
         // ref: http://www.tutorialspoint.com/objective_c/objective_c_basic_syntax.htm
         reservedWords = new HashSet<String>(
@@ -70,26 +89,10 @@ public ObjcClientCodegen() {
                         "double", "protocol", "interface", "implementation",
                         "NSObject", "NSInteger", "NSNumber", "CGFloat",
                         "property", "nonatomic", "retain", "strong",
-                        "weak", "unsafe_unretained", "readwrite", "readonly"
+                        "weak", "unsafe_unretained", "readwrite", "readonly",
+                        "description"
                 ));
 
-        typeMapping = new HashMap<String, String>();
-        typeMapping.put("enum", "NSString");
-        typeMapping.put("Date", "NSDate");
-        typeMapping.put("DateTime", "NSDate");
-        typeMapping.put("boolean", "BOOL");
-        typeMapping.put("string", "NSString");
-        typeMapping.put("integer", "NSNumber");
-        typeMapping.put("int", "NSNumber");
-        typeMapping.put("float", "NSNumber");
-        typeMapping.put("long", "NSNumber");
-        typeMapping.put("double", "NSNumber");
-        typeMapping.put("array", "NSArray");
-        typeMapping.put("map", "NSDictionary");
-        typeMapping.put("number", "NSNumber");
-        typeMapping.put("List", "NSArray");
-        typeMapping.put("object", "NSObject");
-
         importMapping = new HashMap<String, String>();
 
         foundationClasses = new HashSet<String>(
@@ -98,15 +101,17 @@ public ObjcClientCodegen() {
                         "NSObject",
                         "NSString",
                         "NSDate",
+                        "NSURL",
                         "NSDictionary")
         );
 
         instantiationTypes.put("array", "NSMutableArray");
         instantiationTypes.put("map", "NSMutableDictionary");
 
-        cliOptions.add(new CliOption("classPrefix", "prefix for generated classes"));
-        cliOptions.add(new CliOption("sourceFolder", "source folder for generated code"));
-        cliOptions.add(new CliOption("projectName", "name of the Xcode project in generated Podfile"));
+        cliOptions.clear();
+        cliOptions.add(new CliOption("classPrefix", "prefix for generated classes (convention: Abbreviation of pod name e.g. `HN` for `HackerNews`), default: `SWG`"));
+        cliOptions.add(new CliOption("podName", "cocoapods package name (convention: CameCase), default: `SwaggerClient`"));
+        cliOptions.add(new CliOption("podVersion", "cocoapods package version, default: `1.0.0`"));
     }
 
     public CodegenType getTag() {
@@ -125,33 +130,43 @@ public String getHelp() {
     public void processOpts() {
         super.processOpts();
 
-        if (additionalProperties.containsKey("sourceFolder")) {
-            this.setSourceFolder((String) additionalProperties.get("sourceFolder"));
+        if (additionalProperties.containsKey("podName")) {
+            setPodName((String) additionalProperties.get("podName"));
         }
 
-        if (additionalProperties.containsKey("classPrefix")) {
-            this.setClassPrefix((String) additionalProperties.get("classPrefix"));
+        if (additionalProperties.containsKey("podVersion")) {
+            setPodVersion((String) additionalProperties.get("podVersion"));
         }
 
-        if (additionalProperties.containsKey("projectName")) {
-            this.setProjectName((String) additionalProperties.get("projectName"));
-        } else {
-            additionalProperties.put("projectName", projectName);
+        if (additionalProperties.containsKey("classPrefix")) {
+            setClassPrefix((String) additionalProperties.get("classPrefix"));
         }
 
-        supportingFiles.add(new SupportingFile("SWGObject.h", sourceFolder, "SWGObject.h"));
-        supportingFiles.add(new SupportingFile("SWGObject.m", sourceFolder, "SWGObject.m"));
-        supportingFiles.add(new SupportingFile("SWGQueryParamCollection.h", sourceFolder, "SWGQueryParamCollection.h"));
-        supportingFiles.add(new SupportingFile("SWGQueryParamCollection.m", sourceFolder, "SWGQueryParamCollection.m"));
-        supportingFiles.add(new SupportingFile("SWGApiClient.h", sourceFolder, "SWGApiClient.h"));
-        supportingFiles.add(new SupportingFile("SWGApiClient.m", sourceFolder, "SWGApiClient.m"));
-        supportingFiles.add(new SupportingFile("SWGFile.h", sourceFolder, "SWGFile.h"));
-        supportingFiles.add(new SupportingFile("SWGFile.m", sourceFolder, "SWGFile.m"));
-        supportingFiles.add(new SupportingFile("JSONValueTransformer+ISO8601.m", sourceFolder, "JSONValueTransformer+ISO8601.m"));
-        supportingFiles.add(new SupportingFile("JSONValueTransformer+ISO8601.h", sourceFolder, "JSONValueTransformer+ISO8601.h"));
-        supportingFiles.add(new SupportingFile("SWGConfiguration-body.mustache", sourceFolder, "SWGConfiguration.m"));
-        supportingFiles.add(new SupportingFile("SWGConfiguration-header.mustache", sourceFolder, "SWGConfiguration.h"));
-        supportingFiles.add(new SupportingFile("Podfile.mustache", "", "Podfile"));
+        additionalProperties.put("podName", podName);
+        additionalProperties.put("podVersion", podVersion);
+        additionalProperties.put("classPrefix", classPrefix);
+
+        String swaggerFolder = podName;
+
+        modelPackage = swaggerFolder;
+        apiPackage = swaggerFolder;
+
+        supportingFiles.add(new SupportingFile("Object-header.mustache", swaggerFolder, classPrefix + "Object.h"));
+        supportingFiles.add(new SupportingFile("Object-body.mustache", swaggerFolder, classPrefix + "Object.m"));
+        supportingFiles.add(new SupportingFile("QueryParamCollection-header.mustache", swaggerFolder, classPrefix + "QueryParamCollection.h"));
+        supportingFiles.add(new SupportingFile("QueryParamCollection-body.mustache", swaggerFolder, classPrefix + "QueryParamCollection.m"));
+        supportingFiles.add(new SupportingFile("ApiClient-header.mustache", swaggerFolder, classPrefix + "ApiClient.h"));
+        supportingFiles.add(new SupportingFile("ApiClient-body.mustache", swaggerFolder, classPrefix + "ApiClient.m"));
+        supportingFiles.add(new SupportingFile("JSONResponseSerializer-header.mustache", swaggerFolder, classPrefix + "JSONResponseSerializer.h"));
+        supportingFiles.add(new SupportingFile("JSONResponseSerializer-body.mustache", swaggerFolder, classPrefix + "JSONResponseSerializer.m"));
+        supportingFiles.add(new SupportingFile("JSONRequestSerializer-body.mustache", swaggerFolder, classPrefix + "JSONRequestSerializer.m"));
+        supportingFiles.add(new SupportingFile("JSONRequestSerializer-header.mustache", swaggerFolder, classPrefix + "JSONRequestSerializer.h"));
+        supportingFiles.add(new SupportingFile("JSONValueTransformer+ISO8601.m", swaggerFolder, "JSONValueTransformer+ISO8601.m"));
+        supportingFiles.add(new SupportingFile("JSONValueTransformer+ISO8601.h", swaggerFolder, "JSONValueTransformer+ISO8601.h"));
+        supportingFiles.add(new SupportingFile("Configuration-body.mustache", swaggerFolder, classPrefix + "Configuration.m"));
+        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"));
     }
 
     @Override
@@ -200,21 +215,32 @@ public String getTypeDeclaration(Property p) {
             Property inner = ap.getItems();
             String innerType = getSwaggerType(inner);
 
+            String innerTypeDeclaration = getTypeDeclaration(inner);
+
+            if (innerTypeDeclaration.endsWith("*")) {
+                innerTypeDeclaration = innerTypeDeclaration.substring(0, innerTypeDeclaration.length() - 1);
+            }
+
             // In this codition, type of property p is array of primitive,
-            // return container type with pointer, e.g. `NSArray*'
+            // return container type with pointer, e.g. `NSArray* /* NSString */'
             if (languageSpecificPrimitives.contains(innerType)) {
-                return getSwaggerType(p) + "*";
+                return getSwaggerType(p) + "*" + " /* " + innerTypeDeclaration + " */";
             }
-
             // In this codition, type of property p is array of model,
             // return container type combine inner type with pointer, e.g. `NSArray<SWGTag>*'
+            else {
+                return getSwaggerType(p) + "<" + innerTypeDeclaration + ">*";
+            }
+        } else if (p instanceof MapProperty) {
+            MapProperty mp = (MapProperty) p;
+            Property inner = mp.getAdditionalProperties();
+
             String innerTypeDeclaration = getTypeDeclaration(inner);
 
             if (innerTypeDeclaration.endsWith("*")) {
                 innerTypeDeclaration = innerTypeDeclaration.substring(0, innerTypeDeclaration.length() - 1);
             }
-
-            return getSwaggerType(p) + "<" + innerTypeDeclaration + ">*";
+            return getSwaggerType(p) + "* /* NSString, " + innerTypeDeclaration + " */";
         } else {
             String swaggerType = getSwaggerType(p);
 
@@ -273,11 +299,7 @@ protected void setNonArrayMapProperty(CodegenProperty property, String type) {
 
     @Override
     public String toModelImport(String name) {
-        if ("".equals(modelPackage())) {
-            return name;
-        } else {
-            return modelPackage() + "." + name;
-        }
+        return name;
     }
 
     @Override
@@ -287,12 +309,12 @@ public String toDefaultValue(Property p) {
 
     @Override
     public String apiFileFolder() {
-        return outputFolder + File.separator + sourceFolder;
+        return outputFolder + File.separatorChar + apiPackage();
     }
 
     @Override
     public String modelFileFolder() {
-        return outputFolder + File.separator + sourceFolder;
+        return outputFolder + File.separatorChar + modelPackage();
     }
 
     @Override
@@ -306,9 +328,8 @@ public String toApiFilename(String name) {
 
     @Override
     public String toVarName(String name) {
-        // replace non-word characters to `_`
-        // e.g. `created-at` to `created_at`
-        name = name.replaceAll("[^a-zA-Z0-9_]", "_");
+        // sanitize name
+        name = sanitizeName(name);
 
         // if it's all upper case, do noting
         if (name.matches("^[A-Z_]$")) {
@@ -339,23 +360,28 @@ public String escapeReservedWord(String name) {
 
     @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
         if (reservedWords.contains(operationId)) {
             throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
         }
 
-        return camelize(operationId, true);
-    }
-
-    public void setSourceFolder(String sourceFolder) {
-        this.sourceFolder = sourceFolder;
+        return camelize(sanitizeName(operationId), true);
     }
 
     public void setClassPrefix(String classPrefix) {
         this.classPrefix = classPrefix;
     }
 
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
+    public void setPodName(String podName) {
+        this.podName = podName;
+    }
+
+    public void setPodVersion(String podVersion) {
+        this.podVersion = podVersion;
     }
 }
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 1b0da2698e2..d54c44a9bdd 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
@@ -7,16 +7,17 @@
 import io.swagger.models.properties.ArrayProperty;
 import io.swagger.models.properties.MapProperty;
 import io.swagger.models.properties.Property;
+import io.swagger.codegen.CliOption;
 
 import java.io.File;
 import java.util.Arrays;
 import java.util.HashSet;
 
+import org.apache.commons.lang.StringUtils;
+
 public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig {
-    protected String invokerPackage = "SwaggerClient";
-    protected String groupId = "io.swagger";
-    protected String artifactId = "swagger-client";
-    protected String artifactVersion = "1.0.0";
+    protected String moduleName = "SwaggerClient";
+    protected String moduleVersion = "1.0.0";
 
     public PerlClientCodegen() {
         super();
@@ -26,8 +27,6 @@ public PerlClientCodegen() {
         apiTemplateFiles.put("api.mustache", ".pm");
         templateDir = "perl";
 
-        typeMapping.clear();
-        languageSpecificPrimitives.clear();
 
         reservedWords = new HashSet<String>(
                 Arrays.asList(
@@ -44,11 +43,7 @@ public PerlClientCodegen() {
                 )
         );
 
-        additionalProperties.put("invokerPackage", invokerPackage);
-        additionalProperties.put("groupId", groupId);
-        additionalProperties.put("artifactId", artifactId);
-        additionalProperties.put("artifactVersion", artifactVersion);
-
+        languageSpecificPrimitives.clear();
         languageSpecificPrimitives.add("int");
         languageSpecificPrimitives.add("double");
         languageSpecificPrimitives.add("string");
@@ -58,6 +53,7 @@ public PerlClientCodegen() {
         languageSpecificPrimitives.add("HASH");
         languageSpecificPrimitives.add("object");
 
+        typeMapping.clear();
         typeMapping.put("integer", "int");
         typeMapping.put("long", "int");
         typeMapping.put("float", "double");
@@ -71,9 +67,31 @@ public PerlClientCodegen() {
         typeMapping.put("map", "HASH");
         typeMapping.put("object", "object");
 
-        supportingFiles.add(new SupportingFile("ApiClient.mustache", ("lib/WWW/" + invokerPackage).replace('/', File.separatorChar), "ApiClient.pm"));
-        supportingFiles.add(new SupportingFile("Configuration.mustache", ("lib/WWW/" + invokerPackage).replace('/', File.separatorChar), "Configuration.pm"));
-        supportingFiles.add(new SupportingFile("BaseObject.mustache", ("lib/WWW/" + invokerPackage).replace('/', File.separatorChar), "Object/BaseObject.pm"));
+        cliOptions.clear();
+        cliOptions.add(new CliOption("moduleName", "perl module name (convention: CamelCase), default: SwaggerClient"));
+        cliOptions.add(new CliOption("moduleVersion", "perl module version, default: 1.0.0"));
+    }
+
+
+    @Override
+    public void processOpts() {
+        super.processOpts();
+
+        if (additionalProperties.containsKey("moduleVersion")) {
+            moduleVersion = (String) additionalProperties.get("moduleVersion");
+        } else {
+            additionalProperties.put("moduleVersion", moduleVersion);
+        }
+
+        if (additionalProperties.containsKey("moduleName")) {
+            moduleName = (String) additionalProperties.get("moduleName");
+        } else {
+            additionalProperties.put("moduleName", 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("BaseObject.mustache", ("lib/WWW/" + moduleName).replace('/', File.separatorChar), "Object/BaseObject.pm"));
     }
 
     public CodegenType getTag() {
@@ -95,11 +113,11 @@ public String escapeReservedWord(String name) {
 
     @Override
     public String apiFileFolder() {
-        return (outputFolder + "/lib/WWW/" + invokerPackage + apiPackage()).replace('/', File.separatorChar);
+        return (outputFolder + "/lib/WWW/" + moduleName + apiPackage()).replace('/', File.separatorChar);
     }
 
     public String modelFileFolder() {
-        return (outputFolder + "/lib/WWW/" + invokerPackage + modelPackage()).replace('/', File.separatorChar);
+        return (outputFolder + "/lib/WWW/" + moduleName + modelPackage()).replace('/', File.separatorChar);
     }
 
     @Override
@@ -141,15 +159,17 @@ public String toDefaultValue(Property p) {
 
     @Override
     public String toVarName(String name) {
+        // return the name in underscore style
+        // PhoneNumber => phone_number
+        name = underscore(name);
+
         // parameter name starting with number won't compile
         // need to escape it by appending _ at the beginning
-        if (name.matches("^[0-9]")) {
+        if (name.matches("^\\d.*")) {
             name = "_" + name;
         }
 
-        // return the name in underscore style
-        // PhoneNumber => phone_number
-        return underscore(name);
+        return name;
     }
 
     @Override
@@ -196,6 +216,11 @@ public String toApiName(String name) {
 
     @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
         if (reservedWords.contains(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/PhpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java
index 10c03fe4381..ac2cddfefa9 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
@@ -1,51 +1,51 @@
 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;
 import io.swagger.codegen.DefaultCodegen;
 import io.swagger.codegen.SupportingFile;
 import io.swagger.models.properties.ArrayProperty;
 import io.swagger.models.properties.MapProperty;
 import io.swagger.models.properties.Property;
+import io.swagger.models.properties.RefProperty;
 
 import java.io.File;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 
+import org.apache.commons.lang3.StringUtils;
+
 public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
-    protected String invokerPackage = "io.swagger.client";
-    protected String groupId = "io.swagger";
-    protected String artifactId = "swagger-client";
+    protected String invokerPackage = "Swagger\\Client";
+    protected String composerVendorName = "swagger";
+    protected String composerProjectName = "swagger-client";
+    protected String packagePath = "SwaggerClient-php";
     protected String artifactVersion = "1.0.0";
+    protected String srcBasePath = "lib";
+    protected String variableNamingConvention= "snake_case";
 
     public PhpClientCodegen() {
         super();
 
-        invokerPackage = camelize("SwaggerClient");
-
-        String packagePath = invokerPackage + "-php";
-
-        modelPackage = packagePath + "/lib/models";
-        apiPackage = packagePath + "/lib";
-        outputFolder = "generated-code/php";
+        outputFolder = "generated-code" + File.separator + "php";
         modelTemplateFiles.put("model.mustache", ".php");
         apiTemplateFiles.put("api.mustache", ".php");
         templateDir = "php";
+        apiPackage = invokerPackage + "\\Api";
+        modelPackage = invokerPackage + "\\Model";
 
         reservedWords = new HashSet<String>(
                 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")
         );
 
-        additionalProperties.put("invokerPackage", invokerPackage);
-        additionalProperties.put("groupId", groupId);
-        additionalProperties.put("artifactId", artifactId);
-        additionalProperties.put("artifactVersion", artifactVersion);
-
         // ref: http://php.net/manual/en/language.types.intro.php
         languageSpecificPrimitives = new HashSet<String>(
                 Arrays.asList(
+                        "bool",
                         "boolean",
                         "int",
                         "integer",
@@ -55,12 +55,19 @@ public PhpClientCodegen() {
                         "object",
                         "DateTime",
                         "mixed",
-                        "number")
+                        "number",
+                        "void",
+                        "byte")
         );
 
         instantiationTypes.put("array", "array");
         instantiationTypes.put("map", "map");
 
+
+        // provide primitives to mustache template
+        String primitives = "'" + StringUtils.join(languageSpecificPrimitives, "', '") + "'";
+        additionalProperties.put("primitives", primitives);
+
         // ref: https://github.com/swagger-api/swagger-spec/blob/master/versions/2.0.md#data-types
         typeMapping = new HashMap<String, String>();
         typeMapping.put("integer", "int");
@@ -69,20 +76,56 @@ public PhpClientCodegen() {
         typeMapping.put("double", "double");
         typeMapping.put("string", "string");
         typeMapping.put("byte", "int");
-        typeMapping.put("boolean", "boolean");
-        typeMapping.put("date", "DateTime");
-        typeMapping.put("datetime", "DateTime");
-        typeMapping.put("file", "string");
+        typeMapping.put("boolean", "bool");
+        typeMapping.put("date", "\\DateTime");
+        typeMapping.put("datetime", "\\DateTime");
+        typeMapping.put("file", "\\SplFileObject");
         typeMapping.put("map", "map");
         typeMapping.put("array", "array");
         typeMapping.put("list", "array");
         typeMapping.put("object", "object");
+        typeMapping.put("DateTime", "\\DateTime");
+
+        cliOptions.add(new CliOption("variableNamingConvention", "naming convention of variable name, e.g. camelCase. Default: snake_case"));
+        cliOptions.add(new CliOption(CodegenConstants.INVOKER_PACKAGE, "The main namespace to use for all classes. e.g. Yay\\Pets"));
+        cliOptions.add(new CliOption("packagePath", "The main package name for classes. e.g. GeneratedPetstore"));
+        cliOptions.add(new CliOption("srcBasePath", "The directory under packagePath to serve as source root."));
+        cliOptions.add(new CliOption("composerVendorName", "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("composerProjectName", "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(CodegenConstants.ARTIFACT_VERSION, "The version to use in the composer package version field. e.g. 1.2.3"));
+    }
 
-        supportingFiles.add(new SupportingFile("composer.mustache", packagePath.replace('/', File.separatorChar), "composer.json"));
-        supportingFiles.add(new SupportingFile("configuration.mustache", (packagePath + "/lib").replace('/', File.separatorChar), "Configuration.php"));
-        supportingFiles.add(new SupportingFile("ApiClient.mustache", (packagePath + "/lib").replace('/', File.separatorChar), "ApiClient.php"));
-        supportingFiles.add(new SupportingFile("ApiException.mustache", (packagePath + "/lib").replace('/', File.separatorChar), "ApiException.php"));
-        supportingFiles.add(new SupportingFile("require.mustache", packagePath.replace('/', File.separatorChar), invokerPackage + ".php"));
+    public String getPackagePath() {
+        return packagePath;
+    }
+
+    public String toPackagePath(String packageName, String basePath) {
+        packageName = packageName.replace(invokerPackage, "");
+        if (basePath != null && basePath.length() > 0) {
+            basePath = basePath.replaceAll("[\\\\/]?$", "") + File.separatorChar;
+        }
+
+        String regFirstPathSeparator;
+        if ("/".equals(File.separator)) { // for mac, linux
+            regFirstPathSeparator = "^/";
+        } else { // for windows
+            regFirstPathSeparator = "^\\\\";
+        }
+
+        String regLastPathSeparator;
+        if ("/".equals(File.separator)) { // for mac, linux
+            regLastPathSeparator = "/$";
+        } else { // for windows
+            regLastPathSeparator = "\\\\$";
+        }
+
+        return (getPackagePath() + File.separatorChar + basePath
+                    // Replace period, backslash, forward slash with file separator in package name
+                    + packageName.replaceAll("[\\.\\\\/]", File.separator)
+                    // Trim prefix file separators from package path
+                    .replaceAll(regFirstPathSeparator, ""))
+                    // Trim trailing file separators from the overall path
+                    .replaceAll(regLastPathSeparator+ "$", "");
     }
 
     public CodegenType getTag() {
@@ -97,6 +140,68 @@ public String getHelp() {
         return "Generates a PHP client library.";
     }
 
+    @Override
+    public void processOpts() {
+        super.processOpts();
+
+        if (additionalProperties.containsKey("packagePath")) {
+            this.setPackagePath((String) additionalProperties.get("packagePath"));
+        } else {
+            additionalProperties.put("packagePath", packagePath);
+        }
+
+        if (additionalProperties.containsKey("srcBasePath")) {
+            this.setSrcBasePath((String) additionalProperties.get("srcBasePath"));
+        } else {
+            additionalProperties.put("srcBasePath", 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)) {
+            this.setModelPackage((String) additionalProperties.get(CodegenConstants.MODEL_PACKAGE));
+        } else {
+            additionalProperties.put(CodegenConstants.MODEL_PACKAGE, modelPackage);
+        }
+
+        if (additionalProperties.containsKey(CodegenConstants.API_PACKAGE)) {
+            this.setApiPackage((String) additionalProperties.get(CodegenConstants.API_PACKAGE));
+        } else {
+            additionalProperties.put(CodegenConstants.API_PACKAGE, apiPackage);
+        }
+                
+        if (additionalProperties.containsKey("composerProjectName")) {
+            this.setComposerProjectName((String) additionalProperties.get("composerProjectName"));
+        } else {
+            additionalProperties.put("composerProjectName", composerProjectName);
+        }
+        
+        if (additionalProperties.containsKey("composerVendorName")) {
+            this.setComposerVendorName((String) additionalProperties.get("composerVendorName"));
+        } else {
+            additionalProperties.put("composerVendorName", composerVendorName);
+        }
+        
+        if (additionalProperties.containsKey(CodegenConstants.ARTIFACT_VERSION)) {
+            this.setArtifactVersion((String) additionalProperties.get(CodegenConstants.ARTIFACT_VERSION));
+        } else {
+            additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion);
+        }
+        
+        additionalProperties.put("escapedInvokerPackage", invokerPackage.replace("\\", "\\\\"));
+
+        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"));
+    }
+
     @Override
     public String escapeReservedWord(String name) {
         return "_" + name;
@@ -104,11 +209,11 @@ public String escapeReservedWord(String name) {
 
     @Override
     public String apiFileFolder() {
-        return (outputFolder + "/" + apiPackage()).replace('/', File.separatorChar);
+        return (outputFolder + "/" + toPackagePath(apiPackage(), srcBasePath));
     }
 
     public String modelFileFolder() {
-        return (outputFolder + "/" + modelPackage()).replace('/', File.separatorChar);
+        return (outputFolder + "/" + toPackagePath(modelPackage(), srcBasePath));
     }
 
     @Override
@@ -116,15 +221,27 @@ public String getTypeDeclaration(Property p) {
         if (p instanceof ArrayProperty) {
             ArrayProperty ap = (ArrayProperty) p;
             Property inner = ap.getItems();
-            return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]";
+            return getTypeDeclaration(inner) + "[]";
         } else if (p instanceof MapProperty) {
             MapProperty mp = (MapProperty) p;
             Property inner = mp.getAdditionalProperties();
             return getSwaggerType(p) + "[string," + getTypeDeclaration(inner) + "]";
+        } else if (p instanceof RefProperty) {
+            String type = super.getTypeDeclaration(p);
+            return (!languageSpecificPrimitives.contains(type))
+                    ? "\\" + modelPackage + "\\" + type : type;
         }
         return super.getTypeDeclaration(p);
     }
 
+    @Override
+    public String getTypeDeclaration(String name) {
+        if (!languageSpecificPrimitives.contains(name)) {
+            return "\\" + modelPackage + "\\" + name;
+        }
+        return super.getTypeDeclaration(name);
+    }
+
     @Override
     public String getSwaggerType(Property p) {
         String swaggerType = super.getSwaggerType(p);
@@ -149,18 +266,60 @@ public String toDefaultValue(Property p) {
         return "null";
     }
 
+    public void setInvokerPackage(String invokerPackage) {
+        this.invokerPackage = invokerPackage;
+    }
+        
+    public void setArtifactVersion(String artifactVersion) {
+        this.artifactVersion = artifactVersion;
+    }
+
+    public void setPackagePath(String packagePath) {
+        this.packagePath = packagePath;
+    }
+
+    public void setSrcBasePath(String srcBasePath) {
+        this.srcBasePath = srcBasePath;
+    }
+    
+    public void setParameterNamingConvention(String variableNamingConvention) {
+        this.variableNamingConvention = variableNamingConvention;
+    }
+
+    private void setComposerVendorName(String composerVendorName) {
+        this.composerVendorName = composerVendorName;
+    }
+    
+    public void setComposerProjectName(String composerProjectName) {
+        this.composerProjectName = composerProjectName;
+    }
 
     @Override
     public String toVarName(String name) {
+        if (additionalProperties.containsKey("variableNamingConvention")) {
+            this.setParameterNamingConvention((String) additionalProperties.get("variableNamingConvention"));
+        }
+
+        // sanitize name
+        name = sanitizeName(name);
+
+        if ("camelCase".equals(variableNamingConvention)) {
+          // return the name in camelCase style
+          // phone_number => phoneNumber
+          name =  camelize(name, true);
+        } else { // default to snake case
+          // return the name in underscore style
+          // PhoneNumber => phone_number
+          name =  underscore(name);
+        }
+
         // parameter name starting with number won't compile
         // need to escape it by appending _ at the beginning
-        if (name.matches("^[0-9]")) {
+        if (name.matches("^\\d.*")) {
             name = "_" + name;
         }
 
-        // return the name in underscore style
-        // PhoneNumber => phone_number
-        return underscore(name);
+        return name;
     }
 
     @Override
@@ -187,4 +346,19 @@ public String toModelFilename(String name) {
         return toModelName(name);
     }
 
+    @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
+        if (reservedWords.contains(operationId)) {
+            throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+        }
+
+        return camelize(sanitizeName(operationId), true);
+    }
+
 }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Python3ClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Python3ClientCodegen.java
index 4911ca06850..70c090cd7a3 100755
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Python3ClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Python3ClientCodegen.java
@@ -12,6 +12,8 @@
 import java.util.Arrays;
 import java.util.HashSet;
 
+import org.apache.commons.lang.StringUtils;
+
 public class Python3ClientCodegen extends DefaultCodegen implements CodegenConfig {
     String module = "client";
 
@@ -33,6 +35,7 @@ public Python3ClientCodegen() {
         languageSpecificPrimitives.add("bool");
         languageSpecificPrimitives.add("str");
         languageSpecificPrimitives.add("datetime");
+        languageSpecificPrimitives.add("date");
 
         typeMapping.clear();
         typeMapping.put("integer", "int");
@@ -43,7 +46,8 @@ public Python3ClientCodegen() {
         typeMapping.put("map", "map");
         typeMapping.put("boolean", "bool");
         typeMapping.put("string", "str");
-        typeMapping.put("date", "datetime");
+        typeMapping.put("date", "date");
+        typeMapping.put("DateTime", "datetime");
 
         // from https://docs.python.org/release/2.5.4/ref/keywords.html
         reservedWords = new HashSet<String>(
@@ -199,6 +203,11 @@ public String toApiVarName(String name) {
 
     @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
         if (reservedWords.contains(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/PythonClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java
index 9553f4ad133..8926a79343a 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
@@ -1,5 +1,6 @@
 package io.swagger.codegen.languages;
 
+import io.swagger.codegen.CliOption;
 import io.swagger.codegen.CodegenConfig;
 import io.swagger.codegen.CodegenType;
 import io.swagger.codegen.DefaultCodegen;
@@ -12,26 +13,22 @@
 import java.util.Arrays;
 import java.util.HashSet;
 
+import org.apache.commons.lang.StringUtils;
+
 public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig {
-    protected String module = "SwaggerPetstore";
-    protected String invokerPackage;
-    protected String eggPackage;
+    protected String packageName = null;
+    protected String packageVersion = null;
 
     public PythonClientCodegen() {
         super();
 
-        eggPackage = module + "-python";
-
-        invokerPackage = eggPackage + File.separatorChar + module;
-
+        modelPackage = "models";
+        apiPackage = "api";
         outputFolder = "generated-code" + File.separatorChar + "python";
         modelTemplateFiles.put("model.mustache", ".py");
         apiTemplateFiles.put("api.mustache", ".py");
         templateDir = "python";
 
-        apiPackage = invokerPackage + File.separatorChar + "apis";
-        modelPackage = invokerPackage + File.separatorChar + "models";
-
         languageSpecificPrimitives.clear();
         languageSpecificPrimitives.add("int");
         languageSpecificPrimitives.add("float");
@@ -39,6 +36,7 @@ public PythonClientCodegen() {
         languageSpecificPrimitives.add("bool");
         languageSpecificPrimitives.add("str");
         languageSpecificPrimitives.add("datetime");
+        languageSpecificPrimitives.add("date");
 
         typeMapping.clear();
         typeMapping.put("integer", "int");
@@ -46,10 +44,13 @@ public PythonClientCodegen() {
         typeMapping.put("long", "int");
         typeMapping.put("double", "float");
         typeMapping.put("array", "list");
-        typeMapping.put("map", "map");
+        typeMapping.put("map", "dict");
         typeMapping.put("boolean", "bool");
         typeMapping.put("string", "str");
-        typeMapping.put("date", "datetime");
+        typeMapping.put("date", "date");
+        typeMapping.put("DateTime", "datetime");
+        typeMapping.put("object", "object");
+        typeMapping.put("file", "file");
 
         // from https://docs.python.org/release/2.5.4/ref/keywords.html
         reservedWords = new HashSet<String>(
@@ -59,14 +60,43 @@ public PythonClientCodegen() {
                         "print", "class", "exec", "in", "raise", "continue", "finally", "is",
                         "return", "def", "for", "lambda", "try"));
 
-        additionalProperties.put("module", module);
+        cliOptions.clear();
+        cliOptions.add(new CliOption("packageName", "python package name (convention: snake_case), default: swagger_client"));
+        cliOptions.add(new CliOption("packageVersion", "python package version, default: 1.0.0"));
+    }
+
+    @Override
+    public void processOpts() {
+        super.processOpts();
+
+        if (additionalProperties.containsKey("packageName")) {
+            setPackageName((String) additionalProperties.get("packageName"));
+        }
+        else {
+            setPackageName("swagger_client");
+        }
+
+        if (additionalProperties.containsKey("packageVersion")) {
+            setPackageVersion((String) additionalProperties.get("packageVersion"));
+        }
+        else {
+            setPackageVersion("1.0.0");
+        }
+
+        additionalProperties.put("packageName", packageName);
+        additionalProperties.put("packageVersion", packageVersion);
 
-        supportingFiles.add(new SupportingFile("README.mustache", eggPackage, "README.md"));
-        supportingFiles.add(new SupportingFile("setup.mustache", eggPackage, "setup.py"));
-        supportingFiles.add(new SupportingFile("api_client.mustache", invokerPackage, "api_client.py"));
-        supportingFiles.add(new SupportingFile("rest.mustache", invokerPackage, "rest.py"));
-        supportingFiles.add(new SupportingFile("configuration.mustache", invokerPackage, "configuration.py"));
-        supportingFiles.add(new SupportingFile("__init__package.mustache", invokerPackage, "__init__.py"));
+        String swaggerFolder = packageName;
+
+        modelPackage = swaggerFolder + File.separatorChar + "models";
+        apiPackage = swaggerFolder + File.separatorChar + "apis";
+
+        supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
+        supportingFiles.add(new SupportingFile("setup.mustache", "", "setup.py"));
+        supportingFiles.add(new SupportingFile("api_client.mustache", swaggerFolder, "api_client.py"));
+        supportingFiles.add(new SupportingFile("rest.mustache", swaggerFolder, "rest.py"));
+        supportingFiles.add(new SupportingFile("configuration.mustache", swaggerFolder, "configuration.py"));
+        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"));
     }
@@ -111,7 +141,7 @@ public String getTypeDeclaration(Property p) {
             MapProperty mp = (MapProperty) p;
             Property inner = mp.getAdditionalProperties();
 
-            return getSwaggerType(p) + "(String, " + getTypeDeclaration(inner) + ")";
+            return getSwaggerType(p) + "(str, " + getTypeDeclaration(inner) + ")";
         }
         return super.getTypeDeclaration(p);
     }
@@ -132,14 +162,13 @@ public String getSwaggerType(Property p) {
     }
 
     public String toDefaultValue(Property p) {
-        // TODO: Support Python def value
-        return "null";
+        return "None";
     }
 
     @Override
     public String toVarName(String name) {
-        // replace - with _ e.g. created-at => created_at
-        name = name.replaceAll("-", "_");
+        // sanitize name
+        name = sanitizeName(name);
 
         // if it's all uppper case, convert to lower case
         if (name.matches("^[A-Z_]*$")) {
@@ -148,7 +177,10 @@ public String toVarName(String name) {
 
         // underscore the variable name
         // petId => pet_id
-        name = underscore(dropDots(name));
+        name = underscore(name);
+
+        // remove leading underscore
+        name = name.replaceAll("^_*", "");
 
         // for reserved word or word starting with number, append _
         if (reservedWords.contains(name) || name.matches("^\\d.*")) {
@@ -216,12 +248,36 @@ public String toApiVarName(String name) {
 
     @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
         if (reservedWords.contains(operationId)) {
             throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
         }
 
-        return underscore(operationId);
+        return underscore(sanitizeName(operationId));
     }
 
+    public void setPackageName(String packageName) {
+        this.packageName = packageName;
+    }
+
+    public void setPackageVersion(String packageVersion) {
+        this.packageVersion = packageVersion;
+    }
+
+    /**
+     * Generate Python package name from String `packageName`
+     *
+     * (PEP 0008) Python packages should also have short, all-lowercase names, 
+     * although the use of underscores is discouraged.
+     */
+    public String generatePackageName(String packageName) {
+        return underscore(packageName.replaceAll("[^\\w]+", "")); 
+    }
 }
+
+
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RetrofitClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RetrofitClientCodegen.java
index e043c68baf9..37c119edfb6 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RetrofitClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RetrofitClientCodegen.java
@@ -1,6 +1,7 @@
 package io.swagger.codegen.languages;
 
 import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenConstants;
 import io.swagger.codegen.CodegenOperation;
 import io.swagger.codegen.CodegenType;
 import io.swagger.codegen.DefaultCodegen;
@@ -15,6 +16,8 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang.StringUtils;
+
 public class RetrofitClientCodegen extends DefaultCodegen implements CodegenConfig {
     protected String invokerPackage = "io.swagger.client";
     protected String groupId = "io.swagger";
@@ -42,10 +45,10 @@ public RetrofitClientCodegen() {
                         "native", "super", "while")
         );
 
-        additionalProperties.put("invokerPackage", invokerPackage);
-        additionalProperties.put("groupId", groupId);
-        additionalProperties.put("artifactId", artifactId);
-        additionalProperties.put("artifactVersion", artifactVersion);
+        additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
+        additionalProperties.put(CodegenConstants.GROUP_ID, groupId);
+        additionalProperties.put(CodegenConstants.ARTIFACT_ID, artifactId);
+        additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion);
 
         supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
         supportingFiles.add(new SupportingFile("service.mustache",
@@ -171,6 +174,11 @@ public String getSwaggerType(Property p) {
 
     @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
         if (reservedWords.contains(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/RubyClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java
index 01fe6c6eed4..4368fc3cef4 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
@@ -1,5 +1,6 @@
 package io.swagger.codegen.languages;
 
+import io.swagger.codegen.CliOption;
 import io.swagger.codegen.CodegenConfig;
 import io.swagger.codegen.CodegenType;
 import io.swagger.codegen.DefaultCodegen;
@@ -12,17 +13,19 @@
 import java.util.Arrays;
 import java.util.HashSet;
 
+import org.apache.commons.lang.StringUtils;
+
 public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig {
-    protected String gemName = "swagger_client";
+    protected String gemName = null;
     protected String moduleName = null;
+    protected String gemVersion = "1.0.0";
     protected String libFolder = "lib";
 
     public RubyClientCodegen() {
         super();
-        moduleName = generateModuleName();
-        modelPackage = gemName + "/models";
-        apiPackage = gemName + "/api";
-        outputFolder = "generated-code" + File.separatorChar + "ruby";
+        modelPackage = "models";
+        apiPackage = "api";
+        outputFolder = "generated-code" + File.separator + "ruby";
         modelTemplateFiles.put("model.mustache", ".rb");
         apiTemplateFiles.put("api.mustache", ".rb");
         templateDir = "ruby";
@@ -39,33 +42,82 @@ public RubyClientCodegen() {
                         "if", "not", "return", "undef", "yield")
         );
 
-        additionalProperties.put("gemName", gemName);
-        additionalProperties.put("moduleName", moduleName);
-
         languageSpecificPrimitives.add("int");
         languageSpecificPrimitives.add("array");
         languageSpecificPrimitives.add("map");
         languageSpecificPrimitives.add("string");
         languageSpecificPrimitives.add("DateTime");
 
-        typeMapping.put("long", "int");
-        typeMapping.put("integer", "int");
-        typeMapping.put("Array", "array");
-        typeMapping.put("String", "string");
-        typeMapping.put("List", "array");
-        typeMapping.put("map", "map");
+        typeMapping.put("string", "String");
+        typeMapping.put("char", "String");
+        typeMapping.put("int", "Integer");
+        typeMapping.put("integer", "Integer");
+        typeMapping.put("long", "Integer");
+        typeMapping.put("short", "Integer");
+        typeMapping.put("float", "Float");
+        typeMapping.put("double", "Float");
+        typeMapping.put("number", "Float");
+        typeMapping.put("date", "Date");
+        typeMapping.put("DateTime", "DateTime");
+        typeMapping.put("boolean", "BOOLEAN");
+        typeMapping.put("array", "Array");
+        typeMapping.put("List", "Array");
+        typeMapping.put("map", "Hash");
+        typeMapping.put("object", "Object");
+        typeMapping.put("file", "File");
+
+        // remove modelPackage and apiPackage added by default
+        cliOptions.clear();
+        cliOptions.add(new CliOption("gemName", "gem name (convention: underscore_case), default: swagger_client"));
+        cliOptions.add(new CliOption("moduleName", "top module name (convention: CamelCase, usually corresponding to gem name), default: SwaggerClient"));
+        cliOptions.add(new CliOption("gemVersion", "gem version, default: 1.0.0"));
+    }
+
+    @Override
+    public void processOpts() {
+        super.processOpts();
+
+        if (additionalProperties.containsKey("gemName")) {
+            setGemName((String) additionalProperties.get("gemName"));
+        }
+        if (additionalProperties.containsKey("moduleName")) {
+            setModuleName((String) additionalProperties.get("moduleName"));
+        }
+
+        if (gemName == null && moduleName == null) {
+            setGemName("swagger_client");
+            setModuleName(generateModuleName(gemName));
+        } else if (gemName == null) {
+            setGemName(generateGemName(moduleName));
+        } else if (moduleName == null) {
+            setModuleName(generateModuleName(gemName));
+        }
+
+        additionalProperties.put("gemName", gemName);
+        additionalProperties.put("moduleName", moduleName);
+
+        if (additionalProperties.containsKey("gemVersion")) {
+            setGemVersion((String) additionalProperties.get("gemVersion"));
+        } else {
+            // not set, pass the default value to template
+            additionalProperties.put("gemVersion", gemVersion);
+        }
+
+        // use constant model/api package (folder path)
+        setModelPackage("models");
+        setApiPackage("api");
 
-        String baseFolder = "lib" + File.separatorChar + gemName;
-        String swaggerFolder = baseFolder + File.separatorChar + "swagger";
-        String modelFolder = baseFolder + File.separatorChar + "models";
         supportingFiles.add(new SupportingFile("swagger_client.gemspec.mustache", "", gemName + ".gemspec"));
-        supportingFiles.add(new SupportingFile("swagger_client.mustache", "lib", gemName + ".rb"));
-        supportingFiles.add(new SupportingFile("monkey.mustache", baseFolder, "monkey.rb"));
+        supportingFiles.add(new SupportingFile("swagger_client.mustache", libFolder, gemName + ".rb"));
+        String baseFolder = libFolder + File.separator + gemName;
         supportingFiles.add(new SupportingFile("swagger.mustache", baseFolder, "swagger.rb"));
-        supportingFiles.add(new SupportingFile("swagger" + File.separatorChar + "request.mustache", swaggerFolder, "request.rb"));
-        supportingFiles.add(new SupportingFile("swagger" + File.separatorChar + "response.mustache", swaggerFolder, "response.rb"));
-        supportingFiles.add(new SupportingFile("swagger" + File.separatorChar + "version.mustache", swaggerFolder, "version.rb"));
-        supportingFiles.add(new SupportingFile("swagger" + File.separatorChar + "configuration.mustache", swaggerFolder, "configuration.rb"));
+        String swaggerFolder = baseFolder + File.separator + "swagger";
+        supportingFiles.add(new SupportingFile("swagger" + File.separator + "request.mustache", swaggerFolder, "request.rb"));
+        supportingFiles.add(new SupportingFile("swagger" + File.separator + "response.mustache", swaggerFolder, "response.rb"));
+        supportingFiles.add(new SupportingFile("swagger" + File.separator + "api_error.mustache", swaggerFolder, "api_error.rb"));
+        supportingFiles.add(new SupportingFile("swagger" + File.separator + "version.mustache", swaggerFolder, "version.rb"));
+        supportingFiles.add(new SupportingFile("swagger" + File.separator + "configuration.mustache", swaggerFolder, "configuration.rb"));
+        String modelFolder = baseFolder + File.separator + modelPackage.replace("/", File.separator);
         supportingFiles.add(new SupportingFile("base_object.mustache", modelFolder, "base_object.rb"));
     }
 
@@ -84,10 +136,17 @@ public String getHelp() {
     /**
      * Generate Ruby module name from the gem name, e.g. use "SwaggerClient" for "swagger_client".
      */
-    public String generateModuleName() {
+    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".
+     */
+    public String generateGemName(String moduleName) {
+        return underscore(moduleName.replaceAll("[^\\w]+", ""));
+    }
+
     @Override
     public String escapeReservedWord(String name) {
         return "_" + name;
@@ -95,11 +154,11 @@ public String escapeReservedWord(String name) {
 
     @Override
     public String apiFileFolder() {
-        return outputFolder + File.separatorChar + "lib" + File.separatorChar + gemName + File.separatorChar + "api";
+        return outputFolder + File.separator + libFolder + File.separator + gemName + File.separator + apiPackage.replace("/", File.separator);
     }
 
     public String modelFileFolder() {
-        return outputFolder + File.separatorChar + "lib" + File.separatorChar + gemName + File.separatorChar + "models";
+        return outputFolder + File.separator + libFolder + File.separator + gemName + File.separator + modelPackage.replace("/", File.separator);
     }
 
     @Override
@@ -107,11 +166,11 @@ public String getTypeDeclaration(Property p) {
         if (p instanceof ArrayProperty) {
             ArrayProperty ap = (ArrayProperty) p;
             Property inner = ap.getItems();
-            return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]";
+            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 getSwaggerType(p) + "<String, " + getTypeDeclaration(inner) + ">";
         }
         return super.getTypeDeclaration(p);
     }
@@ -140,8 +199,8 @@ public String toDefaultValue(Property p) {
 
     @Override
     public String toVarName(String name) {
-        // replace - with _ e.g. created-at => created_at
-        name = name.replaceAll("-", "_");
+        // sanitize name
+        name = sanitizeName(name);
 
         // if it's all uppper case, convert to lower case
         if (name.matches("^[A-Z_]*$")) {
@@ -210,22 +269,38 @@ public String toApiName(String name) {
 
     @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
         if (reservedWords.contains(operationId)) {
             throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
         }
 
-        return underscore(operationId);
+        return underscore(sanitizeName(operationId));
     }
 
     @Override
     public String toModelImport(String name) {
-        return modelPackage() + "/" + toModelFilename(name);
+        return gemName + "/" + modelPackage() + "/" + toModelFilename(name);
     }
 
     @Override
     public String toApiImport(String name) {
-        return apiPackage() + "/" + toApiFilename(name);
+        return gemName + "/" + apiPackage() + "/" + toApiFilename(name);
+    }
+
+    public void setGemName(String gemName) {
+        this.gemName = gemName;
+    }
+
+    public void setModuleName(String moduleName) {
+        this.moduleName = moduleName;
     }
 
+    public void setGemVersion(String gemVersion) {
+        this.gemVersion = gemVersion;
+    }
 }
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 d8c143aad1d..003be5ab950 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
@@ -1,6 +1,7 @@
 package io.swagger.codegen.languages;
 
 import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenConstants;
 import io.swagger.codegen.CodegenType;
 import io.swagger.codegen.DefaultCodegen;
 import io.swagger.codegen.SupportingFile;
@@ -20,6 +21,11 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang.StringUtils;
 
 public class ScalaClientCodegen extends DefaultCodegen implements CodegenConfig {
     protected String invokerPackage = "io.swagger.client";
@@ -49,10 +55,10 @@ public ScalaClientCodegen() {
                         "trait", "try", "true", "type", "val", "var", "while", "with", "yield")
         );
 
-        additionalProperties.put("invokerPackage", invokerPackage);
-        additionalProperties.put("groupId", groupId);
-        additionalProperties.put("artifactId", artifactId);
-        additionalProperties.put("artifactVersion", artifactVersion);
+        additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
+        additionalProperties.put(CodegenConstants.GROUP_ID, groupId);
+        additionalProperties.put(CodegenConstants.ARTIFACT_ID, artifactId);
+        additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion);
         additionalProperties.put("asyncHttpClient", asyncHttpClient);
         additionalProperties.put("authScheme", authScheme);
         additionalProperties.put("authPreemptive", authPreemptive);
@@ -206,6 +212,11 @@ public String toDefaultValue(Property p) {
 
     @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
         if (reservedWords.contains(operationId)) {
             throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
@@ -214,4 +225,17 @@ public String toOperationId(String operationId) {
         return camelize(operationId, true);
     }
 
+    @Override
+    public Map<String, Object> postProcessModels(Map<String, Object> objs) {
+        // remove model imports to avoid warnings for importing class in the same package in Scala
+        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;
+    }
+
 }
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 d6b0f78253a..9bab6a6cad0 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
@@ -1,6 +1,7 @@
 package io.swagger.codegen.languages;
 
 import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenConstants;
 import io.swagger.codegen.CodegenOperation;
 import io.swagger.codegen.CodegenType;
 import io.swagger.codegen.DefaultCodegen;
@@ -73,10 +74,10 @@ public ScalatraServerCodegen() {
         additionalProperties.put("infoEmail", "apiteam@swagger.io");
         additionalProperties.put("licenseInfo", "All rights reserved");
         additionalProperties.put("licenseUrl", "http://apache.org/licenses/LICENSE-2.0.html");
-        additionalProperties.put("invokerPackage", invokerPackage);
-        additionalProperties.put("groupId", groupId);
-        additionalProperties.put("artifactId", artifactId);
-        additionalProperties.put("artifactVersion", artifactVersion);
+        additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
+        additionalProperties.put(CodegenConstants.GROUP_ID, groupId);
+        additionalProperties.put(CodegenConstants.ARTIFACT_ID, artifactId);
+        additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion);
 
         supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
         supportingFiles.add(new SupportingFile("build.sbt", "", "build.sbt"));
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
new file mode 100644
index 00000000000..e25aae15976
--- /dev/null
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SilexServerCodegen.java
@@ -0,0 +1,195 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenConstants;
+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.MapProperty;
+import io.swagger.models.properties.Property;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+
+public class SilexServerCodegen extends DefaultCodegen implements CodegenConfig {
+    protected String invokerPackage;
+    protected String groupId = "io.swagger";
+    protected String artifactId = "swagger-server";
+    protected String artifactVersion = "1.0.0";
+
+    public SilexServerCodegen() {
+        super();
+
+        invokerPackage = camelize("SwaggerServer");
+
+        String packagePath = "SwaggerServer";
+
+        modelPackage = packagePath + "/lib/models";
+        apiPackage = packagePath + "/lib";
+        outputFolder = "generated-code/silex";
+
+        // no model, api files
+        modelTemplateFiles.clear();
+        apiTemplateFiles.clear();
+
+        templateDir = "silex";
+
+        reservedWords = new HashSet<String>(
+                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")
+        );
+
+        additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
+        additionalProperties.put(CodegenConstants.GROUP_ID, groupId);
+        additionalProperties.put(CodegenConstants.ARTIFACT_ID, artifactId);
+        additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion);
+
+        // ref: http://php.net/manual/en/language.types.intro.php
+        languageSpecificPrimitives = new HashSet<String>(
+                Arrays.asList(
+                        "boolean",
+                        "int",
+                        "integer",
+                        "double",
+                        "float",
+                        "string",
+                        "object",
+                        "DateTime",
+                        "mixed",
+                        "number")
+        );
+
+        instantiationTypes.put("array", "array");
+        instantiationTypes.put("map", "map");
+
+        // ref: https://github.com/swagger-api/swagger-spec/blob/master/versions/2.0.md#data-types
+        typeMapping = new HashMap<String, String>();
+        typeMapping.put("integer", "int");
+        typeMapping.put("long", "int");
+        typeMapping.put("float", "float");
+        typeMapping.put("double", "double");
+        typeMapping.put("string", "string");
+        typeMapping.put("byte", "int");
+        typeMapping.put("boolean", "boolean");
+        typeMapping.put("date", "DateTime");
+        typeMapping.put("datetime", "DateTime");
+        typeMapping.put("file", "string");
+        typeMapping.put("map", "map");
+        typeMapping.put("array", "array");
+        typeMapping.put("list", "array");
+        typeMapping.put("object", "object");
+
+        supportingFiles.add(new SupportingFile("README.mustache", packagePath.replace('/', File.separatorChar), "README.md"));
+        supportingFiles.add(new SupportingFile("composer.json", packagePath.replace('/', File.separatorChar), "composer.json"));
+        supportingFiles.add(new SupportingFile("index.mustache", packagePath.replace('/', File.separatorChar), "index.php"));
+        supportingFiles.add(new SupportingFile(".htaccess", packagePath.replace('/', File.separatorChar), ".htaccess"));
+    }
+
+    public CodegenType getTag() {
+        return CodegenType.SERVER;
+    }
+
+    public String getName() {
+        return "silex-PHP";
+    }
+
+    public String getHelp() {
+        return "Generates a Silex server library.";
+    }
+
+    @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 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)) {
+            type = typeMapping.get(swaggerType);
+            if (languageSpecificPrimitives.contains(type)) {
+                return type;
+            } else if (instantiationTypes.containsKey(type)) {
+                return type;
+            }
+        } else {
+            type = swaggerType;
+        }
+        if (type == null) {
+            return null;
+        }
+        return toModelName(type);
+    }
+
+    public String toDefaultValue(Property p) {
+        return "null";
+    }
+
+
+    @Override
+    public String toVarName(String name) {
+        // return the name in underscore style
+        // PhoneNumber => phone_number
+        name = underscore(name);
+
+        // 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;
+    }
+
+    @Override
+    public String toParamName(String name) {
+        // should be the same as variable name
+        return toVarName(name);
+    }
+
+    @Override
+    public String toModelName(String name) {
+        // model name cannot use reserved keyword
+        if (reservedWords.contains(name)) {
+            escapeReservedWord(name); // e.g. return => _return
+        }
+
+        // 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);
+    }
+
+}
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
new file mode 100644
index 00000000000..5bc402fe0c4
--- /dev/null
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SinatraServerCodegen.java
@@ -0,0 +1,217 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CliOption;
+import io.swagger.codegen.CodegenConfig;
+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.MapProperty;
+import io.swagger.models.properties.Property;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashSet;
+
+import org.apache.commons.lang.StringUtils;
+
+public class SinatraServerCodegen extends DefaultCodegen implements CodegenConfig {
+    protected String gemName = null;
+    protected String moduleName = null;
+    protected String gemVersion = "1.0.0";
+    protected String libFolder = "lib";
+
+    public SinatraServerCodegen() {
+        super();
+        apiPackage = "lib";
+        outputFolder = "generated-code" + File.separator + "sinatra";
+
+        // no model
+        modelTemplateFiles.clear();
+        apiTemplateFiles.put("api.mustache", ".rb");
+        templateDir = "sinatra";
+
+        typeMapping.clear();
+        languageSpecificPrimitives.clear();
+
+        reservedWords = new HashSet<String>(
+                Arrays.asList(
+                        "__FILE__", "and", "def", "end", "in", "or", "self", "unless", "__LINE__",
+                        "begin", "defined?", "ensure", "module", "redo", "super", "until", "BEGIN",
+                        "break", "do", "false", "next", "rescue", "then", "when", "END", "case",
+                        "else", "for", "nil", "retry", "true", "while", "alias", "class", "elsif",
+                        "if", "not", "return", "undef", "yield")
+        );
+
+        languageSpecificPrimitives.add("int");
+        languageSpecificPrimitives.add("array");
+        languageSpecificPrimitives.add("map");
+        languageSpecificPrimitives.add("string");
+        languageSpecificPrimitives.add("DateTime");
+
+        typeMapping.put("long", "int");
+        typeMapping.put("integer", "int");
+        typeMapping.put("Array", "array");
+        typeMapping.put("String", "string");
+        typeMapping.put("List", "array");
+        typeMapping.put("map", "map");
+
+        // remove modelPackage and apiPackage added by default
+        cliOptions.clear();
+    }
+
+    @Override
+    public void processOpts() {
+        super.processOpts();
+
+        // use constant model/api package (folder path)
+        //setModelPackage("models");
+        setApiPackage("api");
+
+        supportingFiles.add(new SupportingFile("my_app.mustache", "", "my_app.rb"));
+        supportingFiles.add(new SupportingFile("Swaggering.rb", libFolder, "swaggering.rb"));
+        supportingFiles.add(new SupportingFile("config.ru", "", "config.ru"));
+        supportingFiles.add(new SupportingFile("Gemfile", "", "Gemfile"));
+        supportingFiles.add(new SupportingFile("README.md", "", "README.md"));
+    }
+
+    public CodegenType getTag() {
+        return CodegenType.CLIENT;
+    }
+
+    public String getName() {
+        return "sinatra";
+    }
+
+    public String getHelp() {
+        return "Generates a Sinatra server library.";
+    }
+
+    @Override
+    public String escapeReservedWord(String name) {
+        return "_" + name;
+    }
+
+    @Override
+    public String apiFileFolder() {
+        return outputFolder + File.separator + apiPackage.replace("/", File.separator);
+    }
+
+    @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)) {
+            type = typeMapping.get(swaggerType);
+            if (languageSpecificPrimitives.contains(type)) {
+                return type;
+            }
+        } else {
+            type = swaggerType;
+        }
+        if (type == null) {
+            return null;
+        }
+        return type;
+    }
+
+    public String toDefaultValue(Property p) {
+        return "null";
+    }
+
+    @Override
+    public String toVarName(String name) {
+        // replace - with _ e.g. created-at => created_at
+        name = name.replaceAll("-", "_");
+
+        // if it's all uppper case, convert to lower case
+        if (name.matches("^[A-Z_]*$")) {
+            name = name.toLowerCase();
+        }
+
+        // camelize (lower first character) the variable name
+        // petId => pet_id
+        name = underscore(name);
+
+        // for reserved word or word starting with number, append _
+        if (reservedWords.contains(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) {
+        // 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) {
+        // 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.rb => phone_number.rb
+        return underscore(name);
+    }
+
+    @Override
+    public String toApiFilename(String name) {
+        // replace - with _ e.g. created-at => created_at
+        name = name.replaceAll("-", "_");
+
+        // e.g. PhoneNumberApi.rb => phone_number_api.rb
+        return underscore(name) + "_api";
+    }
+
+    @Override
+    public String toApiName(String name) {
+        if (name.length() == 0) {
+            return "DefaultApi";
+        }
+        // e.g. phone_number_api => PhoneNumberApi
+        return camelize(name) + "Api";
+    }
+
+    @Override
+    public String toOperationId(String 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");
+        }
+
+        return underscore(operationId);
+    }
+
+
+}
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 a90533a3614..863a1aef2e7 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
@@ -1,9 +1,6 @@
 package io.swagger.codegen.languages;
 
-import io.swagger.codegen.CodegenConfig;
-import io.swagger.codegen.CodegenOperation;
-import io.swagger.codegen.CodegenType;
-import io.swagger.codegen.SupportingFile;
+import io.swagger.codegen.*;
 import io.swagger.models.Operation;
 import io.swagger.models.properties.ArrayProperty;
 import io.swagger.models.properties.MapProperty;
@@ -27,7 +24,7 @@ public class SpringMVCServerCodegen extends JavaClientCodegen implements Codegen
     protected String configPackage = "";
 
     public SpringMVCServerCodegen() {
-        super.processOpts();
+        super();
         outputFolder = "generated-code/javaSpringMVC";
         modelTemplateFiles.put("model.mustache", ".java");
         apiTemplateFiles.put("api.mustache", ".java");
@@ -37,12 +34,12 @@ public SpringMVCServerCodegen() {
         configPackage = "io.swagger.configuration";
 
 
-        additionalProperties.put("invokerPackage", invokerPackage);
-        additionalProperties.put("groupId", groupId);
-        additionalProperties.put("artifactId", artifactId);
-        additionalProperties.put("artifactVersion", artifactVersion);
+        additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
+        additionalProperties.put(CodegenConstants.GROUP_ID, groupId);
+        additionalProperties.put(CodegenConstants.ARTIFACT_ID, artifactId);
+        additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion);
         additionalProperties.put("title", title);
-        additionalProperties.put("apiPackage", apiPackage);
+        additionalProperties.put(CodegenConstants.API_PACKAGE, apiPackage);
         additionalProperties.put("configPackage", configPackage);
 
         languageSpecificPrimitives = new HashSet<String>(
@@ -55,6 +52,9 @@ public SpringMVCServerCodegen() {
                         "Long",
                         "Float")
         );
+
+        cliOptions.add(new CliOption("configPackage", "configuration package for generated code"));
+
     }
 
     public CodegenType getTag() {
@@ -73,6 +73,10 @@ public String getHelp() {
     public void processOpts() {
         super.processOpts();
 
+        if (additionalProperties.containsKey("configPackage")) {
+            this.setConfigPackage((String) additionalProperties.get("configPackage"));
+        }
+
         supportingFiles.clear();
         supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
         supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
@@ -98,21 +102,6 @@ public void processOpts() {
 
     }
 
-    @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;
@@ -146,27 +135,38 @@ public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
         if (operations != null) {
             List<CodegenOperation> ops = (List<CodegenOperation>) operations.get("operation");
             for (CodegenOperation operation : ops) {
+                List<CodegenResponse> responses = operation.responses;
+                if (responses != null) {
+                    for (CodegenResponse resp : responses) {
+                        if ("0".equals(resp.code)) {
+                            resp.code = "200";
+                        }
+                    }
+                }
+                System.out.println(operation.operationId);
+                io.swagger.util.Json.prettyPrint(operation);
+
                 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);
+                        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);
+                        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);
+                        operation.returnType = rt.substring("Set<".length(), end).trim();
                         operation.returnContainer = "Set";
                     }
                 }
@@ -174,5 +174,18 @@ public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
         }
         return objs;
     }
+
+    @Override
+    public String toApiName(String name) {
+        if (name.length() == 0) {
+            return "DefaultApi";
+        }
+        name = sanitizeName(name);
+        return camelize(name) + "Api";
+    }
+
+    public void setConfigPackage(String configPackage) {
+        this.configPackage = configPackage;
+    }
 }
 
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 bfee70f1732..c0ccf2a0a6f 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,6 +1,7 @@
 package io.swagger.codegen.languages;
 
 import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenConstants;
 import io.swagger.codegen.CodegenType;
 import io.swagger.codegen.DefaultCodegen;
 import io.swagger.codegen.SupportingFile;
@@ -21,10 +22,10 @@ public StaticDocCodegen() {
         apiTemplateFiles.put("operation.mustache", ".html");
         templateDir = "swagger-static";
 
-        additionalProperties.put("invokerPackage", invokerPackage);
-        additionalProperties.put("groupId", groupId);
-        additionalProperties.put("artifactId", artifactId);
-        additionalProperties.put("artifactVersion", artifactVersion);
+        additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
+        additionalProperties.put(CodegenConstants.GROUP_ID, groupId);
+        additionalProperties.put(CodegenConstants.ARTIFACT_ID, artifactId);
+        additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion);
 
         supportingFiles.add(new SupportingFile("package.mustache", "", "package.json"));
         supportingFiles.add(new SupportingFile("main.mustache", "", "main.js"));
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 8a3244b0097..29cb5d55eaa 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,6 +1,7 @@
 package io.swagger.codegen.languages;
 
 import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenConstants;
 import io.swagger.codegen.CodegenOperation;
 import io.swagger.codegen.CodegenType;
 import io.swagger.codegen.DefaultCodegen;
@@ -37,10 +38,10 @@ public StaticHtmlGenerator() {
         additionalProperties.put("infoEmail", "hello@helloreverb.com");
         additionalProperties.put("licenseInfo", "All rights reserved");
         additionalProperties.put("licenseUrl", "http://apache.org/licenses/LICENSE-2.0.html");
-        additionalProperties.put("invokerPackage", invokerPackage);
-        additionalProperties.put("groupId", groupId);
-        additionalProperties.put("artifactId", artifactId);
-        additionalProperties.put("artifactVersion", artifactVersion);
+        additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
+        additionalProperties.put(CodegenConstants.GROUP_ID, groupId);
+        additionalProperties.put(CodegenConstants.ARTIFACT_ID, artifactId);
+        additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion);
 
         supportingFiles.add(new SupportingFile("index.mustache", "", "index.html"));
         reservedWords = new HashSet<String>();
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
new file mode 100644
index 00000000000..55c3864adb7
--- /dev/null
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java
@@ -0,0 +1,298 @@
+package io.swagger.codegen.languages;
+
+import com.google.common.base.Predicate;
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Lists;
+import io.swagger.codegen.*;
+import io.swagger.models.Model;
+import io.swagger.models.Operation;
+import io.swagger.models.parameters.HeaderParameter;
+import io.swagger.models.parameters.Parameter;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.Property;
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
+
+import javax.annotation.Nullable;
+import java.util.*;
+import java.io.File;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class SwiftCodegen extends DefaultCodegen implements CodegenConfig {
+  private static final Pattern PATH_PARAM_PATTERN = Pattern.compile("\\{[a-zA-Z_]+\\}");
+  protected static final String LIBRARY_PROMISE_KIT = "PromiseKit";
+  protected static final String[] RESPONSE_LIBRARIES = { LIBRARY_PROMISE_KIT };
+  protected String projectName = "SwaggerClient";
+  protected boolean unwrapRequired = false;
+  protected String[] responseAs = new String[0];
+  protected String sourceFolder = "Classes" + File.separator + "Swaggers";
+
+  public CodegenType getTag() {
+    return CodegenType.CLIENT;
+  }
+
+  public String getName() {
+    return "swift";
+  }
+
+  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");
+    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("projectName", "Project name in Xcode"));
+    cliOptions.add(new CliOption("responseAs", "Optionally use libraries to manage response.  Currently " +
+            StringUtils.join(RESPONSE_LIBRARIES, ", ") + " are available."));
+    cliOptions.add(new CliOption("unwrapRequired", "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("podSource", "Source information used for Podspec"));
+    cliOptions.add(new CliOption("podVersion", "Version used for Podspec"));
+    cliOptions.add(new CliOption("podAuthors", "Authors used for Podspec"));
+    cliOptions.add(new CliOption("podSocialMediaURL", "Social Media URL used for Podspec"));
+    cliOptions.add(new CliOption("podDocsetURL", "Docset URL used for Podspec"));
+    cliOptions.add(new CliOption("podLicense", "License used for Podspec"));
+    cliOptions.add(new CliOption("podHomepage", "Homepage used for Podspec"));
+    cliOptions.add(new CliOption("podSummary", "Summary used for Podspec"));
+    cliOptions.add(new CliOption("podDescription", "Description used for Podspec"));
+    cliOptions.add(new CliOption("podScreenshots", "Screenshots used for Podspec"));
+    cliOptions.add(new CliOption("podDocumentationURL", "Documentation URL used for Podspec"));
+  }
+
+  @Override
+  public void processOpts() {
+    super.processOpts();
+
+    // Setup project name
+    if (additionalProperties.containsKey("projectName")) {
+      projectName = (String) additionalProperties.get("projectName");
+    } else {
+      additionalProperties.put("projectName", projectName);
+    }
+    sourceFolder = projectName + File.separator + sourceFolder;
+
+    // Setup unwrapRequired option, which makes all the properties with "required" non-optional
+    if (additionalProperties.containsKey("unwrapRequired")) {
+      unwrapRequired = Boolean.parseBoolean(String.valueOf(additionalProperties.get("unwrapRequired")));
+    }
+    additionalProperties.put("unwrapRequired", unwrapRequired);
+
+    // Setup unwrapRequired option, which makes all the properties with "required" non-optional
+    if (additionalProperties.containsKey("responseAs")) {
+      Object responseAsObject = additionalProperties.get("responseAs");
+      if (responseAsObject instanceof String) {
+        responseAs = ((String)responseAsObject).split(",");
+      } else {
+        responseAs = (String[]) responseAsObject;
+      }
+    }
+    additionalProperties.put("responseAs", responseAs);
+    if (ArrayUtils.contains(responseAs, LIBRARY_PROMISE_KIT)) {
+      additionalProperties.put("usePromiseKit", true);
+    }
+
+    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) + "]";
+    }
+    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))
+        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", StringUtils.capitalize(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);
+      }
+    }
+    return codegenProperty;
+  }
+
+  @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) {
+    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);
+  }
+
+  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();
+  }
+}
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftGenerator.java
deleted file mode 100644
index 2b384f36a7d..00000000000
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftGenerator.java
+++ /dev/null
@@ -1,265 +0,0 @@
-package io.swagger.codegen.languages;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterators;
-import com.google.common.collect.Lists;
-import io.swagger.codegen.CodegenConfig;
-import io.swagger.codegen.CodegenOperation;
-import io.swagger.codegen.CodegenProperty;
-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.parameters.HeaderParameter;
-import io.swagger.models.parameters.Parameter;
-import io.swagger.models.properties.ArrayProperty;
-import io.swagger.models.properties.MapProperty;
-import io.swagger.models.properties.Property;
-import org.apache.commons.lang.StringUtils;
-
-import javax.annotation.Nullable;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class SwiftGenerator extends DefaultCodegen implements CodegenConfig {
-    private static final Pattern PATH_PARAM_PATTERN = Pattern.compile("\\{[a-zA-Z_]+\\}");
-    protected String sourceFolder = "Classes/Swaggers";
-
-    public SwiftGenerator() {
-        super();
-        outputFolder = "generated-code/swift";
-        modelTemplateFiles.put("model.mustache", ".swift");
-        apiTemplateFiles.put("api.mustache", ".swift");
-        templateDir = "swift";
-        apiPackage = "/APIs";
-        modelPackage = "/Models";
-
-        // Inject application name
-        String appName = System.getProperty("appName");
-        if (appName == null) {
-            appName = "SwaggerClient";
-        }
-        additionalProperties.put("projectName", appName);
-
-        // Inject base url override
-        String basePathOverride = System.getProperty("basePathOverride");
-        if (basePathOverride != null) {
-            additionalProperties.put("basePathOverride", basePathOverride);
-        }
-
-        sourceFolder = appName + "/" + sourceFolder;
-
-        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"));
-
-        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", "AnyObject");
-        typeMapping.put("file", "NSData");
-
-        importMapping = new HashMap<String, String>();
-    }
-
-    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 CodegenType getTag() {
-        return CodegenType.CLIENT;
-    }
-
-    public String getName() {
-        return "swift";
-    }
-
-    public String getHelp() {
-        return "Generates a swift client library.";
-    }
-
-    @Override
-    public String escapeReservedWord(String name) {
-        return "_" + name;  // add an underscore to the name
-    }
-
-    @Override
-    public String modelFileFolder() {
-        return outputFolder + "/" + sourceFolder + modelPackage().replace('.', File.separatorChar);
-    }
-
-    @Override
-    public String apiFileFolder() {
-        return outputFolder + "/" + 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)) {
-                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", StringUtils.capitalize(value));
-                map.put("raw", value);
-                swiftEnums.add(map);
-            }
-            codegenProperty.allowableValues.put("values", swiftEnums);
-            codegenProperty.datatypeWithEnum =
-                    StringUtils.left(codegenProperty.datatypeWithEnum, codegenProperty.datatypeWithEnum.length() - "Enum".length());
-        }
-        return codegenProperty;
-    }
-
-    @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) {
-        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);
-    }
-}
\ No newline at end of file
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 34305d7c56f..7dc0b8ec3bd 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
@@ -25,6 +25,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.commons.lang.StringUtils;
+
 public class TizenClientCodegen extends DefaultCodegen implements CodegenConfig {
     protected static String PREFIX = "Sami";
     protected Set<String> foundationClasses = new HashSet<String>();
@@ -265,6 +267,11 @@ public String escapeReservedWord(String name) {
 
     @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$
         if (reservedWords.contains(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
new file mode 100644
index 00000000000..8eec2b8772e
--- /dev/null
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java
@@ -0,0 +1,28 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.SupportingFile;
+
+import java.io.File;
+
+public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCodegen {
+	
+	@Override
+	public String getName() {
+		return "typescript-angular";
+	}
+
+	public String getHelp() {
+		return "Generates a TypeScript AngurlarJS client library.";
+	}
+
+	public TypeScriptAngularClientCodegen() {
+	    super();
+	    outputFolder = "generated-code/typescript-angular";
+	    modelTemplateFiles.put("model.mustache", ".ts");
+	    apiTemplateFiles.put("api.mustache", ".ts");
+	    templateDir = "TypeScript-Angular";
+	    apiPackage = "API.Client";
+	    modelPackage = "API.Client";
+	    supportingFiles.add(new SupportingFile("api.d.mustache", apiPackage().replace('.', File.separatorChar), "api.d.ts"));
+	}
+}
\ No newline at end of file
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
new file mode 100644
index 00000000000..b92598b1fb6
--- /dev/null
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptNodeClientCodegen.java
@@ -0,0 +1,24 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.SupportingFile;
+
+public class TypeScriptNodeClientCodegen extends AbstractTypeScriptClientCodegen {
+
+    @Override
+    public String getName() {
+        return "typescript-node";
+    }
+
+    @Override
+    public String getHelp() {
+        return "Generates a TypeScript nodejs client library.";
+    }
+
+    public TypeScriptNodeClientCodegen() {
+        super();
+        outputFolder = "generated-code/typescript-node";
+        templateDir = "TypeScript-node";
+        supportingFiles.add(new SupportingFile("api.mustache", null, "api.ts"));
+    }
+
+}
diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/ApiClient.mustache
new file mode 100644
index 00000000000..8e64db5af31
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/ApiClient.mustache
@@ -0,0 +1,291 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text.RegularExpressions;
+using System.IO;
+using System.Web;
+using System.Linq;
+using System.Net;
+using System.Text;
+using Newtonsoft.Json;
+using RestSharp;
+using RestSharp.Extensions;
+
+namespace {{packageName}}.Client
+{
+    /// <summary>
+    /// API client is mainly responible for making the HTTP call to the API backend.
+    /// </summary>
+    public class ApiClient
+    {
+        private readonly Dictionary<String, String> _defaultHeaderMap = new Dictionary<String, String>();
+  
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApiClient" /> class.
+        /// </summary>
+        /// <param name="basePath">The base path.</param>
+        public ApiClient(String basePath="{{basePath}}")
+        {
+            BasePath = basePath;
+            RestClient = new RestClient(BasePath);
+        }
+    
+        /// <summary>
+        /// Gets or sets the base path.
+        /// </summary>
+        /// <value>The base path</value>
+        public string BasePath { get; set; }
+    
+        /// <summary>
+        /// Gets or sets the RestClient.
+        /// </summary>
+        /// <value>An instance of the RestClient</value>
+        public RestClient RestClient { get; set; }
+    
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        public Dictionary<String, String> DefaultHeader
+        {
+            get { return _defaultHeaderMap; }
+        }
+    
+        /// <summary>
+        /// Makes the HTTP request (Sync).
+        /// </summary>
+        /// <param name="path">URL path.</param>
+        /// <param name="method">HTTP method.</param>
+        /// <param name="queryParams">Query parameters.</param>
+        /// <param name="postBody">HTTP body (POST request).</param>
+        /// <param name="headerParams">Header parameters.</param>
+        /// <param name="formParams">Form parameters.</param>
+        /// <param name="fileParams">File parameters.</param>
+        /// <param name="authSettings">Authentication settings.</param>
+        /// <returns>Object</returns>
+        public Object CallApi(String path, RestSharp.Method method, Dictionary<String, String> queryParams, String postBody,
+            Dictionary<String, String> headerParams, Dictionary<String, String> formParams, 
+            Dictionary<String, FileParameter> fileParams, String[] authSettings)
+        {
+
+            var request = new RestRequest(path, method);
+   
+            UpdateParamsForAuth(queryParams, headerParams, authSettings);
+
+            // add default header, if any
+            foreach(var defaultHeader in _defaultHeaderMap)
+                request.AddHeader(defaultHeader.Key, defaultHeader.Value);
+
+            // add header parameter, if any
+            foreach(var param in headerParams)
+                request.AddHeader(param.Key, param.Value);
+
+            // add query parameter, if any
+            foreach(var param in queryParams)
+                request.AddParameter(param.Key, param.Value, ParameterType.GetOrPost);
+
+            // add form parameter, if any
+            foreach(var param in formParams)
+                request.AddParameter(param.Key, param.Value, ParameterType.GetOrPost);
+
+            // add file parameter, if any
+            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);
+
+            return (Object)RestClient.Execute(request);
+
+        }
+    
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        public void AddDefaultHeader(string key, string value)
+        {
+            _defaultHeaderMap.Add(key, value);
+        }
+    
+        /// <summary>
+        /// Escape string (url-encoded).
+        /// </summary>
+        /// <param name="str">String to be escaped.</param>
+        /// <returns>Escaped string.</returns>
+        public string EscapeString(string str)
+        {
+            return RestSharp.Contrib.HttpUtility.UrlEncode(str);
+        }
+    
+        /// <summary>
+        /// Create FileParameter based on Stream.
+        /// </summary>
+        /// <param name="name">Parameter name.</param>
+        /// <param name="stream">Input stream.</param>
+        /// <returns>FileParameter.</returns>
+        public FileParameter ParameterToFile(string name, Stream stream)
+        {
+            if (stream is FileStream)
+                return FileParameter.Create(name, stream.ReadAsBytes(), Path.GetFileName(((FileStream)stream).Name));
+            else
+                return FileParameter.Create(name, stream.ReadAsBytes(), "no_file_name_provided");
+        }
+    
+        /// <summary>
+        /// If parameter is DateTime, output in ISO8601 format.
+        /// If parameter is a list of string, join the list with ",".
+        /// Otherwise just return the string.
+        /// </summary>
+        /// <param name="obj">The parameter (header, path, query, form).</param>
+        /// <returns>Formatted string.</returns>
+        public string ParameterToString(object obj)
+        {
+            if (obj is DateTime)
+                return ((DateTime)obj).ToString ("u");
+            else if (obj is List<string>)
+                return String.Join(",", (obj as List<string>).ToArray());
+            else
+                return Convert.ToString (obj);
+        }
+    
+        /// <summary>
+        /// Deserialize the JSON string into a proper object.
+        /// </summary>
+        /// <param name="content">HTTP body (e.g. string, JSON).</param>
+        /// <param name="type">Object type.</param>
+        /// <returns>Object representation of the JSON string.</returns>
+        public object Deserialize(string content, Type type, IList<Parameter> headers=null)
+        {
+            if (type == typeof(Object)) // return an object
+            {
+                return content;
+            }
+
+            if (type == typeof(Stream))
+            {
+                var filePath = String.IsNullOrEmpty(Configuration.TempFolderPath)
+                    ? Path.GetTempPath()
+                    : Configuration.TempFolderPath;
+
+                var fileName = filePath + Guid.NewGuid();
+                if (headers != null)
+                {
+                    var regex = new Regex(@"Content-Disposition:.*filename=['""]?([^'""\s]+)['""]?$");
+                    var match = regex.Match(headers.ToString());
+                    if (match.Success)
+                        fileName = filePath + match.Value.Replace("\"", "").Replace("'", "");
+                }
+                File.WriteAllText(fileName, content);
+                return new FileStream(fileName, FileMode.Open);
+
+            }
+
+            if (type.Name.StartsWith("System.Nullable`1[[System.DateTime")) // return a datetime object
+            {
+                return DateTime.Parse(content,  null, System.Globalization.DateTimeStyles.RoundtripKind);
+            }
+
+            if (type == typeof(String) || type.Name.StartsWith("System.Nullable")) // return primitive type
+            {
+                return ConvertType(content, type); 
+            }
+    
+            // at this point, it must be a model (json)
+            try
+            {
+                return JsonConvert.DeserializeObject(content, type);
+            }
+            catch (IOException e)
+            {
+                throw new ApiException(500, e.Message);
+            }
+        }
+    
+        /// <summary>
+        /// Serialize an object into JSON string.
+        /// </summary>
+        /// <param name="obj">Object.</param>
+        /// <returns>JSON string.</returns>
+        public string Serialize(object obj)
+        {
+            try
+            {
+                return obj != null ? JsonConvert.SerializeObject(obj) : null;
+            }
+            catch (Exception e)
+            {
+                throw new ApiException(500, e.Message);
+            }
+        }
+    
+        /// <summary>
+        /// Get the API key with prefix.
+        /// </summary>
+        /// <param name="apiKeyIdentifier">API key identifier (authentication scheme).</param>
+        /// <returns>API key with prefix.</returns>
+        public string GetApiKeyWithPrefix (string apiKeyIdentifier)
+        {
+            var apiKeyValue = "";
+            Configuration.ApiKey.TryGetValue (apiKeyIdentifier, out apiKeyValue);
+            var apiKeyPrefix = "";
+            if (Configuration.ApiKeyPrefix.TryGetValue (apiKeyIdentifier, out apiKeyPrefix))
+                return apiKeyPrefix + " " + apiKeyValue;
+            else
+                return apiKeyValue;
+        }
+    
+        /// <summary>
+        /// Update parameters based on authentication.
+        /// </summary>
+        /// <param name="queryParams">Query parameters.</param>
+        /// <param name="headerParams">Header parameters.</param>
+        /// <param name="authSettings">Authentication settings.</param>
+        public void UpdateParamsForAuth(Dictionary<String, String> queryParams, Dictionary<String, String> headerParams, string[] authSettings)
+        {
+            if (authSettings == null || authSettings.Length == 0)
+                return;
+
+            foreach (string auth in authSettings)
+            {
+                // determine which one to use
+                switch(auth)
+                {
+                    {{#authMethods}}
+                    case "{{name}}":
+                        {{#isApiKey}}{{#isKeyInHeader}}headerParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInHeader}}{{#isKeyInQuery}}queryParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}headerParams["Authorization"] = "Basic " + Base64Encode(Configuration.Username + ":" + Configuration.Password);{{/isBasic}}
+                        {{#isOAuth}}//TODO support oauth{{/isOAuth}}
+                        break;
+                    {{/authMethods}}
+                    default:
+                        //TODO show warning about security definition not found
+                        break;
+                }
+            }
+        }
+ 
+        /// <summary>
+        /// Encode string in base64 format.
+        /// </summary>
+        /// <param name="text">String to be encoded.</param>
+        /// <returns>Encoded string.</returns>
+        public static string Base64Encode(string text)
+        {
+            var textByte = System.Text.Encoding.UTF8.GetBytes(text);
+            return System.Convert.ToBase64String(textByte);
+        }
+    
+        /// <summary>
+        /// Dynamically cast the object into target type.
+        /// Ref: http://stackoverflow.com/questions/4925718/c-dynamic-runtime-cast
+        /// </summary>
+        /// <param name="source">Object to be casted</param>
+        /// <param name="dest">Target type</param>
+        /// <returns>Casted object</returns>
+        public static Object ConvertType(Object source, Type dest) {
+            return Convert.ChangeType(source, dest);
+        }
+  
+    }
+}
diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/ApiException.mustache b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/ApiException.mustache
new file mode 100644
index 00000000000..71d0243d729
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/ApiException.mustache
@@ -0,0 +1,48 @@
+using System;
+
+namespace {{packageName}}.Client {
+  /// <summary>
+  /// API Exception
+  /// </summary>
+  public class ApiException : Exception {
+      /// <summary>
+      /// Gets or sets the error code (HTTP status code)
+      /// </summary>
+      /// <value>The error code (HTTP status code).</value>
+      public int ErrorCode { get; set; }
+
+      /// <summary>
+      /// Gets or sets the error content (body json object)
+      /// </summary>
+      /// <value>The error content (Http response body).</value>
+      public Object ErrorContent { get; private set; }
+
+      /// <summary>
+      /// Initializes a new instance of the <see cref="ApiException"/> class.
+      /// </summary>
+      /// <param name="basePath">The base path.</param>
+      public ApiException() {}
+
+      /// <summary>
+      /// Initializes a new instance of the <see cref="ApiException"/> class.
+      /// </summary>
+      /// <param name="errorCode">HTTP status code.</param>
+      /// <param name="message">Error message.</param>
+      public ApiException(int errorCode, string message) : base(message) {
+          this.ErrorCode = errorCode;
+      }
+
+      /// <summary>
+      /// Initializes a new instance of the <see cref="ApiException"/> class.
+      /// </summary>
+      /// <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, Object errorContent = null) : base(message) {
+          this.ErrorCode = errorCode;
+          this.ErrorContent = errorContent;
+      }
+
+  }
+
+}
diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/Configuration.mustache b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/Configuration.mustache
new file mode 100644
index 00000000000..67b07069e2f
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/Configuration.mustache
@@ -0,0 +1,99 @@
+using System;
+using System.Reflection;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace {{packageName}}.Client
+{
+    /// <summary>
+    /// Represents a set of configuration settings
+    /// </summary>
+    public class Configuration
+    {
+  
+        /// <summary>
+        /// Version of the package.
+        /// </summary>
+        /// <value>Version of the package.</value>
+        public const string Version = "{{packageVersion}}";
+  
+        /// <summary>
+        /// Gets or sets the default API client for making HTTP calls.
+        /// </summary>
+        /// <value>The API client.</value>
+        public static ApiClient DefaultApiClient = new ApiClient();
+  
+        /// <summary>
+        /// Gets or sets the username (HTTP basic authentication).
+        /// </summary>
+        /// <value>The username.</value>
+        public static String Username { get; set; }
+  
+        /// <summary>
+        /// Gets or sets the password (HTTP basic authentication).
+        /// </summary>
+        /// <value>The password.</value>
+        public static String Password { get; set; }
+  
+        /// <summary>
+        /// Gets or sets the API key based on the authentication name.
+        /// </summary>
+        /// <value>The API key.</value>
+        public static 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>
+        /// <value>The prefix of the API key.</value>
+        public static Dictionary<String, String> ApiKeyPrefix = new Dictionary<String, String>();
+  
+        private static string _tempFolderPath = Path.GetTempPath();
+  
+        /// <summary>
+        /// Gets or sets the temporary folder path to store the files downloaded from the server.
+        /// </summary>
+        /// <value>Folder path.</value>
+        public static String TempFolderPath
+        {
+            get { return _tempFolderPath; }
+  
+            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;
+                else
+                    _tempFolderPath = value  + Path.DirectorySeparatorChar;
+            }
+        }
+  
+        /// <summary>
+        /// Returns a string with essential information for debugging.
+        /// </summary>
+        public static String ToDebugReport()
+        {
+            String report = "C# SDK ({{packageName}}) Debug Report:\n";
+            report += "    OS: " + Environment.OSVersion + "\n";
+            report += "    .NET Framework Version: " + Assembly
+                     .GetExecutingAssembly()
+                     .GetReferencedAssemblies()
+                     .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/CsharpDotNet2/README.md b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/README.md
new file mode 100644
index 00000000000..5fe03fcb316
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/README.md
@@ -0,0 +1,10 @@
+# Csharp-DotNet2
+
+This generator creates C# code targeting the .Net 2.0 framework. The resulting DLLs can be used in places where .Net 2.0 is the maximum supported version, such as in the Unity3d.
+
+## Dependencies
+- Mono compiler
+- Note: NuGet is downloaded by the mono compilation script and packages are installed with it. No dependency DLLs are bundled with this generator.
+
+
+
diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/api.mustache b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/api.mustache
new file mode 100644
index 00000000000..2e51c913c30
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/api.mustache
@@ -0,0 +1,127 @@
+using System;
+using System.IO;
+using System.Collections.Generic;
+using RestSharp;
+using {{packageName}}.Client;
+{{#hasImport}}using {{packageName}}.Model;
+{{/hasImport}}
+
+namespace {{packageName}}.Api
+{
+    {{#operations}}
+    public interface I{{classname}}
+    {
+        {{#operation}}
+        /// <summary>
+        /// {{summary}} {{notes}}
+        /// </summary>
+        {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
+        {{/allParams}}/// <returns>{{#returnType}}{{{returnType}}}{{/returnType}}</returns>
+        {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
+        {{/operation}}
+    }
+  
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public class {{classname}} : I{{classname}}
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="{{classname}}"/> class.
+        /// </summary>
+        /// <param name="apiClient"> an instance of ApiClient (optional)</param>
+        /// <returns></returns>
+        public {{classname}}(ApiClient apiClient = null)
+        {
+            if (apiClient == null) // use the default one in Configuration
+                this.ApiClient = Configuration.DefaultApiClient; 
+            else
+                this.ApiClient = apiClient;
+        }
+    
+        /// <summary>
+        /// Initializes a new instance of the <see cref="{{classname}}"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public {{classname}}(String basePath)
+        {
+            this.ApiClient = new ApiClient(basePath);
+        }
+    
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <param name="basePath">The base path</param>
+        /// <value>The base path</value>
+        public void SetBasePath(String basePath)
+        {
+            this.ApiClient.BasePath = basePath;
+        }
+    
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <param name="basePath">The base path</param>
+        /// <value>The base path</value>
+        public String GetBasePath(String basePath)
+        {
+            return this.ApiClient.BasePath;
+        }
+    
+        /// <summary>
+        /// Gets or sets the API client.
+        /// </summary>
+        /// <value>An instance of the ApiClient</param>
+        public ApiClient ApiClient {get; set;}
+    
+        {{#operation}}
+        /// <summary>
+        /// {{summary}} {{notes}}
+        /// </summary>
+        {{#allParams}}/// <param name="{{paramName}}">{{description}}</param> 
+        {{/allParams}}/// <returns>{{#returnType}}{{{returnType}}}{{/returnType}}</returns>            
+        public {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#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 {{nickname}}");
+            {{/required}}{{/allParams}}
+    
+            var path = "{{path}}";
+            path = path.Replace("{format}", "json");
+            {{#pathParams}}path = path.Replace("{" + "{{baseName}}" + "}", ApiClient.ParameterToString({{{paramName}}}));
+            {{/pathParams}}
+    
+            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;
+    
+            {{#queryParams}} if ({{paramName}} != null) queryParams.Add("{{baseName}}", ApiClient.ParameterToString({{paramName}})); // query parameter
+            {{/queryParams}}
+            {{#headerParams}} if ({{paramName}} != null) headerParams.Add("{{baseName}}", ApiClient.ParameterToString({{paramName}})); // header parameter
+            {{/headerParams}}
+            {{#formParams}}if ({{paramName}} != null) {{#isFile}}fileParams.Add("{{baseName}}", ApiClient.ParameterToFile("{{baseName}}", {{paramName}}));{{/isFile}}{{^isFile}}formParams.Add("{{baseName}}", ApiClient.ParameterToString({{paramName}})); // form parameter{{/isFile}}
+            {{/formParams}}
+            {{#bodyParam}}postBody = ApiClient.Serialize({{paramName}}); // http body (model) parameter
+            {{/bodyParam}}
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.{{httpMethod}}, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling {{nickname}}: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling {{nickname}}: " + response.ErrorMessage, response.ErrorMessage);
+    
+            {{#returnType}}return ({{{returnType}}}) ApiClient.Deserialize(response.Content, typeof({{{returnType}}}), response.Headers);{{/returnType}}{{^returnType}}return;{{/returnType}}
+        }
+    
+        {{/operation}}
+    }
+    {{/operations}}
+}
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
new file mode 100644
index 00000000000..73add75a69a
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/compile-mono.sh.mustache
@@ -0,0 +1,12 @@
+wget -nc https://nuget.org/nuget.exe;
+mozroots --import --sync
+mono nuget.exe install vendor/packages.config -o vendor;
+mkdir -p bin;
+mcs -sdk:2 -r:vendor/Newtonsoft.Json.7.0.1/lib/net20/Newtonsoft.Json.dll,\
+vendor/RestSharp.Net2.1.1.11/lib/net20/RestSharp.Net2.dll,\
+System.Runtime.Serialization.dll \
+-target:library \
+-out:bin/{{packageName}}.dll \
+-recurse:src/*.cs \
+-doc:bin/{{packageName}}.xml \
+-platform:anycpu
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/model.mustache b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/model.mustache
new file mode 100644
index 00000000000..3e6e32320e7
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/model.mustache
@@ -0,0 +1,53 @@
+using System;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+
+{{#models}}
+{{#model}}
+namespace {{packageName}}.Model {
+
+  /// <summary>
+  /// {{description}}
+  /// </summary>
+  [DataContract]
+  public class {{classname}}{{#parent}} : {{{parent}}}{{/parent}} {
+    {{#vars}}
+    /// <summary>
+    /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{{description}}}{{/description}}
+    /// </summary>{{#description}}
+    /// <value>{{{description}}}</value>{{/description}}
+    [DataMember(Name="{{baseName}}", EmitDefaultValue=false)]
+    [JsonProperty(PropertyName = "{{baseName}}")]
+    public {{{datatype}}} {{name}} { get; set; }
+
+    {{/vars}}
+
+    /// <summary>
+    /// Get 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>
+    /// Get 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);
+    }
+
+}
+{{/model}}
+{{/models}}
+}
diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/packages.config.mustache b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/packages.config.mustache
new file mode 100644
index 00000000000..7b9cf186303
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/packages.config.mustache
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="RestSharp.Net2" version="1.1.11" targetFramework="net20" developmentDependency="true" />
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net20" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache
index 352401ba0d8..5e18c854cba 100644
--- a/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache
@@ -1,17 +1,14 @@
 package {{invokerPackage}};
 
-import com.fasterxml.jackson.core.JsonGenerator.Feature;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.annotation.*;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.ClientResponse;
 import com.sun.jersey.api.client.config.ClientConfig;
 import com.sun.jersey.api.client.config.DefaultClientConfig;
 import com.sun.jersey.api.client.filter.LoggingFilter;
 import com.sun.jersey.api.client.WebResource.Builder;
+
 import com.sun.jersey.multipart.FormDataMultiPart;
+import com.sun.jersey.multipart.file.FileDataBodyPart;
 
 import javax.ws.rs.core.Response.Status.Family;
 import javax.ws.rs.core.MediaType;
@@ -22,13 +19,16 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.HashMap;
 import java.util.List;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.TimeZone;
 
 import java.net.URLEncoder;
 
 import java.io.IOException;
+import java.io.File;
 import java.io.UnsupportedEncodingException;
+import java.io.DataInputStream;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -39,14 +39,19 @@ import {{invokerPackage}}.auth.HttpBasicAuth;
 import {{invokerPackage}}.auth.ApiKeyAuth;
 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 JSON json = new JSON();
 
   private Map<String, Authentication> authentications;
 
+  private int statusCode;
+  private Map<String, List<String>> responseHeaders;
+
   private DateFormat dateFormat;
 
   public ApiClient() {
@@ -78,6 +83,20 @@ public class ApiClient {
     return this;
   }
 
+  /**
+   * Gets the status code of the previous request
+   */
+  public int getStatusCode() {
+    return statusCode;
+  }
+
+  /**
+   * Gets the response headers of the previous request
+   */
+  public Map<String, List<String>> getResponseHeaders() {
+    return responseHeaders;
+  }
+
   /**
    * Get authentications (key: authentication name, value: authentication).
    */
@@ -238,6 +257,62 @@ public class ApiClient {
     }
   }
 
+  /*
+    Format to {@code Pair} objects.
+  */
+  public List<Pair> parameterToPairs(String collectionFormat, String name, Object value){
+    List<Pair> params = new ArrayList<Pair>();
+
+    // preconditions
+    if (name == null || name.isEmpty() || value == null) return params;
+
+    Collection valueCollection = null;
+    if (value instanceof Collection) {
+      valueCollection = (Collection) value;
+    } else {
+      params.add(new Pair(name, parameterToString(value)));
+      return params;
+    }
+
+    if (valueCollection.isEmpty()){
+      return params;
+    }
+
+    // get the collection format
+    collectionFormat = (collectionFormat == null || collectionFormat.isEmpty() ? "csv" : collectionFormat); // default: csv
+
+    // create the params based on the collection format
+    if (collectionFormat.equals("multi")) {
+      for (Object item : valueCollection) {
+        params.add(new Pair(name, parameterToString(item)));
+      }
+
+      return params;
+    }
+
+    String delimiter = ",";
+
+    if (collectionFormat.equals("csv")) {
+      delimiter = ",";
+    } else if (collectionFormat.equals("ssv")) {
+      delimiter = " ";
+    } else if (collectionFormat.equals("tsv")) {
+      delimiter = "\t";
+    } else if (collectionFormat.equals("pipes")) {
+      delimiter = "|";
+    }
+
+    StringBuilder sb = new StringBuilder() ;
+    for (Object item : valueCollection) {
+      sb.append(delimiter);
+      sb.append(parameterToString(item));
+    }
+
+    params.add(new Pair(name, sb.substring(1)));
+
+    return params;
+  }
+
   /**
    * Select the Accept header's value from the given accepts array:
    *   if JSON exists in the given array, use it;
@@ -280,84 +355,65 @@ public class ApiClient {
   }
 
   /**
-   * Deserialize the given JSON string to Java object.
-   *
-   * @param json The JSON string
-   * @param containerType The container type, one of "list", "array" or ""
-   * @param cls The type of the Java object
-   * @return The deserialized Java object
+   * Serialize the given Java object into string according the given
+   * Content-Type (only JSON is supported for now).
    */
-  public Object deserialize(String json, String containerType, Class cls) throws ApiException {
-    if(null != containerType) {
-        containerType = containerType.toLowerCase();
-    }
-    try{
-      if("list".equals(containerType) || "array".equals(containerType)) {
-        JavaType typeInfo = JsonUtil.getJsonMapper().getTypeFactory().constructCollectionType(List.class, cls);
-        List response = (List<?>) JsonUtil.getJsonMapper().readValue(json, typeInfo);
-        return response;
-      }
-      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(), null, json);
+  public String serialize(Object obj, String contentType) throws ApiException {
+    if (contentType.startsWith("application/json")) {
+      return json.serialize(obj);
+    } else {
+      throw new ApiException(400, "can not serialize object into Content-Type: " + contentType);
     }
   }
 
   /**
-   * Serialize the given Java object into JSON string.
+   * Deserialize response body to Java object according to the Content-Type.
    */
-  public 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 <T> T deserialize(ClientResponse response, TypeRef returnType) throws ApiException {
+    String contentType = null;
+    List<String> contentTypes = response.getHeaders().get("Content-Type");
+    if (contentTypes != null && !contentTypes.isEmpty())
+      contentType = contentTypes.get(0);
+    if (contentType == null)
+      throw new ApiException(500, "missing Content-Type in response");
+
+    String body;
+    if (response.hasEntity())
+      body = (String) response.getEntity(String.class);
+    else
+      body = "";
+
+    if (contentType.startsWith("application/json")) {
+      return json.deserialize(body, returnType);
+    } else {
+      throw new ApiException(500, "can not deserialize Content-Type: " + contentType);
     }
   }
 
-  /**
-   * Invoke API by sending HTTP request with the given options.
-   *
-   * @param path The sub-path of the HTTP URL
-   * @param method The request method, one of "GET", "POST", "PUT", and "DELETE"
-   * @param queryParams The query parameters
-   * @param body The request body object
-   * @param headerParams The header parameters
-   * @param formParams The form parameters
-   * @param accept The request's Accept header
-   * @param contentType The request's Content-Type header
-   * @param authNames The authentications to apply
-   * @return The response body in type of string
-   */
-  public String invokeAPI(String path, String method, Map<String, String> queryParams, Object body, Map<String, String> headerParams, Map<String, String> formParams, String accept, String contentType, String[] authNames) throws ApiException {
+  private ClientResponse getAPIResponse(String path, String method, List<Pair> queryParams, Object body, byte[] binaryBody, Map<String, String> headerParams, Map<String, Object> formParams, String accept, String contentType, String[] authNames) throws ApiException {
+
+    if (body != null && binaryBody != null){
+      throw new ApiException(500, "either body or binaryBody must be null");
+    }
+
     updateParamsForAuth(authNames, queryParams, headerParams);
 
     Client client = getClient();
 
     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("?");
+    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("&");
-        b.append(escapeString(key)).append("=").append(escapeString(value));
+        }
       }
     }
-    String querystring = b.toString();
+
+    String querystring = b.substring(0, b.length() - 1);
 
     Builder builder;
     if (accept == null)
@@ -365,90 +421,174 @@ public class ApiClient {
     else
       builder = client.resource(basePath + path + querystring).accept(accept);
 
-    for(String key : headerParams.keySet()) {
+    for (String key : headerParams.keySet()) {
       builder = builder.header(key, headerParams.get(key));
     }
-    for(String key : defaultHeaderMap.keySet()) {
-      if(!headerParams.containsKey(key)) {
+    for (String key : defaultHeaderMap.keySet()) {
+      if (!headerParams.containsKey(key)) {
         builder = builder.header(key, defaultHeaderMap.get(key));
       }
     }
 
+    String encodedFormParams = null;
+    if (contentType.startsWith("multipart/form-data")) {
+      FormDataMultiPart mp = new FormDataMultiPart();
+      for (Entry<String, Object> param: formParams.entrySet()) {
+        if (param.getValue() instanceof File) {
+          File file = (File) param.getValue();
+          mp.field(param.getKey(), file.getName());
+          mp.bodyPart(new FileDataBodyPart(param.getKey(), file, MediaType.MULTIPART_FORM_DATA_TYPE));
+        } else {
+          mp.field(param.getKey(), parameterToString(param.getValue()), MediaType.MULTIPART_FORM_DATA_TYPE);
+        }
+      }
+      body = mp;
+    } else if (contentType.startsWith("application/x-www-form-urlencoded")) {
+      encodedFormParams = this.getXWWWFormUrlencodedParams(formParams);
+    }
+
     ClientResponse response = null;
 
-    if("GET".equals(method)) {
+    if ("GET".equals(method)) {
       response = (ClientResponse) builder.get(ClientResponse.class);
-    }
-    else if ("POST".equals(method)) {
-      if (contentType.startsWith("application/x-www-form-urlencoded")) {
-        String encodedFormParams = this
-            .getXWWWFormUrlencodedParams(formParams);
-        response = builder.type(contentType).post(ClientResponse.class,
-            encodedFormParams);
+    } else if ("POST".equals(method)) {
+      if (encodedFormParams != null) {
+        response = builder.type(contentType).post(ClientResponse.class, encodedFormParams);
       } else if (body == null) {
-        response = builder.post(ClientResponse.class, null);
-      } else if(body instanceof FormDataMultiPart) {
+        if(binaryBody == null)
+            response = builder.post(ClientResponse.class, null);
+        else
+            response = builder.type(contentType).post(ClientResponse.class, binaryBody);
+      } else if (body instanceof FormDataMultiPart) {
         response = builder.type(contentType).post(ClientResponse.class, body);
+      } else {
+        response = builder.type(contentType).post(ClientResponse.class, serialize(body, contentType));
       }
-      else
-        response = builder.type(contentType).post(ClientResponse.class, serialize(body));
-    }
-    else if ("PUT".equals(method)) {
-      if ("application/x-www-form-urlencoded".equals(contentType)) {
-          String encodedFormParams = this
-              .getXWWWFormUrlencodedParams(formParams);
-          response = builder.type(contentType).put(ClientResponse.class,
-              encodedFormParams);
+    } else if ("PUT".equals(method)) {
+      if (encodedFormParams != null) {
+        response = builder.type(contentType).put(ClientResponse.class, encodedFormParams);
       } else if(body == null) {
-        response = builder.put(ClientResponse.class, serialize(body));
+        if(binaryBody == null)
+            response = builder.put(ClientResponse.class, null);
+        else
+            response = builder.type(contentType).put(ClientResponse.class, binaryBody);
       } else {
-          response = builder.type(contentType).put(ClientResponse.class, serialize(body));
+        response = builder.type(contentType).put(ClientResponse.class, serialize(body, contentType));
       }
-    }
-    else if ("DELETE".equals(method)) {
-      if ("application/x-www-form-urlencoded".equals(contentType)) {
-        String encodedFormParams = this
-            .getXWWWFormUrlencodedParams(formParams);
-        response = builder.type(contentType).delete(ClientResponse.class,
-            encodedFormParams);
+    } else if ("DELETE".equals(method)) {
+      if (encodedFormParams != null) {
+        response = builder.type(contentType).delete(ClientResponse.class, encodedFormParams);
       } else if(body == null) {
-        response = builder.delete(ClientResponse.class);
+        if(binaryBody == null)
+            response = builder.delete(ClientResponse.class);
+        else
+            response = builder.type(contentType).delete(ClientResponse.class, binaryBody);
       } else {
-        response = builder.type(contentType).delete(ClientResponse.class, serialize(body));
+        response = builder.type(contentType).delete(ClientResponse.class, serialize(body, contentType));
       }
-    }
-    else {
+    } else {
       throw new ApiException(500, "unknown method type " + method);
     }
+    return response;
+  }
 
-    if(response.getClientResponseStatus() == ClientResponse.Status.NO_CONTENT) {
+  /**
+   * Invoke API by sending HTTP request with the given options.
+   *
+   * @param path The sub-path of the HTTP URL
+   * @param method The request method, one of "GET", "POST", "PUT", and "DELETE"
+   * @param queryParams The query parameters
+   * @param body The request body object - if it is not binary, otherwise null
+   * @param binaryBody The request body object - if it is binary, otherwise null
+   * @param headerParams The header parameters
+   * @param formParams The form parameters
+   * @param accept The request's Accept header
+   * @param contentType The request's Content-Type header
+   * @param authNames The authentications to apply
+   * @return The response body in type of string
+   */
+   public <T> T invokeAPI(String path, String method, List<Pair> queryParams, Object body, byte[] binaryBody, Map<String, String> headerParams, Map<String, Object> formParams, String accept, String contentType, String[] authNames, TypeRef returnType) throws ApiException {
+
+    ClientResponse response = getAPIResponse(path, method, queryParams, body, binaryBody, headerParams, formParams, accept, contentType, authNames);
+
+    statusCode = response.getStatusInfo().getStatusCode();
+    responseHeaders = response.getHeaders();
+
+    if(response.getStatusInfo() == ClientResponse.Status.NO_CONTENT) {
+      return null;
+    } else if (response.getStatusInfo().getFamily() == Family.SUCCESSFUL) {
+      if (returnType == null)
+        return null;
+      else
+        return deserialize(response, returnType);
+    } else {
+      String message = "error";
+      String respBody = null;
+      if (response.hasEntity()) {
+        try {
+          respBody = String.valueOf(response.getEntity(String.class));
+          message = respBody;
+        } catch (RuntimeException e) {
+          // e.printStackTrace();
+        }
+      }
+      throw new ApiException(
+        response.getStatusInfo().getStatusCode(),
+        message,
+        response.getHeaders(),
+        respBody);
+    }
+  }
+ /**
+   * Invoke API by sending HTTP request with the given options - return binary result
+   *
+   * @param path The sub-path of the HTTP URL
+   * @param method The request method, one of "GET", "POST", "PUT", and "DELETE"
+   * @param queryParams The query parameters
+   * @param body The request body object - if it is not binary, otherwise null
+   * @param binaryBody The request body object - if it is binary, otherwise null
+   * @param headerParams The header parameters
+   * @param formParams The form parameters
+   * @param accept The request's Accept header
+   * @param contentType The request's Content-Type header
+   * @param authNames The authentications to apply
+   * @return The response body in type of string
+   */
+ public byte[] invokeBinaryAPI(String path, String method, List<Pair> queryParams, Object body, byte[] binaryBody, Map<String, String> headerParams, Map<String, Object> formParams, String accept, String contentType, String[]authNames) throws ApiException {
+
+    ClientResponse response = getAPIResponse(path, method, queryParams, body, binaryBody, headerParams, formParams, accept, contentType, authNames);
+
+    if(response.getStatusInfo() == ClientResponse.Status.NO_CONTENT) {
       return null;
     }
-    else if(response.getClientResponseStatus().getFamily() == Family.SUCCESSFUL) {
+    else if(response.getStatusInfo().getFamily() == Family.SUCCESSFUL) {
       if(response.hasEntity()) {
-        return (String) response.getEntity(String.class);
+    	DataInputStream stream = new DataInputStream(response.getEntityInputStream());
+    	byte[] data = new byte[response.getLength()];
+    	try {
+    	  stream.readFully(data);
+    	} catch (IOException ex) {
+    	  throw new ApiException(500, "Error obtaining binary response data");
+    	}
+        return data;
       }
       else {
-        return "";
+        return new byte[0];
       }
     }
     else {
       String message = "error";
-      String respBody = null;
       if(response.hasEntity()) {
         try{
-          respBody = String.valueOf(response.getEntity(String.class));
-          message = respBody;
+          message = String.valueOf(response.getEntity(String.class));
         }
         catch (RuntimeException e) {
           // e.printStackTrace();
         }
       }
       throw new ApiException(
-                response.getClientResponseStatus().getStatusCode(),
-                message,
-                response.getHeaders(),
-                respBody);
+                response.getStatusInfo().getStatusCode(),
+                message);
     }
   }
 
@@ -457,7 +597,7 @@ public class ApiClient {
    *
    * @param authNames The authentications to apply
    */
-  private void updateParamsForAuth(String[] authNames, Map<String, String> queryParams, Map<String, String> headerParams) {
+  private void updateParamsForAuth(String[] authNames, List<Pair> queryParams, Map<String, String> headerParams) {
     for (String authName : authNames) {
       Authentication auth = authentications.get(authName);
       if (auth == null) throw new RuntimeException("Authentication undefined: " + authName);
@@ -468,15 +608,14 @@ public class ApiClient {
   /**
    * Encode the given form parameters as request body.
    */
-  private String getXWWWFormUrlencodedParams(Map<String, String> formParams) {
+  private String getXWWWFormUrlencodedParams(Map<String, Object> formParams) {
     StringBuilder formParamBuilder = new StringBuilder();
 
-    for (Entry<String, String> param : formParams.entrySet()) {
-      String keyStr = parameterToString(param.getKey());
+    for (Entry<String, Object> param : formParams.entrySet()) {
+      String keyStr = param.getKey();
       String valueStr = parameterToString(param.getValue());
-
       try {
-        formParamBuilder.append(URLEncoder.encode(keyStr, "utf8"))
+        formParamBuilder.append(URLEncoder.encode(param.getKey(), "utf8"))
             .append("=")
             .append(URLEncoder.encode(valueStr, "utf8"));
         formParamBuilder.append("&");
@@ -484,11 +623,12 @@ public class ApiClient {
         // move on to next
       }
     }
+
     String encodedFormParams = formParamBuilder.toString();
     if (encodedFormParams.endsWith("&")) {
-      encodedFormParams = encodedFormParams.substring(0,
-          encodedFormParams.length() - 1);
+      encodedFormParams = encodedFormParams.substring(0, encodedFormParams.length() - 1);
     }
+
     return encodedFormParams;
   }
 
diff --git a/modules/swagger-codegen/src/main/resources/Java/Configuration.mustache b/modules/swagger-codegen/src/main/resources/Java/Configuration.mustache
index e936b423a91..4629c4e17be 100644
--- a/modules/swagger-codegen/src/main/resources/Java/Configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/Configuration.mustache
@@ -1,5 +1,6 @@
 package {{invokerPackage}};
 
+{{>generatedAnnotation}}
 public class Configuration {
   private static ApiClient defaultApiClient = new ApiClient();
 
diff --git a/modules/swagger-codegen/src/main/resources/Java/JSON.mustache b/modules/swagger-codegen/src/main/resources/Java/JSON.mustache
new file mode 100644
index 00000000000..7689856f5de
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Java/JSON.mustache
@@ -0,0 +1,54 @@
+package {{invokerPackage}};
+
+import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.datatype.joda.*;
+
+import java.io.IOException;
+
+{{>generatedAnnotation}}
+public class JSON {
+  private ObjectMapper mapper;
+
+  public JSON() {
+    mapper = new ObjectMapper();
+    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());
+	}
+
+  /**
+   * Serialize the given Java object into JSON string.
+   */
+  public String serialize(Object obj) throws ApiException {
+    try {
+      if (obj != null)
+        return mapper.writeValueAsString(obj);
+      else
+        return null;
+    } catch (Exception e) {
+      throw new ApiException(400, e.getMessage());
+    }
+  }
+
+  /**
+   * Deserialize the given JSON string to Java object.
+   *
+   * @param body The JSON string
+   * @param returnType The type to deserialize inot
+   * @return The deserialized Java object
+   */
+  public <T> T deserialize(String body, TypeRef returnType) throws ApiException {
+    JavaType javaType = mapper.constructType(returnType.getType());
+    try {
+      return mapper.readValue(body, javaType);
+    } catch (IOException e) {
+      if (returnType.getType().equals(String.class))
+        return (T) body;
+      else
+        throw new ApiException(500, e.getMessage(), null, body);
+    }
+  }
+}
diff --git a/modules/swagger-codegen/src/main/resources/Java/JsonUtil.mustache b/modules/swagger-codegen/src/main/resources/Java/JsonUtil.mustache
deleted file mode 100644
index 29d5f55ecee..00000000000
--- a/modules/swagger-codegen/src/main/resources/Java/JsonUtil.mustache
+++ /dev/null
@@ -1,23 +0,0 @@
-package {{invokerPackage}};
-
-import com.fasterxml.jackson.annotation.*;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.core.JsonGenerator.Feature;
-
-import com.fasterxml.jackson.datatype.joda.*;
-
-public class JsonUtil {
-  public static ObjectMapper mapper;
-
-  static {
-  	mapper = new ObjectMapper();
-	  mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-	  mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-	  mapper.registerModule(new JodaModule());
-	}
-
-	public static ObjectMapper getJsonMapper() {
-		return mapper;
-	}
-}
diff --git a/modules/swagger-codegen/src/main/resources/Java/Pair.mustache b/modules/swagger-codegen/src/main/resources/Java/Pair.mustache
new file mode 100644
index 00000000000..e2a47317afe
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Java/Pair.mustache
@@ -0,0 +1,39 @@
+package {{invokerPackage}};
+
+{{>generatedAnnotation}}
+public class Pair {
+    private String name = "";
+    private String value = "";
+
+    public Pair (String name, String value) {
+        setName(name);
+        setValue(value);
+    }
+
+    private void setName(String name) {
+        if (!isValidString(name)) return;
+
+        this.name = name;
+    }
+
+    private void setValue(String value) {
+        if (!isValidString(value)) return;
+
+        this.value = value;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    private boolean isValidString(String arg) {
+        if (arg == null) return false;
+        if (arg.trim().isEmpty()) return false;
+
+        return true;
+    }
+}
diff --git a/modules/swagger-codegen/src/main/resources/Java/StringUtil.mustache b/modules/swagger-codegen/src/main/resources/Java/StringUtil.mustache
index 035d6739dce..c9583f1bc63 100644
--- a/modules/swagger-codegen/src/main/resources/Java/StringUtil.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/StringUtil.mustache
@@ -1,5 +1,6 @@
 package {{invokerPackage}};
 
+{{>generatedAnnotation}}
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
@@ -38,4 +39,13 @@ public class StringUtil {
     }
     return out.toString();
   }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  public 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/Java/TypeRef.mustache b/modules/swagger-codegen/src/main/resources/Java/TypeRef.mustache
new file mode 100644
index 00000000000..9e9ba5f8895
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Java/TypeRef.mustache
@@ -0,0 +1,26 @@
+package {{invokerPackage}};
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+
+{{>generatedAnnotation}}
+public class TypeRef<T> {
+    private final Type type;
+
+    public TypeRef() {
+        this.type = getGenericType(getClass());
+    }
+
+    private static Type getGenericType(Class<?> klass) {
+        Type superclass = klass.getGenericSuperclass();
+        if (superclass instanceof Class) {
+            throw new RuntimeException("No type parameter provided");
+        }
+        ParameterizedType parameterized = (ParameterizedType) superclass;
+        return parameterized.getActualTypeArguments()[0];
+    }
+
+    public Type getType() {
+        return type;
+    }
+}
diff --git a/modules/swagger-codegen/src/main/resources/Java/api.mustache b/modules/swagger-codegen/src/main/resources/Java/api.mustache
index 63357afd896..ad957261f2a 100644
--- a/modules/swagger-codegen/src/main/resources/Java/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/api.mustache
@@ -3,6 +3,8 @@ package {{package}};
 import {{invokerPackage}}.ApiException;
 import {{invokerPackage}}.ApiClient;
 import {{invokerPackage}}.Configuration;
+import {{invokerPackage}}.Pair;
+import {{invokerPackage}}.TypeRef;
 
 import {{modelPackage}}.*;
 
@@ -11,33 +13,29 @@ import java.util.*;
 {{#imports}}import {{import}};
 {{/imports}}
 
-import com.sun.jersey.multipart.FormDataMultiPart;
-import com.sun.jersey.multipart.file.FileDataBodyPart;
-
-import javax.ws.rs.core.MediaType;
-
 import java.io.File;
 import java.util.Map;
 import java.util.HashMap;
 
+{{>generatedAnnotation}}
 {{#operations}}
 public class {{classname}} {
-  private ApiClient apiClient;
+  private ApiClient {{localVariablePrefix}}apiClient;
 
   public {{classname}}() {
     this(Configuration.getDefaultApiClient());
   }
 
   public {{classname}}(ApiClient apiClient) {
-    this.apiClient = apiClient;
+    this.{{localVariablePrefix}}apiClient = apiClient;
   }
 
   public ApiClient getApiClient() {
-    return apiClient;
+    return {{localVariablePrefix}}apiClient;
   }
 
   public void setApiClient(ApiClient apiClient) {
-    this.apiClient = apiClient;
+    this.{{localVariablePrefix}}apiClient = apiClient;
   }
 
   {{#operation}}
@@ -48,77 +46,63 @@ 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 {{localVariablePrefix}}postBody = {{#bodyParam}}{{^isBinary}}{{paramName}}{{/isBinary}}{{#isBinary}}null{{/isBinary}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
+    byte[] {{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}}");
-    }
-    {{/required}}{{/allParams}}
-
+     // verify the required parameter '{{paramName}}' is set
+     if ({{paramName}} == null) {
+        throw 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("\\{" + "{{paramName}}" + "\\}", apiClient.escapeString({{{paramName}}}.toString())){{/pathParams}};
+    String {{localVariablePrefix}}path = "{{{path}}}".replaceAll("\\{format\\}","json"){{#pathParams}}
+      .replaceAll("\\{" + "{{baseName}}" + "\\}", {{localVariablePrefix}}apiClient.escapeString({{{paramName}}}.toString())){{/pathParams}};
 
     // 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>();
+    List<Pair> {{localVariablePrefix}}queryParams = new ArrayList<Pair>();
+    Map<String, String> {{localVariablePrefix}}headerParams = new HashMap<String, String>();
+    Map<String, Object> {{localVariablePrefix}}formParams = new HashMap<String, Object>();
 
-    {{#queryParams}}if ({{paramName}} != null)
-      queryParams.put("{{baseName}}", apiClient.parameterToString({{paramName}}));
+    {{#queryParams}}
+    {{localVariablePrefix}}queryParams.addAll({{localVariablePrefix}}apiClient.parameterToPairs("{{#collectionFormat}}{{{collectionFormat}}}{{/collectionFormat}}", "{{baseName}}", {{paramName}}));
     {{/queryParams}}
 
     {{#headerParams}}if ({{paramName}} != null)
-      headerParams.put("{{baseName}}", apiClient.parameterToString({{paramName}}));
+    {{localVariablePrefix}}headerParams.put("{{baseName}}", {{localVariablePrefix}}apiClient.parameterToString({{paramName}}));
     {{/headerParams}}
 
-    final String[] accepts = {
+    {{#formParams}}if ({{paramName}} != null)
+      {{localVariablePrefix}}formParams.put("{{baseName}}", {{paramName}});
+    {{/formParams}}
+
+    final String[] {{localVariablePrefix}}accepts = {
       {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}}
     };
-    final String accept = apiClient.selectHeaderAccept(accepts);
+    final String {{localVariablePrefix}}accept = {{localVariablePrefix}}apiClient.selectHeaderAccept({{localVariablePrefix}}accepts);
 
-    final String[] contentTypes = {
+    final String[] {{localVariablePrefix}}contentTypes = {
       {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}}
     };
-    final String contentType = apiClient.selectHeaderContentType(contentTypes);
-
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      {{#formParams}}{{#notFile}}
-      if ({{paramName}} != null) {
-        hasFields = true;
-        mp.field("{{baseName}}", apiClient.parameterToString({{paramName}}), MediaType.MULTIPART_FORM_DATA_TYPE);
-      }
-      {{/notFile}}{{#isFile}}
-      if ({{paramName}} != null) {
-        hasFields = true;
-        mp.field("{{baseName}}", {{paramName}}.getName());
-        mp.bodyPart(new FileDataBodyPart("{{baseName}}", {{paramName}}, MediaType.MULTIPART_FORM_DATA_TYPE));
-      }
-      {{/isFile}}{{/formParams}}
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      {{#formParams}}{{#notFile}}if ({{paramName}} != null)
-        formParams.put("{{baseName}}", apiClient.parameterToString({{paramName}}));{{/notFile}}
-      {{/formParams}}
-    }
-
-    try {
-      String[] authNames = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
-      String response = apiClient.invokeAPI(path, "{{httpMethod}}", queryParams, postBody, headerParams, formParams, accept, contentType, authNames);
-      if(response != null){
-        return {{#returnType}}({{{returnType}}}) apiClient.deserialize(response, "{{returnContainer}}", {{returnBaseType}}.class){{/returnType}};
-      }
-      else {
-        return {{#returnType}}null{{/returnType}};
-      }
-    } catch (ApiException ex) {
-      throw ex;
-    }
+    final String {{localVariablePrefix}}contentType = {{localVariablePrefix}}apiClient.selectHeaderContentType({{localVariablePrefix}}contentTypes);
+
+    String[] {{localVariablePrefix}}authNames = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
+
+    {{#isResponseBinary}}
+    byte[] {{localVariablePrefix}}response = null;
+    {{localVariablePrefix}}response = {{localVariablePrefix}}apiClient.invokeBinaryAPI({{localVariablePrefix}}path, "{{httpMethod}}", {{localVariablePrefix}}queryParams,{{localVariablePrefix}} postBody, {{localVariablePrefix}}postBinaryBody, {{localVariablePrefix}}headerParams, {{localVariablePrefix}}formParams, {{localVariablePrefix}}accept, {{localVariablePrefix}}contentType, {{localVariablePrefix}}authNames);
+    return {{localVariablePrefix}}response;
+    {{/isResponseBinary}}
+
+    {{^isResponseBinary}}
+    {{#returnType}}
+    TypeRef {{localVariablePrefix}}returnType = new TypeRef<{{{returnType}}}>() {};
+    return {{localVariablePrefix}}apiClient.invokeAPI({{localVariablePrefix}}path, "{{httpMethod}}", {{localVariablePrefix}}queryParams, {{localVariablePrefix}}postBody, {{localVariablePrefix}}postBinaryBody, {{localVariablePrefix}}headerParams, {{localVariablePrefix}}formParams, {{localVariablePrefix}}accept, {{localVariablePrefix}}contentType, {{localVariablePrefix}}authNames, {{localVariablePrefix}}returnType);
+    {{/returnType}}{{^returnType}}
+    {{localVariablePrefix}}apiClient.invokeAPI({{localVariablePrefix}}path, "{{httpMethod}}", {{localVariablePrefix}}queryParams, {{localVariablePrefix}}postBody, {{localVariablePrefix}}postBinaryBody, {{localVariablePrefix}}headerParams, {{localVariablePrefix}}formParams, {{localVariablePrefix}}accept, {{localVariablePrefix}}contentType, {{localVariablePrefix}}authNames, null);
+    {{/returnType}}
+    {{/isResponseBinary}}
+
+
   }
   {{/operation}}
 }
diff --git a/modules/swagger-codegen/src/main/resources/Java/apiException.mustache b/modules/swagger-codegen/src/main/resources/Java/apiException.mustache
index 9afe96c6ffb..b9a62a6b231 100644
--- a/modules/swagger-codegen/src/main/resources/Java/apiException.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/apiException.mustache
@@ -3,22 +3,48 @@ package {{invokerPackage}};
 import java.util.Map;
 import java.util.List;
 
+{{>generatedAnnotation}}
 public class ApiException extends Exception {
   private int code = 0;
-  private String message = null;
   private Map<String, List<String>> responseHeaders = null;
   private String responseBody = null;
 
   public ApiException() {}
 
+  public ApiException(Throwable throwable) {
+    super(throwable);
+  }
+
+  public ApiException(String message) {
+    super(message);
+  }
+
+  public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders, String responseBody) {
+    super(message, throwable);
+    this.code = code;
+    this.responseHeaders = responseHeaders;
+    this.responseBody = responseBody;
+  }
+
+  public ApiException(String message, int code, Map<String, List<String>> responseHeaders, String responseBody) {
+    this(message, (Throwable) null, code, responseHeaders, responseBody);
+  }
+
+  public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders) {
+    this(message, throwable, code, responseHeaders, null);
+  }
+
+  public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
+    this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+  }
+
   public ApiException(int code, String message) {
+    super(message);
     this.code = code;
-    this.message = message;
   }
 
   public ApiException(int code, String message, Map<String, List<String>> responseHeaders, String responseBody) {
-    this.code = code;
-    this.message = message;
+    this(code, message);
     this.responseHeaders = responseHeaders;
     this.responseBody = responseBody;
   }
@@ -27,10 +53,6 @@ public class ApiException extends Exception {
     return code;
   }
 
-  public String getMessage() {
-    return message;
-  }
-
   /**
    * Get the HTTP response headers.
    */
diff --git a/modules/swagger-codegen/src/main/resources/Java/auth/ApiKeyAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/ApiKeyAuth.mustache
index 65720b958cb..04be4812292 100644
--- a/modules/swagger-codegen/src/main/resources/Java/auth/ApiKeyAuth.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/auth/ApiKeyAuth.mustache
@@ -1,7 +1,11 @@
 package {{invokerPackage}}.auth;
 
+import {{invokerPackage}}.Pair;
+
 import java.util.Map;
+import java.util.List;
 
+{{>generatedAnnotation}}
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
@@ -39,7 +43,7 @@ public class ApiKeyAuth implements Authentication {
   }
 
   @Override
-  public void applyToParams(Map<String, String> queryParams, Map<String, String> headerParams) {
+  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams) {
     String value;
     if (apiKeyPrefix != null) {
       value = apiKeyPrefix + " " + apiKey;
@@ -47,7 +51,7 @@ public class ApiKeyAuth implements Authentication {
       value = apiKey;
     }
     if (location == "query") {
-      queryParams.put(paramName, value);
+      queryParams.add(new Pair(paramName, value));
     } else if (location == "header") {
       headerParams.put(paramName, value);
     }
diff --git a/modules/swagger-codegen/src/main/resources/Java/auth/Authentication.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/Authentication.mustache
index 1b2e2bc2fbe..037ef58ab90 100644
--- a/modules/swagger-codegen/src/main/resources/Java/auth/Authentication.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/auth/Authentication.mustache
@@ -1,8 +1,12 @@
 package {{invokerPackage}}.auth;
 
+import {{invokerPackage}}.Pair;
+
 import java.util.Map;
+import java.util.List;
 
+{{>generatedAnnotation}}
 public interface Authentication {
   /** Apply authentication settings to header and query params. */
-  void applyToParams(Map<String, String> queryParams, Map<String, String> headerParams);
+  void applyToParams(List<Pair> queryParams, Map<String, String> headerParams);
 }
diff --git a/modules/swagger-codegen/src/main/resources/Java/auth/HttpBasicAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/HttpBasicAuth.mustache
index 22a64b1a24e..63813e2504e 100644
--- a/modules/swagger-codegen/src/main/resources/Java/auth/HttpBasicAuth.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/auth/HttpBasicAuth.mustache
@@ -1,10 +1,14 @@
 package {{invokerPackage}}.auth;
 
+import {{invokerPackage}}.Pair;
+
 import java.util.Map;
+import java.util.List;
 
 import java.io.UnsupportedEncodingException;
 import javax.xml.bind.DatatypeConverter;
 
+{{>generatedAnnotation}}
 public class HttpBasicAuth implements Authentication {
   private String username;
   private String password;
@@ -26,7 +30,7 @@ public class HttpBasicAuth implements Authentication {
   }
 
   @Override
-  public void applyToParams(Map<String, String> queryParams, Map<String, String> headerParams) {
+  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams) {
     String str = (username == null ? "" : username) + ":" + (password == null ? "" : password);
     try {
       headerParams.put("Authorization", "Basic " + DatatypeConverter.printBase64Binary(str.getBytes("UTF-8")));
diff --git a/modules/swagger-codegen/src/main/resources/Java/auth/OAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/OAuth.mustache
index ef84b8cc05e..a1f1b6a827c 100644
--- a/modules/swagger-codegen/src/main/resources/Java/auth/OAuth.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/auth/OAuth.mustache
@@ -1,10 +1,14 @@
 package {{invokerPackage}}.auth;
 
+import {{invokerPackage}}.Pair;
+
 import java.util.Map;
+import java.util.List;
 
+{{>generatedAnnotation}}
 public class OAuth implements Authentication {
   @Override
-  public void applyToParams(Map<String, String> queryParams, Map<String, String> headerParams) {
+  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams) {
     // TODO: support oauth
   }
 }
diff --git a/modules/swagger-codegen/src/main/resources/Java/enumClass.mustache b/modules/swagger-codegen/src/main/resources/Java/enumClass.mustache
new file mode 100644
index 00000000000..68fc07aae7d
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Java/enumClass.mustache
@@ -0,0 +1,14 @@
+public enum {{datatypeWithEnum}} {
+  {{#allowableValues}}{{#enumVars}}{{name}}("{{value}}"){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}}
+
+  private String value;
+
+  {{datatypeWithEnum}}(String value) {
+    this.value = value;
+  }
+
+  @Override
+  public String toString() {
+    return value;
+  }
+}
diff --git a/modules/swagger-codegen/src/main/resources/Java/generatedAnnotation.mustache b/modules/swagger-codegen/src/main/resources/Java/generatedAnnotation.mustache
new file mode 100644
index 00000000000..49110fc1ad9
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Java/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/Java/libraries/jersey2/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/ApiClient.mustache
new file mode 100644
index 00000000000..fb5f6b0d107
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/ApiClient.mustache
@@ -0,0 +1,534 @@
+package {{invokerPackage}};
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Form;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+
+import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.filter.LoggingFilter;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
+import org.glassfish.jersey.media.multipart.FormDataMultiPart;
+import org.glassfish.jersey.media.multipart.MultiPart;
+import org.glassfish.jersey.media.multipart.MultiPartFeature;
+import org.glassfish.jersey.media.multipart.file.FileDataBodyPart;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.TimeZone;
+
+import java.net.URLEncoder;
+
+import java.io.IOException;
+import java.io.File;
+import java.io.UnsupportedEncodingException;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.text.ParseException;
+
+import {{invokerPackage}}.auth.Authentication;
+import {{invokerPackage}}.auth.HttpBasicAuth;
+import {{invokerPackage}}.auth.ApiKeyAuth;
+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 JSON json = new JSON();
+
+  private Map<String, Authentication> authentications;
+
+  private DateFormat dateFormat;
+
+  public ApiClient() {
+    // Use ISO 8601 format for date and datetime.
+    // See https://en.wikipedia.org/wiki/ISO_8601
+    this.dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
+
+    // Use UTC as the default time zone.
+    this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+
+    // Set default User-Agent.
+    setUserAgent("Java-Swagger");
+
+    // Setup authentications (key: authentication name, value: authentication).
+    authentications = new HashMap<String, Authentication>();{{#authMethods}}{{#isBasic}}
+    authentications.put("{{name}}", new HttpBasicAuth());{{/isBasic}}{{#isApiKey}}
+    authentications.put("{{name}}", new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{^isKeyInHeader}}"query"{{/isKeyInHeader}}, "{{keyParamName}}"));{{/isApiKey}}{{#isOAuth}}
+    authentications.put("{{name}}", new OAuth());{{/isOAuth}}{{/authMethods}}
+    // Prevent the authentications from being modified.
+    authentications = Collections.unmodifiableMap(authentications);
+  }
+
+  public String getBasePath() {
+    return basePath;
+  }
+
+  public ApiClient setBasePath(String basePath) {
+    this.basePath = basePath;
+    return this;
+  }
+
+  /**
+   * Get authentications (key: authentication name, value: authentication).
+   */
+  public Map<String, Authentication> getAuthentications() {
+    return authentications;
+  }
+
+  /**
+   * Get authentication for the given name.
+   *
+   * @param authName The authentication name
+   * @return The authentication, null if not found
+   */
+  public Authentication getAuthentication(String authName) {
+    return authentications.get(authName);
+  }
+
+  /**
+   * Helper method to set username for the first HTTP basic authentication.
+   */
+  public void setUsername(String username) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof HttpBasicAuth) {
+        ((HttpBasicAuth) auth).setUsername(username);
+        return;
+      }
+    }
+    throw new RuntimeException("No HTTP basic authentication configured!");
+  }
+
+  /**
+   * Helper method to set password for the first HTTP basic authentication.
+   */
+  public void setPassword(String password) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof HttpBasicAuth) {
+        ((HttpBasicAuth) auth).setPassword(password);
+        return;
+      }
+    }
+    throw new RuntimeException("No HTTP basic authentication configured!");
+  }
+
+  /**
+   * Helper method to set API key value for the first API key authentication.
+   */
+  public void setApiKey(String apiKey) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof ApiKeyAuth) {
+        ((ApiKeyAuth) auth).setApiKey(apiKey);
+        return;
+      }
+    }
+    throw new RuntimeException("No API key authentication configured!");
+  }
+
+  /**
+   * Helper method to set API key prefix for the first API key authentication.
+   */
+  public void setApiKeyPrefix(String apiKeyPrefix) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof ApiKeyAuth) {
+        ((ApiKeyAuth) auth).setApiKeyPrefix(apiKeyPrefix);
+        return;
+      }
+    }
+    throw new RuntimeException("No API key authentication configured!");
+  }
+
+  /**
+   * Set the User-Agent header's value (by adding to the default header map).
+   */
+  public ApiClient setUserAgent(String userAgent) {
+    addDefaultHeader("User-Agent", userAgent);
+    return this;
+  }
+
+  /**
+   * Add a default header.
+   *
+   * @param key The header's key
+   * @param value The header's value
+   */
+  public ApiClient addDefaultHeader(String key, String value) {
+    defaultHeaderMap.put(key, value);
+    return this;
+  }
+
+  /**
+   * Check that whether debugging is enabled for this API client.
+   */
+  public boolean isDebugging() {
+    return debugging;
+  }
+
+  /**
+   * Enable/disable debugging for this API client.
+   *
+   * @param debugging To enable (true) or disable (false) debugging
+   */
+  public ApiClient setDebugging(boolean debugging) {
+    this.debugging = debugging;
+    return this;
+  }
+
+  /**
+   * Get the date format used to parse/format date parameters.
+   */
+  public DateFormat getDateFormat() {
+    return dateFormat;
+  }
+
+  /**
+   * Set the date format used to parse/format date parameters.
+   */
+  public ApiClient getDateFormat(DateFormat dateFormat) {
+    this.dateFormat = dateFormat;
+    return this;
+  }
+
+  /**
+   * Parse the given string into Date object.
+   */
+  public Date parseDate(String str) {
+    try {
+      return dateFormat.parse(str);
+    } catch (java.text.ParseException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  /**
+   * Format the given Date object into string.
+   */
+  public String formatDate(Date date) {
+    return dateFormat.format(date);
+  }
+
+  /**
+   * Format the given parameter object into string.
+   */
+  public String parameterToString(Object param) {
+    if (param == null) {
+      return "";
+    } else if (param instanceof Date) {
+      return formatDate((Date) param);
+    } else if (param instanceof Collection) {
+      StringBuilder b = new StringBuilder();
+      for(Object o : (Collection)param) {
+        if(b.length() > 0) {
+          b.append(",");
+        }
+        b.append(String.valueOf(o));
+      }
+      return b.toString();
+    } else {
+      return String.valueOf(param);
+    }
+  }
+
+  /*
+    Format to {@code Pair} objects.
+  */
+  public List<Pair> parameterToPairs(String collectionFormat, String name, Object value){
+    List<Pair> params = new ArrayList<Pair>();
+
+    // preconditions
+    if (name == null || name.isEmpty() || value == null) return params;
+
+    Collection valueCollection = null;
+    if (value instanceof Collection) {
+      valueCollection = (Collection) value;
+    } else {
+      params.add(new Pair(name, parameterToString(value)));
+      return params;
+    }
+
+    if (valueCollection.isEmpty()){
+      return params;
+    }
+
+    // get the collection format
+    collectionFormat = (collectionFormat == null || collectionFormat.isEmpty() ? "csv" : collectionFormat); // default: csv
+
+    // create the params based on the collection format
+    if (collectionFormat.equals("multi")) {
+      for (Object item : valueCollection) {
+        params.add(new Pair(name, parameterToString(item)));
+      }
+
+      return params;
+    }
+
+    String delimiter = ",";
+
+    if (collectionFormat.equals("csv")) {
+      delimiter = ",";
+    } else if (collectionFormat.equals("ssv")) {
+      delimiter = " ";
+    } else if (collectionFormat.equals("tsv")) {
+      delimiter = "\t";
+    } else if (collectionFormat.equals("pipes")) {
+      delimiter = "|";
+    }
+
+    StringBuilder sb = new StringBuilder() ;
+    for (Object item : valueCollection) {
+      sb.append(delimiter);
+      sb.append(parameterToString(item));
+    }
+
+    params.add(new Pair(name, sb.substring(1)));
+
+    return params;
+  }
+
+  /**
+   * Select the Accept header's value from the given accepts array:
+   *   if JSON exists in the given array, use it;
+   *   otherwise use all of them (joining into a string)
+   *
+   * @param accepts The accepts array to select from
+   * @return The Accept header to use. If the given array is empty,
+   *   null will be returned (not to set the Accept header explicitly).
+   */
+  public String selectHeaderAccept(String[] accepts) {
+    if (accepts.length == 0) return null;
+    if (StringUtil.containsIgnoreCase(accepts, "application/json")) return "application/json";
+    return StringUtil.join(accepts, ",");
+  }
+
+  /**
+   * Select the Content-Type header's value from the given array:
+   *   if JSON exists in the given array, use it;
+   *   otherwise use the first one of the array.
+   *
+   * @param contentTypes The Content-Type array to select from
+   * @return The Content-Type header to use. If the given array is empty,
+   *   JSON will be used.
+   */
+  public String selectHeaderContentType(String[] contentTypes) {
+    if (contentTypes.length == 0) return "application/json";
+    if (StringUtil.containsIgnoreCase(contentTypes, "application/json")) return "application/json";
+    return contentTypes[0];
+  }
+
+  /**
+   * Escape the given string to be used as URL query value.
+   */
+  public String escapeString(String str) {
+    try {
+      return URLEncoder.encode(str, "utf8").replaceAll("\\+", "%20");
+    } catch (UnsupportedEncodingException e) {
+      return str;
+    }
+  }
+
+  /**
+   * Serialize the given Java object into string entity according the given
+   * Content-Type (only JSON is supported for now).
+   */
+  public Entity<String> serialize(Object obj, String contentType) throws ApiException {
+    if (contentType.startsWith("application/json")) {
+      return Entity.json(json.serialize(obj));
+    } else {
+      throw new ApiException(400, "can not serialize object into Content-Type: " + contentType);
+    }
+  }
+
+  /**
+   * Deserialize response body to Java object according to the Content-Type.
+   */
+  public <T> T deserialize(Response response, TypeRef returnType) throws ApiException {
+    String contentType = null;
+    List<Object> contentTypes = response.getHeaders().get("Content-Type");
+    if (contentTypes != null && !contentTypes.isEmpty())
+      contentType = String.valueOf(contentTypes.get(0));
+    if (contentType == null)
+      throw new ApiException(500, "missing Content-Type in response");
+
+    String body;
+    if (response.hasEntity())
+      body = (String) response.readEntity(String.class);
+    else
+      body = "";
+
+    if (contentType.startsWith("application/json")) {
+      return json.deserialize(body, returnType);
+    } else {
+      throw new ApiException(500, "can not deserialize Content-Type: " + contentType);
+    }
+  }
+
+  /**
+   * Invoke API by sending HTTP request with the given options.
+   *
+   * @param path The sub-path of the HTTP URL
+   * @param method The request method, one of "GET", "POST", "PUT", and "DELETE"
+   * @param queryParams The query parameters
+   * @param body The request body object
+   * @param headerParams The header parameters
+   * @param formParams The form parameters
+   * @param accept The request's Accept header
+   * @param contentType The request's Content-Type header
+   * @param authNames The authentications to apply
+   * @param returnType The return type into which to deserialize the response
+   * @return The response body in type of string
+   */
+  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, TypeRef returnType) throws ApiException {
+    updateParamsForAuth(authNames, queryParams, headerParams);
+
+    final ClientConfig clientConfig = new ClientConfig();
+    clientConfig.register(MultiPartFeature.class);
+    if (debugging) {
+      clientConfig.register(LoggingFilter.class);
+    }
+    Client client = ClientBuilder.newClient(clientConfig);
+
+    WebTarget target = client.target(this.basePath).path(path);
+
+    if (queryParams != null) {
+      for (Pair queryParam : queryParams) {
+        if (queryParam.getValue() != null) {
+          target = target.queryParam(queryParam.getName(), queryParam.getValue());
+        }
+      }
+    }
+
+    Invocation.Builder invocationBuilder = target.request(contentType).accept(accept);
+
+    for (String key : headerParams.keySet()) {
+      String value = headerParams.get(key);
+      if (value != null) {
+        invocationBuilder = invocationBuilder.header(key, value);
+      }
+    }
+
+    for (String key : defaultHeaderMap.keySet()) {
+      if (!headerParams.containsKey(key)) {
+        String value = defaultHeaderMap.get(key);
+        if (value != null) {
+          invocationBuilder = invocationBuilder.header(key, value);
+        }
+      }
+    }
+
+    Entity<?> formEntity = null;
+
+    if (contentType.startsWith("multipart/form-data")) {
+      MultiPart multipart = new MultiPart();
+      for (Entry<String, Object> param: formParams.entrySet()) {
+        if (param.getValue() instanceof File) {
+          File file = (File) param.getValue();
+
+          FormDataMultiPart mp = new FormDataMultiPart();
+          mp.bodyPart(new FormDataBodyPart(param.getKey(), file.getName()));
+          multipart.bodyPart(mp, MediaType.MULTIPART_FORM_DATA_TYPE);
+
+          multipart.bodyPart(new FileDataBodyPart(param.getKey(), file, MediaType.APPLICATION_OCTET_STREAM_TYPE));
+        } else {
+          FormDataMultiPart mp = new FormDataMultiPart();
+          mp.bodyPart(new FormDataBodyPart(param.getKey(), parameterToString(param.getValue())));
+          multipart.bodyPart(mp, MediaType.MULTIPART_FORM_DATA_TYPE);
+        }
+      }
+      formEntity = Entity.entity(multipart, MediaType.MULTIPART_FORM_DATA_TYPE);
+    } else if (contentType.startsWith("application/x-www-form-urlencoded")) {
+      Form form = new Form();
+      for (Entry<String, Object> param: formParams.entrySet()) {
+        form.param(param.getKey(), parameterToString(param.getValue()));
+      }
+      formEntity = Entity.entity(form, MediaType.APPLICATION_FORM_URLENCODED_TYPE);
+    }
+
+    Response response = null;
+
+    if ("GET".equals(method)) {
+      response = invocationBuilder.get();
+    } else if ("POST".equals(method)) {
+      if (formEntity != null) {
+        response = invocationBuilder.post(formEntity);
+      } else if (body == null) {
+        response = invocationBuilder.post(null);
+      } else {
+        response = invocationBuilder.post(serialize(body, contentType));
+      }
+    } else if ("PUT".equals(method)) {
+      if (formEntity != null) {
+        response = invocationBuilder.put(formEntity);
+      } else if (body == null) {
+        response = invocationBuilder.put(null);
+      } else {
+        response = invocationBuilder.put(serialize(body, contentType));
+      }
+    } else if ("DELETE".equals(method)) {
+      response = invocationBuilder.delete();
+    } else {
+      throw new ApiException(500, "unknown method type " + method);
+    }
+
+    if (response.getStatus() == Status.NO_CONTENT.getStatusCode()) {
+      return null;
+    } else if (response.getStatusInfo().getFamily().equals(Status.Family.SUCCESSFUL)) {
+      if (returnType == null)
+        return null;
+      else
+        return deserialize(response, returnType);
+    } else {
+      String message = "error";
+      String respBody = null;
+      if (response.hasEntity()) {
+        try {
+          respBody = String.valueOf(response.readEntity(String.class));
+          message = respBody;
+        } catch (RuntimeException e) {
+          // e.printStackTrace();
+        }
+      }
+      Map<String, List<String>> responseHeaders = new HashMap<String, List<String>>();
+      for (String key: response.getHeaders().keySet()) {
+        List<Object> values = response.getHeaders().get(key);
+        List<String> headers = new ArrayList<String>();
+        for (Object o : values) {
+          headers.add(String.valueOf(o));
+        }
+        responseHeaders.put(key, headers);
+      }
+      throw new ApiException(
+        response.getStatus(),
+        message,
+        responseHeaders,
+        respBody);
+    }
+  }
+
+  /**
+   * Update query and header parameters based on authentication settings.
+   *
+   * @param authNames The authentications to apply
+   */
+  private void updateParamsForAuth(String[] authNames, List<Pair> queryParams, Map<String, String> headerParams) {
+    for (String authName : authNames) {
+      Authentication auth = authentications.get(authName);
+      if (auth == null) throw new RuntimeException("Authentication undefined: " + authName);
+      auth.applyToParams(queryParams, headerParams);
+    }
+  }
+}
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
new file mode 100644
index 00000000000..e2d0f73d408
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache
@@ -0,0 +1,171 @@
+<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>
+  <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.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>io.swagger</groupId>
+      <artifactId>swagger-annotations</artifactId>
+      <version>${swagger-annotations-version}</version>
+    </dependency>
+
+    <!-- HTTP client: jersey-client -->
+    <dependency>
+      <groupId>org.glassfish.jersey.core</groupId>
+      <artifactId>jersey-client</artifactId>
+      <version>${jersey-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.media</groupId>
+      <artifactId>jersey-media-multipart</artifactId>
+      <version>${jersey-version}</version>
+    </dependency>
+
+    <!-- JSON processing: jackson -->
+    <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</swagger-annotations-version>
+    <jersey-version>2.6</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>
+  </properties>
+</project>
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiCallback.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiCallback.mustache
new file mode 100644
index 00000000000..4af16c9faa9
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiCallback.mustache
@@ -0,0 +1,22 @@
+package {{invokerPackage}};
+
+import java.io.IOException;
+
+/**
+ * Callback for asynchronous API call.
+ *
+ * @param <T> The return type
+ */
+public interface ApiCallback<T> {
+  /**
+   * This is called when the API call fails.
+   */
+  void onFailure(ApiException e);
+
+  /**
+   * This is called when the API call succeeded.
+   *
+   * @param result The result deserialized from response
+   */
+  void onSuccess(T result);
+}
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
new file mode 100644
index 00000000000..069aa273b14
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache
@@ -0,0 +1,762 @@
+package {{invokerPackage}};
+
+import com.squareup.okhttp.Call;
+import com.squareup.okhttp.Callback;
+import com.squareup.okhttp.OkHttpClient;
+import com.squareup.okhttp.Request;
+import com.squareup.okhttp.Response;
+import com.squareup.okhttp.RequestBody;
+import com.squareup.okhttp.FormEncodingBuilder;
+import com.squareup.okhttp.MultipartBuilder;
+import com.squareup.okhttp.MediaType;
+import com.squareup.okhttp.Headers;
+
+import java.lang.reflect.Type;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.TimeZone;
+import java.util.regex.Pattern;
+
+import java.net.URLEncoder;
+import java.net.URLConnection;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.text.ParseException;
+
+import {{invokerPackage}}.auth.Authentication;
+import {{invokerPackage}}.auth.HttpBasicAuth;
+import {{invokerPackage}}.auth.ApiKeyAuth;
+import {{invokerPackage}}.auth.OAuth;
+
+public class ApiClient {
+  private String basePath = "{{basePath}}";
+  private boolean lenientOnJson = false;
+  private boolean debugging = false;
+  private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
+
+  private Map<String, Authentication> authentications;
+
+  private String dateFormat;
+  private DateFormat dateFormatter;
+  private int dateLength;
+
+  private String datetimeFormat;
+  private DateFormat datetimeFormatter;
+
+  private OkHttpClient httpClient;
+  private JSON json;
+
+  public ApiClient() {
+    httpClient = new OkHttpClient();
+
+    json = new JSON(this);
+
+    // Use ISO 8601 format for date and datetime.
+    // See https://en.wikipedia.org/wiki/ISO_8601
+    setDateFormat("yyyy-MM-dd");
+    setDatetimeFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
+
+    // Set default User-Agent.
+    setUserAgent("Java-Swagger");
+
+    // Setup authentications (key: authentication name, value: authentication).
+    authentications = new HashMap<String, Authentication>();{{#authMethods}}{{#isBasic}}
+    authentications.put("{{name}}", new HttpBasicAuth());{{/isBasic}}{{#isApiKey}}
+    authentications.put("{{name}}", new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{^isKeyInHeader}}"query"{{/isKeyInHeader}}, "{{keyParamName}}"));{{/isApiKey}}{{#isOAuth}}
+    authentications.put("{{name}}", new OAuth());{{/isOAuth}}{{/authMethods}}
+    // Prevent the authentications from being modified.
+    authentications = Collections.unmodifiableMap(authentications);
+  }
+
+  public String getBasePath() {
+    return basePath;
+  }
+
+  public ApiClient setBasePath(String basePath) {
+    this.basePath = basePath;
+    return this;
+  }
+
+  public OkHttpClient getHttpClient() {
+    return httpClient;
+  }
+
+  public ApiClient setHttpClient(OkHttpClient httpClient) {
+    this.httpClient = httpClient;
+    return this;
+  }
+
+  public JSON getJSON() {
+    return json;
+  }
+
+  public ApiClient setJSON(JSON json) {
+    this.json = json;
+    return this;
+  }
+
+  public String getDateFormat() {
+    return dateFormat;
+  }
+
+  public ApiClient setDateFormat(String dateFormat) {
+    this.dateFormat = dateFormat;
+
+    this.dateFormatter = new SimpleDateFormat(dateFormat);
+    // Use UTC as the default time zone.
+    this.dateFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
+
+    this.dateLength = this.dateFormatter.format(new Date()).length();
+
+    return this;
+  }
+
+  public String getDatetimeFormat() {
+    return datetimeFormat;
+  }
+
+  public ApiClient setDatetimeFormat(String datetimeFormat) {
+    this.datetimeFormat = datetimeFormat;
+
+    this.datetimeFormatter = new SimpleDateFormat(datetimeFormat);
+    // Note: The datetime formatter uses the system's default time zone.
+
+    return this;
+  }
+
+  /**
+   * Parse the given date string into Date object.
+   * The default <code>dateFormat</code> supports these ISO 8601 date formats:
+   *   2015-08-16
+   *   2015-8-16
+   */
+  public Date parseDate(String str) {
+    if (str == null)
+      return null;
+    try {
+      return dateFormatter.parse(str);
+    } catch (ParseException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  /**
+   * Parse the given date-time string into Date object.
+   * The default <code>datetimeFormat</code> supports these ISO 8601 datetime formats:
+   *   2015-08-16T08:20:05Z
+   *   2015-8-16T8:20:05Z
+   *   2015-08-16T08:20:05+00:00
+   *   2015-08-16T08:20:05+0000
+   *   2015-08-16T08:20:05.376Z
+   *   2015-08-16T08:20:05.376+00:00
+   *   2015-08-16T08:20:05.376+00
+   * Note: The 3-digit milli-seconds is optional. Time zone is required and can be in one of
+   *   these formats:
+   *   Z (same with +0000)
+   *   +08:00 (same with +0800)
+   *   -02 (same with -0200)
+   *   -0200
+   * @see https://en.wikipedia.org/wiki/ISO_8601
+   */
+  public Date parseDatetime(String str) {
+    if (str == null)
+      return null;
+
+    if ("yyyy-MM-dd'T'HH:mm:ss.SSSZ".equals(datetimeFormat)) {
+      /*
+       * When the default datetime format is used, process the given string
+       * to support various formats defined by ISO 8601.
+       */
+      // normalize time zone
+      //   trailing "Z": 2015-08-16T08:20:05Z => 2015-08-16T08:20:05+0000
+      str = str.replaceAll("[zZ]\\z", "+0000");
+      //   remove colon: 2015-08-16T08:20:05+00:00 => 2015-08-16T08:20:05+0000
+      str = str.replaceAll("([+-]\\d{2}):(\\d{2})\\z", "$1$2");
+      //   expand time zone: 2015-08-16T08:20:05+00 => 2015-08-16T08:20:05+0000
+      str = str.replaceAll("([+-]\\d{2})\\z", "$100");
+      // add milliseconds when missing
+      //   2015-08-16T08:20:05+0000 => 2015-08-16T08:20:05.000+0000
+      str = str.replaceAll("(:\\d{1,2})([+-]\\d{4})\\z", "$1.000$2");
+    }
+
+    try {
+      return datetimeFormatter.parse(str);
+    } catch (ParseException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  public Date parseDateOrDatetime(String str) {
+    if (str == null)
+      return null;
+    else if (str.length() <= dateLength)
+      return parseDate(str);
+    else
+      return parseDatetime(str);
+  }
+
+  /**
+   * Format the given Date object into string.
+   */
+  public String formatDate(Date date) {
+    return dateFormatter.format(date);
+  }
+
+  /**
+   * Format the given Date object into string.
+   */
+  public String formatDatetime(Date date) {
+    return datetimeFormatter.format(date);
+  }
+
+  /**
+   * Get authentications (key: authentication name, value: authentication).
+   */
+  public Map<String, Authentication> getAuthentications() {
+    return authentications;
+  }
+
+  /**
+   * Get authentication for the given name.
+   *
+   * @param authName The authentication name
+   * @return The authentication, null if not found
+   */
+  public Authentication getAuthentication(String authName) {
+    return authentications.get(authName);
+  }
+
+  /**
+   * Helper method to set username for the first HTTP basic authentication.
+   */
+  public void setUsername(String username) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof HttpBasicAuth) {
+        ((HttpBasicAuth) auth).setUsername(username);
+        return;
+      }
+    }
+    throw new RuntimeException("No HTTP basic authentication configured!");
+  }
+
+  /**
+   * Helper method to set password for the first HTTP basic authentication.
+   */
+  public void setPassword(String password) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof HttpBasicAuth) {
+        ((HttpBasicAuth) auth).setPassword(password);
+        return;
+      }
+    }
+    throw new RuntimeException("No HTTP basic authentication configured!");
+  }
+
+  /**
+   * Helper method to set API key value for the first API key authentication.
+   */
+  public void setApiKey(String apiKey) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof ApiKeyAuth) {
+        ((ApiKeyAuth) auth).setApiKey(apiKey);
+        return;
+      }
+    }
+    throw new RuntimeException("No API key authentication configured!");
+  }
+
+  /**
+   * Helper method to set API key prefix for the first API key authentication.
+   */
+  public void setApiKeyPrefix(String apiKeyPrefix) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof ApiKeyAuth) {
+        ((ApiKeyAuth) auth).setApiKeyPrefix(apiKeyPrefix);
+        return;
+      }
+    }
+    throw new RuntimeException("No API key authentication configured!");
+  }
+
+  /**
+   * Set the User-Agent header's value (by adding to the default header map).
+   */
+  public ApiClient setUserAgent(String userAgent) {
+    addDefaultHeader("User-Agent", userAgent);
+    return this;
+  }
+
+  /**
+   * Add a default header.
+   *
+   * @param key The header's key
+   * @param value The header's value
+   */
+  public ApiClient addDefaultHeader(String key, String value) {
+    defaultHeaderMap.put(key, value);
+    return this;
+  }
+
+  /**
+   * @see https://google-gson.googlecode.com/svn/trunk/gson/docs/javadocs/com/google/gson/stream/JsonReader.html#setLenient(boolean)
+   */
+  public boolean isLenientOnJson() {
+    return lenientOnJson;
+  }
+
+  public ApiClient setLenientOnJson(boolean lenient) {
+    this.lenientOnJson = lenient;
+    return this;
+  }
+
+  /**
+   * Check that whether debugging is enabled for this API client.
+   */
+  public boolean isDebugging() {
+    return debugging;
+  }
+
+  /**
+   * Enable/disable debugging for this API client.
+   *
+   * @param debugging To enable (true) or disable (false) debugging
+   */
+  public ApiClient setDebugging(boolean debugging) {
+    this.debugging = debugging;
+    return this;
+  }
+
+  /**
+   * Format the given parameter object into string.
+   */
+  public String parameterToString(Object param) {
+    if (param == null) {
+      return "";
+    } else if (param instanceof Date) {
+      return formatDatetime((Date) param);
+    } else if (param instanceof Collection) {
+      StringBuilder b = new StringBuilder();
+      for (Object o : (Collection)param) {
+        if (b.length() > 0) {
+          b.append(",");
+        }
+        b.append(String.valueOf(o));
+      }
+      return b.toString();
+    } else {
+      return String.valueOf(param);
+    }
+  }
+
+  /*
+    Format to {@code Pair} objects.
+  */
+  public List<Pair> parameterToPairs(String collectionFormat, String name, Object value){
+    List<Pair> params = new ArrayList<Pair>();
+
+    // preconditions
+    if (name == null || name.isEmpty() || value == null) return params;
+
+    Collection valueCollection = null;
+    if (value instanceof Collection) {
+      valueCollection = (Collection) value;
+    } else {
+      params.add(new Pair(name, parameterToString(value)));
+      return params;
+    }
+
+    if (valueCollection.isEmpty()){
+      return params;
+    }
+
+    // get the collection format
+    collectionFormat = (collectionFormat == null || collectionFormat.isEmpty() ? "csv" : collectionFormat); // default: csv
+
+    // create the params based on the collection format
+    if (collectionFormat.equals("multi")) {
+      for (Object item : valueCollection) {
+        params.add(new Pair(name, parameterToString(item)));
+      }
+
+      return params;
+    }
+
+    String delimiter = ",";
+
+    if (collectionFormat.equals("csv")) {
+      delimiter = ",";
+    } else if (collectionFormat.equals("ssv")) {
+      delimiter = " ";
+    } else if (collectionFormat.equals("tsv")) {
+      delimiter = "\t";
+    } else if (collectionFormat.equals("pipes")) {
+      delimiter = "|";
+    }
+
+    StringBuilder sb = new StringBuilder() ;
+    for (Object item : valueCollection) {
+      sb.append(delimiter);
+      sb.append(parameterToString(item));
+    }
+
+    params.add(new Pair(name, sb.substring(1)));
+
+    return params;
+  }
+
+  /**
+   * Select the Accept header's value from the given accepts array:
+   *   if JSON exists in the given array, use it;
+   *   otherwise use all of them (joining into a string)
+   *
+   * @param accepts The accepts array to select from
+   * @return The Accept header to use. If the given array is empty,
+   *   null will be returned (not to set the Accept header explicitly).
+   */
+  public String selectHeaderAccept(String[] accepts) {
+    if (accepts.length == 0) return null;
+    if (StringUtil.containsIgnoreCase(accepts, "application/json")) return "application/json";
+    return StringUtil.join(accepts, ",");
+  }
+
+  /**
+   * Select the Content-Type header's value from the given array:
+   *   if JSON exists in the given array, use it;
+   *   otherwise use the first one of the array.
+   *
+   * @param contentTypes The Content-Type array to select from
+   * @return The Content-Type header to use. If the given array is empty,
+   *   JSON will be used.
+   */
+  public String selectHeaderContentType(String[] contentTypes) {
+    if (contentTypes.length == 0) return "application/json";
+    if (StringUtil.containsIgnoreCase(contentTypes, "application/json")) return "application/json";
+    return contentTypes[0];
+  }
+
+  /**
+   * Escape the given string to be used as URL query value.
+   */
+  public String escapeString(String str) {
+    try {
+      return URLEncoder.encode(str, "utf8").replaceAll("\\+", "%20");
+    } catch (UnsupportedEncodingException e) {
+      return str;
+    }
+  }
+
+  /**
+   * Deserialize response body to Java object, according the Content-Type
+   * response header.
+   *
+   * @param response HTTP response
+   * @param returnType The type of the Java object
+   * @return The deserialized Java object
+   */
+  public <T> T deserialize(Response response, Type returnType) throws ApiException {
+    if (response == null || returnType == null)
+      return null;
+
+    String respBody;
+    try {
+      if (response.body() != null)
+        respBody = response.body().string();
+      else
+        respBody = null;
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+
+    if (respBody == null || "".equals(respBody))
+      return null;
+
+    String contentType = response.headers().get("Content-Type");
+    if (contentType == null) {
+      // ensuring a default content type
+      contentType = "application/json";
+    }
+    if (contentType.startsWith("application/json")) {
+      return json.deserialize(respBody, returnType);
+    } else {
+      throw new ApiException(
+        "Content type \"" + contentType + "\" is not supported",
+        response.code(),
+        response.headers().toMultimap(),
+        respBody);
+    }
+  }
+
+  /**
+   * Serialize the given Java object into request body string, according to the
+   * request Content-Type.
+   *
+   * @param obj The Java object
+   * @param contentType The request Content-Type
+   * @return The serialized string
+   */
+  public String serialize(Object obj, String contentType) throws ApiException {
+    if (contentType.startsWith("application/json")) {
+      if (obj != null)
+        return json.serialize(obj);
+      else
+        return null;
+    } else {
+      throw new ApiException("Content type \"" + contentType + "\" is not supported");
+    }
+  }
+
+  /**
+   * @see #execute(Call, Type)
+   */
+  public <T> T execute(Call call) throws ApiException {
+    return execute(call, null);
+  }
+
+  /**
+   * Execute HTTP call and deserialize the HTTP response body into the given return type.
+   *
+   * @param returnType The return type used to deserialize HTTP response body
+   * @param <T> The return type corresponding to (same with) returnType
+   * @return The Java object deserialized from response body. Returns null if returnType is null.
+   */
+  public <T> T execute(Call call, Type returnType) throws ApiException {
+    try {
+      Response response = call.execute();
+      return handleResponse(response, returnType);
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+  }
+
+  /**
+   * #see executeAsync(Call, Type, ApiCallback)
+   */
+  public <T> void executeAsync(Call call, ApiCallback<T> callback) throws ApiException {
+    executeAsync(call, null, callback);
+  }
+
+  /**
+   * Execute HTTP call asynchronously.
+   *
+   * @see #execute(Call, Type)
+   * @param The callback to be executed when the API call finishes
+   */
+  public <T> void executeAsync(Call call, final Type returnType, final ApiCallback<T> callback) {
+    call.enqueue(new Callback() {
+      @Override
+      public void onFailure(Request request, IOException e) {
+        callback.onFailure(new ApiException(e));
+      }
+
+      @Override
+      public void onResponse(Response response) throws IOException {
+        T result;
+        try {
+          result = (T) handleResponse(response, returnType);
+        } catch (ApiException e) {
+          callback.onFailure(e);
+          return;
+        }
+        callback.onSuccess(result);
+      }
+    });
+  }
+
+  public <T> T handleResponse(Response response, Type returnType) throws ApiException {
+    if (response.isSuccessful()) {
+      if (returnType == null || response.code() == 204) {
+        // returning null if the returnType is not defined,
+        // or the status code is 204 (No Content)
+        return null;
+      } else {
+        return deserialize(response, returnType);
+      }
+    } else {
+      String respBody = null;
+      if (response.body() != null) {
+        try {
+          respBody = response.body().string();
+        } catch (IOException e) {
+          throw new ApiException(response.message(), e, response.code(), response.headers().toMultimap());
+        }
+      }
+      throw new ApiException(response.message(), response.code(), response.headers().toMultimap(), respBody);
+    }
+  }
+
+  /**
+   * Build HTTP call with the given options.
+   *
+   * @param path The sub-path of the HTTP URL
+   * @param method The request method, one of "GET", "HEAD", "POST", "PUT", "PATCH" and "DELETE"
+   * @param queryParams The query parameters
+   * @param body The request body object
+   * @param headerParams The header parameters
+   * @param formParams The form parameters
+   * @param authNames The authentications to apply
+   * @return The HTTP call
+   */
+  public Call buildCall(String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, Object> formParams, String[] authNames) throws ApiException {
+    updateParamsForAuth(authNames, queryParams, headerParams);
+
+    final String url = buildUrl(path, queryParams);
+    final Request.Builder reqBuilder = new Request.Builder().url(url);
+    processHeaderParams(headerParams, reqBuilder);
+
+    String contentType = (String) headerParams.get("Content-Type");
+    // ensuring a default content type
+    if (contentType == null) contentType = "application/json";
+
+    RequestBody reqBody;
+    if ("GET".equals(method) || "HEAD".equals(method)) {
+      reqBody = null;
+    } else if ("application/x-www-form-urlencoded".equals(contentType)) {
+      reqBody = buildRequestBodyFormEncoding(formParams);
+    } else if ("multipart/form-data".equals(contentType)) {
+      reqBody = buildRequestBodyMultipart(formParams);
+    } else if (body == null) {
+      if ("DELETE".equals(method)) {
+        // allow calling DELETE without sending a request body
+        reqBody = null;
+      } else {
+        // use an empty request body (for POST, PUT and PATCH)
+        reqBody = RequestBody.create(MediaType.parse(contentType), "");
+      }
+    } else {
+      reqBody = RequestBody.create(MediaType.parse(contentType), serialize(body, contentType));
+    }
+
+    Request request;
+    if ("GET".equals(method)) {
+      request = reqBuilder.get().build();
+    } else if ("HEAD".equals(method)) {
+      request = reqBuilder.head().build();
+    } else if ("POST".equals(method)) {
+      request = reqBuilder.post(reqBody).build();
+    } else if ("PUT".equals(method)) {
+      request = reqBuilder.put(reqBody).build();
+    } else if ("PATCH".equals(method)) {
+      request = reqBuilder.patch(reqBody).build();
+    } else if ("DELETE".equals(method)) {
+      if (reqBody == null) {
+        // calling DELETE without sending a request body
+        request = reqBuilder.delete().build();
+      } else {
+        request = reqBuilder.delete(reqBody).build();
+      }
+    } else {
+      throw new ApiException("unknown method type: " + method);
+    }
+
+    return httpClient.newCall(request);
+  }
+
+  /**
+   * 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
+   */
+  public String buildUrl(String path, List<Pair> queryParams) {
+    StringBuilder query = new StringBuilder();
+    if (queryParams != null) {
+      for (Pair param : queryParams) {
+        if (param.getValue() != null) {
+          if (query.toString().length() == 0)
+            query.append("?");
+          else
+            query.append("&");
+          String value = parameterToString(param.getValue());
+          query.append(escapeString(param.getName())).append("=").append(escapeString(value));
+        }
+      }
+    }
+    return basePath + path + query.toString();
+  }
+
+  /**
+   * Set header parameters to the request builder, including default headers.
+   */
+  public void processHeaderParams(Map<String, String> headerParams, Request.Builder reqBuilder) {
+    for (Entry<String, String> param : headerParams.entrySet()) {
+      reqBuilder.header(param.getKey(), parameterToString(param.getValue()));
+    }
+    for (Entry<String, String> header : defaultHeaderMap.entrySet()) {
+      if (!headerParams.containsKey(header.getKey())) {
+        reqBuilder.header(header.getKey(), parameterToString(header.getValue()));
+      }
+    }
+  }
+
+  /**
+   * Update query and header parameters based on authentication settings.
+   *
+   * @param authNames The authentications to apply
+   */
+  public void updateParamsForAuth(String[] authNames, List<Pair> queryParams, Map<String, String> headerParams) {
+    for (String authName : authNames) {
+      Authentication auth = authentications.get(authName);
+      if (auth == null) throw new RuntimeException("Authentication undefined: " + authName);
+      auth.applyToParams(queryParams, headerParams);
+    }
+  }
+
+  /**
+   * Build a form-encoding request body with the given form parameters.
+   */
+  public RequestBody buildRequestBodyFormEncoding(Map<String, Object> formParams) {
+    FormEncodingBuilder formBuilder  = new FormEncodingBuilder();
+    for (Entry<String, Object> param : formParams.entrySet()) {
+      formBuilder.add(param.getKey(), parameterToString(param.getValue()));
+    }
+    return formBuilder.build();
+  }
+
+  /**
+   * Build a multipart (file uploading) request body with the given form parameters,
+   * which could contain text fields and file fields.
+   */
+  public RequestBody buildRequestBodyMultipart(Map<String, Object> formParams) {
+    MultipartBuilder mpBuilder = new MultipartBuilder().type(MultipartBuilder.FORM);
+    for (Entry<String, Object> param : formParams.entrySet()) {
+      if (param.getValue() instanceof File) {
+        File file = (File) param.getValue();
+        Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + param.getKey() + "\"; filename=\"" + file.getName() + "\"");
+        MediaType mediaType = MediaType.parse(guessContentTypeFromFile(file));
+        mpBuilder.addPart(partHeaders, RequestBody.create(mediaType, file));
+      } else {
+        Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + param.getKey() + "\"");
+        mpBuilder.addPart(partHeaders, RequestBody.create(null, parameterToString(param.getValue())));
+      }
+    }
+    return mpBuilder.build();
+  }
+
+  /**
+   * Guess Content-Type header from the given file (defaults to "application/octet-stream").
+   *
+   * @param file The given file
+   * @return The Content-Type guessed
+   */
+  public String guessContentTypeFromFile(File file) {
+    String contentType = URLConnection.guessContentTypeFromName(file.getName());
+    if (contentType == null) {
+      return "application/octet-stream";
+    } else {
+      return contentType;
+    }
+  }
+}
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/JSON.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/JSON.mustache
new file mode 100644
index 00000000000..10a43d97de0
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/JSON.mustache
@@ -0,0 +1,102 @@
+package {{invokerPackage}};
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonNull;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import com.google.gson.stream.JsonReader;
+
+import java.io.StringReader;
+import java.lang.reflect.Type;
+import java.util.Date;
+
+public class JSON {
+  private ApiClient apiClient;
+  private Gson gson;
+
+  public JSON(ApiClient apiClient) {
+    this.apiClient = apiClient;
+    gson = new GsonBuilder()
+      .serializeNulls()
+      .registerTypeAdapter(Date.class, new DateAdapter(apiClient))
+      .create();
+	}
+
+  public Gson getGson() {
+    return gson;
+  }
+
+  public void setGson(Gson gson) {
+    this.gson = gson;
+  }
+
+  /**
+   * Serialize the given Java object into JSON string.
+   */
+  public String serialize(Object obj) {
+    return gson.toJson(obj);
+  }
+
+  /**
+   * Deserialize the given JSON string to Java object.
+   *
+   * @param body The JSON string
+   * @param returnType The type to deserialize inot
+   * @return The deserialized Java object
+   */
+  public <T> T deserialize(String body, Type returnType) {
+    try {
+      if (apiClient.isLenientOnJson()) {
+        JsonReader jsonReader = new JsonReader(new StringReader(body));
+        // see https://google-gson.googlecode.com/svn/trunk/gson/docs/javadocs/com/google/gson/stream/JsonReader.html#setLenient(boolean)
+        jsonReader.setLenient(true);
+        return gson.fromJson(jsonReader, returnType);
+      } else {
+        return gson.fromJson(body, returnType);
+      }
+    } catch (JsonParseException e) {
+      // Fallback processing when failed to parse JSON form response body:
+      //   return the response body string directly for the String return type;
+      //   parse response body into date or datetime for the Date return type.
+      if (returnType.equals(String.class))
+        return (T) body;
+      else if (returnType.equals(Date.class))
+        return (T) apiClient.parseDateOrDatetime(body);
+      else throw(e);
+    }
+  }
+}
+
+class DateAdapter implements JsonSerializer<Date>, JsonDeserializer<Date> {
+    private final ApiClient apiClient;
+
+    public DateAdapter(ApiClient apiClient) {
+        super();
+        this.apiClient = apiClient;
+    }
+
+    @Override
+    public JsonElement serialize(Date src, Type typeOfSrc, JsonSerializationContext context) {
+        if (src == null) {
+            return JsonNull.INSTANCE;
+        } else {
+            return new JsonPrimitive(apiClient.formatDatetime(src));
+        }
+    }
+
+    @Override
+    public Date deserialize(JsonElement json, Type date, JsonDeserializationContext context) throws JsonParseException {
+        String str = json.getAsJsonPrimitive().getAsString();
+        try {
+            return apiClient.parseDateOrDatetime(str);
+        } catch (RuntimeException e) {
+            throw new JsonParseException(e);
+        }
+    }
+}
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
new file mode 100644
index 00000000000..b272687c7fd
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache
@@ -0,0 +1,116 @@
+package {{package}};
+
+import {{invokerPackage}}.ApiCallback;
+import {{invokerPackage}}.ApiClient;
+import {{invokerPackage}}.ApiException;
+import {{invokerPackage}}.Configuration;
+import {{invokerPackage}}.Pair;
+
+import {{modelPackage}}.*;
+
+import com.google.gson.reflect.TypeToken;
+
+import com.squareup.okhttp.Call;
+
+import java.lang.reflect.Type;
+
+import java.util.*;
+
+{{#imports}}import {{import}};
+{{/imports}}
+
+import java.io.File;
+import java.util.Map;
+import java.util.HashMap;
+
+{{#operations}}
+public class {{classname}} {
+  private ApiClient {{localVariablePrefix}}apiClient;
+
+  public {{classname}}() {
+    this(Configuration.getDefaultApiClient());
+  }
+
+  public {{classname}}(ApiClient apiClient) {
+    this.{{localVariablePrefix}}apiClient = apiClient;
+  }
+
+  public ApiClient getApiClient() {
+    return {{localVariablePrefix}}apiClient;
+  }
+
+  public void setApiClient(ApiClient apiClient) {
+    this.{{localVariablePrefix}}apiClient = apiClient;
+  }
+
+  {{#operation}}
+  /* Build call for {{nickname}} */
+  private Call {{nickname}}Call({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
+    Object {{localVariablePrefix}}postBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
+    {{#allParams}}{{#required}}
+    // verify the required parameter '{{paramName}}' is set
+    if ({{paramName}} == null) {
+       throw new ApiException("Missing the required parameter '{{paramName}}' when calling {{nickname}}(Async)");
+    }
+    {{/required}}{{/allParams}}
+
+    // create path and map variables
+    String {{localVariablePrefix}}path = "{{path}}".replaceAll("\\{format\\}","json"){{#pathParams}}
+      .replaceAll("\\{" + "{{baseName}}" + "\\}", {{localVariablePrefix}}apiClient.escapeString({{{paramName}}}.toString())){{/pathParams}};
+
+    List<Pair> {{localVariablePrefix}}queryParams = new ArrayList<Pair>();{{#queryParams}}
+    if ({{paramName}} != null)
+      {{localVariablePrefix}}queryParams.addAll({{localVariablePrefix}}apiClient.parameterToPairs("{{#collectionFormat}}{{{collectionFormat}}}{{/collectionFormat}}", "{{baseName}}", {{paramName}}));{{/queryParams}}
+
+    Map<String, String> {{localVariablePrefix}}headerParams = new HashMap<String, String>();{{#headerParams}}
+    if ({{paramName}} != null)
+      {{localVariablePrefix}}headerParams.put("{{baseName}}", {{localVariablePrefix}}apiClient.parameterToString({{paramName}}));{{/headerParams}}
+
+    Map<String, Object> {{localVariablePrefix}}formParams = new HashMap<String, Object>();{{#formParams}}
+    if ({{paramName}} != null)
+      {{localVariablePrefix}}formParams.put("{{baseName}}", {{paramName}});{{/formParams}}
+
+    final String[] {{localVariablePrefix}}accepts = {
+      {{#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}}contentTypes = {
+      {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}}
+    };
+    final String {{localVariablePrefix}}contentType = {{localVariablePrefix}}apiClient.selectHeaderContentType({{localVariablePrefix}}contentTypes);
+    {{localVariablePrefix}}headerParams.put("Content-Type", {{localVariablePrefix}}contentType);
+
+    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);
+  }
+
+  /**
+   * {{summary}}
+   * {{notes}}{{#allParams}}
+   * @param {{paramName}} {{description}}{{/allParams}}{{#returnType}}
+   * @return {{{returnType}}}{{/returnType}}
+   */
+  public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{nickname}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
+    Call {{localVariablePrefix}}call = {{nickname}}Call({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
+    {{#returnType}}Type {{localVariablePrefix}}returnType = new TypeToken<{{{returnType}}}>(){}.getType();
+    return {{localVariablePrefix}}apiClient.execute({{localVariablePrefix}}call, {{localVariablePrefix}}returnType);{{/returnType}}{{^returnType}}{{localVariablePrefix}}apiClient.execute({{localVariablePrefix}}call);{{/returnType}}
+  }
+
+  /**
+   * {{summary}} (asynchronously)
+   * {{notes}}{{#allParams}}
+   * @param {{paramName}} {{description}}{{/allParams}}
+   * @param callback The callback to be executed when the API call finishes
+   * @return The request call
+   */
+  public Call {{nickname}}Async({{#allParams}}{{{dataType}}} {{paramName}}, {{/allParams}}ApiCallback<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{localVariablePrefix}}callback) throws ApiException {
+    Call {{localVariablePrefix}}call = {{nickname}}Call({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
+    {{#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}}
+    return {{localVariablePrefix}}call;
+  }
+  {{/operation}}
+}
+{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/auth/HttpBasicAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/auth/HttpBasicAuth.mustache
new file mode 100644
index 00000000000..5b4070fcafb
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/auth/HttpBasicAuth.mustache
@@ -0,0 +1,41 @@
+package {{invokerPackage}}.auth;
+
+import {{invokerPackage}}.Pair;
+
+import com.migcomponents.migbase64.Base64;
+
+import java.util.Map;
+import java.util.List;
+
+import java.io.UnsupportedEncodingException;
+
+public class HttpBasicAuth implements Authentication {
+  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;
+  }
+
+  @Override
+  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams) {
+    String str = (username == null ? "" : username) + ":" + (password == null ? "" : password);
+    try {
+      headerParams.put("Authorization", "Basic " + Base64.encodeToString(str.getBytes("UTF-8"), false));
+    } catch (UnsupportedEncodingException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
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
new file mode 100644
index 00000000000..1113d8b4ee9
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
@@ -0,0 +1,28 @@
+apply plugin: 'java'
+apply plugin: 'maven'
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compile 'io.swagger:swagger-annotations:1.5.0'
+    compile 'com.squareup.okhttp:okhttp:2.4.0'
+    compile 'com.google.code.gson:gson:2.3.1'
+    compile 'com.brsanthu:migbase64:2.2'
+    testCompile 'junit:junit:4.8.1'
+}
+
+group = '{{groupId}}'
+version = '{{artifactVersion}}'
+
+install {
+    repositories.mavenInstaller {
+        pom.artifactId = '{{artifactId}}'
+    }
+}
+
+task execute(type:JavaExec) {
+   main = System.getProperty('mainClass')
+   classpath = sourceSets.main.runtimeClasspath
+}
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
new file mode 100644
index 00000000000..b748f53e48d
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache
@@ -0,0 +1,18 @@
+lazy val root = (project in file(".")).
+  settings(
+    organization := "{{groupId}}",
+    name := "{{artifactId}}",
+    version := "{{artifactVersion}}",
+    scalaVersion := "2.11.4",
+    scalacOptions ++= Seq("-feature"),
+    javacOptions in compile ++= Seq("-Xlint:deprecation"),
+    publishArtifact in (Compile, packageDoc) := false,
+    resolvers += Resolver.mavenLocal,
+    libraryDependencies ++= Seq(
+      "io.swagger" % "swagger-annotations" % "1.5.0",
+      "com.squareup.okhttp" % "okhttp" % "2.4.0",
+      "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/enumClass.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/enumClass.mustache
new file mode 100644
index 00000000000..cc00e9d392e
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/enumClass.mustache
@@ -0,0 +1,17 @@
+public enum {{datatypeWithEnum}} {
+  {{#allowableValues}}{{#enumVars}}@SerializedName("{{value}}")
+  {{name}}("{{value}}"){{^-last}},
+
+  {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}}
+
+  private String value;
+
+  StatusEnum(String value) {
+    this.value = value;
+  }
+
+  @Override
+  public String toString() {
+    return value;
+  }
+}
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
new file mode 100644
index 00000000000..0987aa68f34
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/model.mustache
@@ -0,0 +1,58 @@
+package {{package}};
+
+import {{invokerPackage}}.StringUtil;
+{{#imports}}import {{import}};
+{{/imports}}
+
+import com.google.gson.annotations.SerializedName;
+
+{{#serializableModel}}
+import java.io.Serializable;{{/serializableModel}}
+
+import io.swagger.annotations.*;
+
+{{#models}}
+
+{{#model}}{{#description}}
+/**
+ * {{description}}
+ **/{{/description}}
+@ApiModel(description = "{{{description}}}")
+public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
+  {{#vars}}{{#isEnum}}
+
+{{>libraries/okhttp-gson/enumClass}}{{/isEnum}}{{#items.isEnum}}{{#items}}
+
+{{>libraries/okhttp-gson/enumClass}}{{/items}}{{/items.isEnum}}
+  @SerializedName("{{baseName}}")
+  private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};
+  {{/vars}}
+
+  {{#vars}}
+  /**{{#description}}
+   * {{{description}}}{{/description}}{{#minimum}}
+   * minimum: {{minimum}}{{/minimum}}{{#maximum}}
+   * maximum: {{maximum}}{{/maximum}}
+   **/
+  @ApiModelProperty({{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
+  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(StringUtil.toIndentedString(super.toString())).append("\n");{{/parent}}
+    {{#vars}}sb.append("    {{name}}: ").append(StringUtil.toIndentedString({{name}})).append("\n");
+    {{/vars}}sb.append("}");
+    return sb.toString();
+  }
+}
+{{/model}}
+{{/models}}
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
new file mode 100644
index 00000000000..67fc10e8323
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
@@ -0,0 +1,146 @@
+<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>
+  <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.6</source>
+          <target>1.6</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.okhttp</groupId>
+      <artifactId>okhttp</artifactId>
+      <version>${okhttp-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>${gson-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.brsanthu</groupId>
+      <artifactId>migbase64</artifactId>
+      <version>2.2</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>
+    <okhttp-version>2.4.0</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>
+  </properties>
+</project>
diff --git a/modules/swagger-codegen/src/main/resources/Java/model.mustache b/modules/swagger-codegen/src/main/resources/Java/model.mustache
index 0e12f514c48..f5e48ba997f 100644
--- a/modules/swagger-codegen/src/main/resources/Java/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/model.mustache
@@ -1,8 +1,12 @@
 package {{package}};
 
+import {{invokerPackage}}.StringUtil;
 {{#imports}}import {{import}};
 {{/imports}}
 
+{{#serializableModel}}
+import java.io.Serializable;{{/serializableModel}}
+
 import io.swagger.annotations.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
 {{#models}}
@@ -12,13 +16,14 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * {{description}}
  **/{{/description}}
 @ApiModel(description = "{{{description}}}")
-public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {
+{{>generatedAnnotation}}
+public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
   {{#vars}}{{#isEnum}}
-  public enum {{datatypeWithEnum}} {
-    {{#allowableValues}}{{#values}} {{.}}, {{/values}}{{/allowableValues}}
-  };
-  private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{^isEnum}}
-  private {{{datatype}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{/vars}}
+
+{{>enumClass}}{{/isEnum}}{{#items.isEnum}}{{#items}}
+
+{{>enumClass}}{{/items}}{{/items.isEnum}}
+  private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/vars}}
 
   {{#vars}}
   /**{{#description}}
@@ -41,9 +46,9 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {
   public String toString()  {
     StringBuilder sb = new StringBuilder();
     sb.append("class {{classname}} {\n");
-    {{#parent}}sb.append("  " + super.toString()).append("\n");{{/parent}}
-    {{#vars}}sb.append("  {{name}}: ").append({{name}}).append("\n");
-    {{/vars}}sb.append("}\n");
+    {{#parent}}sb.append("    ").append(StringUtil.toIndentedString(super.toString())).append("\n");{{/parent}}
+    {{#vars}}sb.append("    {{name}}: ").append(StringUtil.toIndentedString({{name}})).append("\n");
+    {{/vars}}sb.append("}");
     return sb.toString();
   }
 }
diff --git a/modules/swagger-codegen/src/main/resources/Java/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/pom.mustache
index 592edeec051..315ea9e5b92 100644
--- a/modules/swagger-codegen/src/main/resources/Java/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/pom.mustache
@@ -112,6 +112,8 @@
       <artifactId>swagger-annotations</artifactId>
       <version>${swagger-annotations-version}</version>
     </dependency>
+
+    <!-- HTTP client: jersey-client -->
     <dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-client</artifactId>
@@ -122,6 +124,8 @@
       <artifactId>jersey-multipart</artifactId>
       <version>${jersey-version}</version>
     </dependency>
+
+    <!-- JSON processing: jackson -->
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
@@ -141,7 +145,7 @@
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-joda</artifactId>
       <version>2.1.5</version>
-    </dependency>   
+    </dependency>
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
diff --git a/modules/swagger-codegen/src/main/resources/JavaInflector/README.mustache b/modules/swagger-codegen/src/main/resources/JavaInflector/README.mustache
new file mode 100644
index 00000000000..c1309670c5a
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaInflector/README.mustache
@@ -0,0 +1,8 @@
+# Swagger Inflector
+
+Run with
+
+```
+mvn package jetty:run
+``
+
diff --git a/modules/swagger-codegen/src/main/resources/JavaInflector/api.mustache b/modules/swagger-codegen/src/main/resources/JavaInflector/api.mustache
new file mode 100644
index 00000000000..74e688ee23e
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaInflector/api.mustache
@@ -0,0 +1,35 @@
+package {{invokerPackage}};
+
+import io.swagger.inflector.models.RequestContext;
+import io.swagger.inflector.models.ResponseContext;
+import javax.ws.rs.core.Response.Status;
+
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import java.io.File;
+import java.util.List;
+
+import {{modelPackage}}.*;
+
+{{#imports}}import {{import}};
+{{/imports}}
+
+{{>generatedAnnotation}}
+{{#operations}}
+public class {{classname}}  {
+  /** 
+   * Uncomment and implement as you see fit.  These operations will map
+   * Direclty to operation calls from the routing logic.  Because the inflector
+   * Code allows you to implement logic incrementally, they are disabled.
+   **/
+
+{{#operation}}
+  /*
+    public ResponseContext {{nickname}}(RequestContext request {{#allParams}}, {{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{/allParams}}) {
+        return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
+    }
+  */
+
+{{/operation}}
+}
+{{/operations}}
+
diff --git a/modules/swagger-codegen/src/main/resources/JavaInflector/bodyParams.mustache b/modules/swagger-codegen/src/main/resources/JavaInflector/bodyParams.mustache
new file mode 100644
index 00000000000..c7d1abfe527
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaInflector/bodyParams.mustache
@@ -0,0 +1 @@
+{{#isBodyParam}}{{{dataType}}} {{paramName}}{{/isBodyParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaInflector/formParams.mustache b/modules/swagger-codegen/src/main/resources/JavaInflector/formParams.mustache
new file mode 100644
index 00000000000..e44ab167e8f
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaInflector/formParams.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/JavaInflector/generatedAnnotation.mustache b/modules/swagger-codegen/src/main/resources/JavaInflector/generatedAnnotation.mustache
new file mode 100644
index 00000000000..49110fc1ad9
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaInflector/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/JavaInflector/headerParams.mustache b/modules/swagger-codegen/src/main/resources/JavaInflector/headerParams.mustache
new file mode 100644
index 00000000000..bd03573d196
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaInflector/headerParams.mustache
@@ -0,0 +1 @@
+{{#isHeaderParam}}{{{dataType}}} {{paramName}}{{/isHeaderParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaInflector/inflector.mustache b/modules/swagger-codegen/src/main/resources/JavaInflector/inflector.mustache
new file mode 100644
index 00000000000..d9d02ea93a8
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaInflector/inflector.mustache
@@ -0,0 +1,6 @@
+controllerPackage: {{invokerPackage}}
+modelPackage:  {{modelPackage}}
+swaggerUrl: ./src/main/swagger/swagger.json
+modelMappings:
+  {{#models}}{{#model}}{{classname}} : {{modelPackage}}.{{classname}}{{/model}}
+  {{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaInflector/model.mustache b/modules/swagger-codegen/src/main/resources/JavaInflector/model.mustache
new file mode 100644
index 00000000000..db2480a8540
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaInflector/model.mustache
@@ -0,0 +1,52 @@
+package {{package}};
+
+{{#imports}}import {{import}};
+{{/imports}}
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+{{#models}}
+
+{{#model}}{{#description}}
+/**
+ * {{description}}
+ **/{{/description}}
+@ApiModel(description = "{{{description}}}")
+{{>generatedAnnotation}}
+public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {
+  {{#vars}}{{#isEnum}}
+  public enum {{datatypeWithEnum}} {
+    {{#allowableValues}}{{#values}} {{.}}, {{/values}}{{/allowableValues}}
+  };
+  private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{^isEnum}}
+  private {{{datatype}}} {{name}} = {{{defaultValue}}};{{/isEnum}}{{/vars}}
+
+  {{#vars}}
+  /**{{#description}}
+   * {{{description}}}{{/description}}{{#minimum}}
+   * minimum: {{minimum}}{{/minimum}}{{#maximum}}
+   * maximum: {{maximum}}{{/maximum}}
+   **/
+  @ApiModelProperty({{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
+  @JsonProperty("{{name}}")
+  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("  " + super.toString()).append("\n");{{/parent}}
+    {{#vars}}sb.append("  {{name}}: ").append({{name}}).append("\n");
+    {{/vars}}sb.append("}\n");
+    return sb.toString();
+  }
+}
+{{/model}}
+{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaInflector/pathParams.mustache b/modules/swagger-codegen/src/main/resources/JavaInflector/pathParams.mustache
new file mode 100644
index 00000000000..6829cf8c7a6
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaInflector/pathParams.mustache
@@ -0,0 +1 @@
+{{#isPathParam}}{{{dataType}}} {{paramName}}{{/isPathParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache
new file mode 100644
index 00000000000..20d5aaf30c6
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache
@@ -0,0 +1,92 @@
+<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">
+    <parent>
+        <groupId>org.sonatype.oss</groupId>
+        <artifactId>oss-parent</artifactId>
+        <version>5</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>{{groupId}}</groupId>
+    <artifactId>{{artifactId}}</artifactId>
+    <packaging>jar</packaging>
+    <name>{{artifactId}}</name>
+    <version>{{artifactVersion}}</version>
+    <prerequisites>
+        <maven>2.2.0</maven>
+    </prerequisites>
+
+    <build>
+        <defaultGoal>install</defaultGoal>
+        <directory>target</directory>
+        <finalName>${project.artifactId}-${project.version}</finalName>
+        <plugins>
+            <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>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <excludes>
+                        <exclude>**/logback.xml</exclude>
+                    </excludes>
+                    <archive>
+                        <manifestEntries>
+                            <mode>development</mode>
+                            <url>${project.url}</url>
+                            <implementation-version>${project.version}</implementation-version>
+                            <package>io.swagger</package>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
+                <version>${jetty-version}</version>
+                <configuration>
+                    <monitoredDirName>.</monitoredDirName>
+                    <scanTargets>
+                        <scanTarget>inflector.yaml</scanTarget>
+                        <scanTarget>src/main/swagger/swagger.yaml</scanTarget>
+                    </scanTargets>
+                    <scanIntervalSeconds>1</scanIntervalSeconds>
+                    <webApp>
+                        <contextPath>/</contextPath>
+                    </webApp>
+                    <httpConnector>
+                        <port>8080</port>
+                        <idleTimeout>60000</idleTimeout>
+                    </httpConnector>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <!-- inflector client -->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-inflector</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+    <properties>
+        <maven-plugin-version>1.0.0</maven-plugin-version>
+        <swagger-core-version>1.5.3</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>
+        <slf4j-version>1.6.3</slf4j-version>
+    </properties>
+</project>
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaInflector/queryParams.mustache b/modules/swagger-codegen/src/main/resources/JavaInflector/queryParams.mustache
new file mode 100644
index 00000000000..ff79730471d
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaInflector/queryParams.mustache
@@ -0,0 +1 @@
+{{#isQueryParam}}{{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaInflector/web.mustache b/modules/swagger-codegen/src/main/resources/JavaInflector/web.mustache
new file mode 100644
index 00000000000..34a2eea6bcf
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaInflector/web.mustache
@@ -0,0 +1,24 @@
+<?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>swagger-inflector</servlet-name>
+        <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
+        <init-param>
+            <param-name>javax.ws.rs.Application</param-name>
+            <param-value>io.swagger.inflector.SwaggerInflector</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>swagger-inflector</servlet-name>
+        <url-pattern>/*</url-pattern>
+    </servlet-mapping>
+    <filter>
+        <filter-name>CORSFilter</filter-name>
+        <filter-class>io.swagger.inflector.utils.CORSFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>CORSFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+</web-app>
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/ApiException.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/ApiException.mustache
index ffab3b1088e..11b4036b832 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/ApiException.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/ApiException.mustache
@@ -1,5 +1,6 @@
 package {{apiPackage}};
 
+{{>generatedAnnotation}}
 public class ApiException extends Exception{
 	private int code;
 	public ApiException (int code, String msg) {
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/ApiOriginFilter.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/ApiOriginFilter.mustache
index 68675432c64..a1e5a678fe1 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/ApiOriginFilter.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/ApiOriginFilter.mustache
@@ -5,8 +5,8 @@ import java.io.IOException;
 import javax.servlet.*;
 import javax.servlet.http.HttpServletResponse;
 
+{{>generatedAnnotation}}
 public class ApiOriginFilter implements javax.servlet.Filter {
-	@Override
 	public void doFilter(ServletRequest request, ServletResponse response,
 			FilterChain chain) throws IOException, ServletException {
 		HttpServletResponse res = (HttpServletResponse) response;
@@ -16,11 +16,7 @@ public class ApiOriginFilter implements javax.servlet.Filter {
 		chain.doFilter(request, response);
 	}
 
-	@Override
-	public void destroy() {
-	}
+	public void destroy() {}
 
-	@Override
-	public void init(FilterConfig filterConfig) throws ServletException {
-	}
+	public void init(FilterConfig filterConfig) throws ServletException {}
 }
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/ApiResponseMessage.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/ApiResponseMessage.mustache
index 94711b26efb..2b9a2b1f8c5 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/ApiResponseMessage.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/ApiResponseMessage.mustache
@@ -3,6 +3,7 @@ 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;
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/NotFoundException.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/NotFoundException.mustache
index 8ab2c99e4f8..1bd5e207d7b 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/NotFoundException.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/NotFoundException.mustache
@@ -1,5 +1,6 @@
 package {{apiPackage}};
 
+{{>generatedAnnotation}}
 public class NotFoundException extends ApiException {
 	private int code;
 	public NotFoundException (int code, String msg) {
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/api.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/api.mustache
index 3216b60d516..a2213ea6086 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/api.mustache
@@ -26,6 +26,7 @@ import javax.ws.rs.*;
 {{#hasConsumes}}@Consumes({ {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}
 {{#hasProduces}}@Produces({ {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
 @io.swagger.annotations.Api(value = "/{{baseName}}", description = "the {{baseName}} API")
+{{>generatedAnnotation}}
 {{#operations}}
 public class {{classname}}  {
 
@@ -38,7 +39,7 @@ public class {{classname}}  {
     {{#hasProduces}}@Produces({ {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
     @io.swagger.annotations.ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}", response = {{{returnType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}})
     @io.swagger.annotations.ApiResponses(value = { {{#responses}}
-        @io.swagger.annotations.ApiResponse(code = {{{code}}}, message = "{{{message}}}"){{#hasMore}},
+        @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}}{{#hasMore}},
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/apiService.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/apiService.mustache
index 43e7cd8685c..a731da6c11c 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/apiService.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/apiService.mustache
@@ -18,6 +18,7 @@ import com.sun.jersey.multipart.FormDataParam;
 
 import javax.ws.rs.core.Response;
 
+{{>generatedAnnotation}}
 {{#operations}}
 public abstract class {{classname}}Service {
   {{#operation}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/apiServiceFactory.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/apiServiceFactory.mustache
index a434311d285..1bb63bc0775 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/apiServiceFactory.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/apiServiceFactory.mustache
@@ -3,6 +3,7 @@ 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();
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/apiServiceImpl.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/apiServiceImpl.mustache
index d49fa4952a2..0acd755745e 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/apiServiceImpl.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/apiServiceImpl.mustache
@@ -18,6 +18,7 @@ import com.sun.jersey.multipart.FormDataParam;
 
 import javax.ws.rs.core.Response;
 
+{{>generatedAnnotation}}
 {{#operations}}
 public class {{classname}}ServiceImpl extends {{classname}}Service {
   {{#operation}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/formParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/formParams.mustache
index ba842165f3d..1bae4717f4d 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/formParams.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/formParams.mustache
@@ -1,2 +1,2 @@
-{{#isFormParam}}{{#notFile}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}})@FormParam("{{paramName}}")  {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}@ApiParam(value = "{{{description}}}") @FormDataParam("file") InputStream inputStream,
-    @ApiParam(value = "file detail") @FormDataParam("file") FormDataContentDisposition fileDetail{{/isFile}}{{/isFormParam}}
\ No newline at end of file
+{{#isFormParam}}{{#notFile}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}} {{#allowableValues}}, 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
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/generatedAnnotation.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/generatedAnnotation.mustache
new file mode 100644
index 00000000000..49110fc1ad9
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/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/model.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/model.mustache
index 300d5e61dd9..db2480a8540 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/model.mustache
@@ -12,6 +12,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * {{description}}
  **/{{/description}}
 @ApiModel(description = "{{{description}}}")
+{{>generatedAnnotation}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {
   {{#vars}}{{#isEnum}}
   public enum {{datatypeWithEnum}} {
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache
index 708ca6cac4d..ba58d23ca7f 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache
@@ -119,13 +119,12 @@
       <artifactId>jersey-server</artifactId>
       <version>${jersey-version}</version>
     </dependency>
-
     <dependency>
-      <groupId>org.scalatest</groupId>
-      <artifactId>scalatest_2.9.1</artifactId>
-      <version>${scala-test-version}</version>
-      <scope>test</scope>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>${servlet-api-version}</version>
     </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -133,9 +132,30 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>${servlet-api-version}</version>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-client</artifactId>
+      <version>${jersey-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>
@@ -148,11 +168,10 @@
     </repository>
   </repositories>
   <properties>
-    <swagger-core-version>1.5.0</swagger-core-version>
+    <swagger-core-version>1.5.3</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
-    <jersey-version>1.13</jersey-version>
+    <jersey-version>1.18.1</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>
   </properties>
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/returnTypes.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/returnTypes.mustache
new file mode 100644
index 00000000000..c8f7a56938a
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/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/JavaSpringMVC/README.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/README.mustache
index f357cb9a081..9cf2b4bc6e8 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/README.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/README.mustache
@@ -8,4 +8,5 @@ This server was generated by the [swagger-codegen](https://github.com/swagger-ap
 
 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{{^contextPath}}/{{/contextPath}}{{#contextPath}}{{contextPath}}{{/contextPath}}/sdoc.jsp
\ No newline at end of file
+You can view the server in swagger-ui by pointing to
+http://localhost:8002{{^contextPath}}/{{/contextPath}}{{#contextPath}}{{contextPath}}{{/contextPath}}/swagger-ui.html
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/api.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/api.mustache
index d6a24b69311..695d1c5525b 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/api.mustache
@@ -30,6 +30,7 @@ import static org.springframework.http.MediaType.*;
 @Controller
 @RequestMapping(value = "/{{baseName}}", produces = {APPLICATION_JSON_VALUE})
 @Api(value = "/{{baseName}}", description = "the {{baseName}} API")
+{{>generatedAnnotation}}
 {{#operations}}
 public class {{classname}} {
   {{#operation}}
@@ -41,11 +42,11 @@ public class {{classname}} {
     {{#hasProduces}}produces = { {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }, {{/hasProduces}}
     {{#hasConsumes}}consumes = { {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} },{{/hasConsumes}}
     method = RequestMethod.{{httpMethod}})
-  public ResponseEntity<{{returnType}}> {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},
+  public ResponseEntity<{{>returnTypes}}> {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},
     {{/hasMore}}{{/allParams}})
       throws NotFoundException {
       // do some magic!
-      return new ResponseEntity<{{returnType}}>(HttpStatus.OK);
+      return new ResponseEntity<{{>returnTypes}}>(HttpStatus.OK);
   }
 
   {{/operation}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiException.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiException.mustache
index ffab3b1088e..11b4036b832 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiException.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiException.mustache
@@ -1,5 +1,6 @@
 package {{apiPackage}};
 
+{{>generatedAnnotation}}
 public class ApiException extends Exception{
 	private int code;
 	public ApiException (int code, String msg) {
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiOriginFilter.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiOriginFilter.mustache
index 68675432c64..5db3301b3d9 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiOriginFilter.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiOriginFilter.mustache
@@ -5,6 +5,7 @@ import java.io.IOException;
 import javax.servlet.*;
 import javax.servlet.http.HttpServletResponse;
 
+{{>generatedAnnotation}}
 public class ApiOriginFilter implements javax.servlet.Filter {
 	@Override
 	public void doFilter(ServletRequest request, ServletResponse response,
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiResponseMessage.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiResponseMessage.mustache
index 94711b26efb..2b9a2b1f8c5 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiResponseMessage.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiResponseMessage.mustache
@@ -3,6 +3,7 @@ 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;
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/generatedAnnotation.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/generatedAnnotation.mustache
new file mode 100644
index 00000000000..49110fc1ad9
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/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/JavaSpringMVC/model.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/model.mustache
index 300d5e61dd9..db2480a8540 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/model.mustache
@@ -12,6 +12,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * {{description}}
  **/{{/description}}
 @ApiModel(description = "{{{description}}}")
+{{>generatedAnnotation}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {
   {{#vars}}{{#isEnum}}
   public enum {{datatypeWithEnum}} {
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/notFoundException.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/notFoundException.mustache
index 8ab2c99e4f8..1bd5e207d7b 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/notFoundException.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/notFoundException.mustache
@@ -1,5 +1,6 @@
 package {{apiPackage}};
 
+{{>generatedAnnotation}}
 public class NotFoundException extends ApiException {
 	private int code;
 	public NotFoundException (int code, String msg) {
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom.mustache
index 3b068adffdf..ffbb0e43516 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom.mustache
@@ -33,8 +33,7 @@
           <webAppConfig>
             <contextPath>{{^contextPath}}/{{/contextPath}}{{#contextPath}}{{contextPath}}{{/contextPath}}</contextPath>
           </webAppConfig>
-          <webAppSourceDirectory>target/${project.artifactId}-${project-version}</webAppSourceDirectory>
-          <webDefaultXml>${project.basedir}/conf/jetty/webdefault.xml</webDefaultXml>
+          <webAppSourceDirectory>target/${project.artifactId}-${project.version}</webAppSourceDirectory>
           <stopPort>8079</stopPort>
           <stopKey>stopit</stopKey>
           <httpConnector>
@@ -63,49 +62,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>com.googlecode.maven-download-plugin</groupId>
-        <artifactId>download-maven-plugin</artifactId>
-        <version>1.2.1</version>
-        <executions>
-          <execution>
-            <id>swagger-ui</id>
-            <goals>
-              <goal>wget</goal>
-            </goals>
-            <configuration>
-              <url>https://github.com/swagger-api/swagger-ui/archive/v${swagger-ui-version}.tar.gz</url>
-              <unpack>true</unpack>
-              <outputDirectory>${project.build.directory}</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>2.6</version>
-        <executions>
-          <execution>
-            <id>copy-resources</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>target/${project.artifactId}-${project.version}</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>${project.build.directory}/swagger-ui-${swagger-ui-version}/dist</directory>
-                  <filtering>true</filtering>
-                  <excludes>
-                    <exclude>index.html</exclude>
-                  </excludes>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
   <dependencies>
@@ -163,21 +119,6 @@
     </dependency>
 
     <!--SpringFox dependencies-->
-    <dependency>
-      <groupId>io.springfox</groupId>
-      <artifactId>springfox-core</artifactId>
-      <version>${springfox-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.springfox</groupId>
-      <artifactId>springfox-spi</artifactId>
-      <version>${springfox-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.springfox</groupId>
-      <artifactId>springfox-spring-web</artifactId>
-      <version>${springfox-version}</version>
-    </dependency>
     <dependency>
       <groupId>io.springfox</groupId>
       <artifactId>springfox-swagger2</artifactId>
@@ -189,12 +130,6 @@
       <version>${springfox-version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.scalatest</groupId>
-      <artifactId>scalatest_2.9.1</artifactId>
-      <version>${scala-test-version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -215,15 +150,14 @@
     </repository>
   </repositories>
   <properties>
-    <swagger-core-version>1.5.0</swagger-core-version>
+    <swagger-core-version>1.5.3</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
-    <swagger-ui-version>2.1.0-M2</swagger-ui-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.0-SNAPSHOT</springfox-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/modules/swagger-codegen/src/main/resources/JavaSpringMVC/returnTypes.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/returnTypes.mustache
new file mode 100644
index 00000000000..c8f7a56938a
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/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/JavaSpringMVC/swaggerConfig.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/swaggerConfig.mustache
index b33ee7fc994..4a6e6879df3 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/swaggerConfig.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/swaggerConfig.mustache
@@ -18,6 +18,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @EnableSwagger2 //Loads the spring beans required by the framework
 @PropertySource("classpath:swagger.properties")
 @Import(SwaggerUiConfiguration.class)
+{{>generatedAnnotation}}
 public class SwaggerConfig {
     @Bean
     ApiInfo apiInfo() {
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/swaggerUiConfiguration.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/swaggerUiConfiguration.mustache
index 652dc310358..0b515fe2cc8 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/swaggerUiConfiguration.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/swaggerUiConfiguration.mustache
@@ -8,6 +8,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
 
 @Configuration
 @EnableWebMvc
+{{>generatedAnnotation}}
 public class SwaggerUiConfiguration extends WebMvcConfigurerAdapter {
   private static final String[] SERVLET_RESOURCE_LOCATIONS = { "/" };
 
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/webApplication.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/webApplication.mustache
index 6910ad11b76..426f831582e 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/webApplication.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/webApplication.mustache
@@ -2,6 +2,7 @@ package {{configPackage}};
 
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
 
+{{>generatedAnnotation}}
 public class WebApplication extends AbstractAnnotationConfigDispatcherServletInitializer {
 
     @Override
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/webMvcConfiguration.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/webMvcConfiguration.mustache
index 03904e51e79..d60c126316e 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/webMvcConfiguration.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/webMvcConfiguration.mustache
@@ -3,6 +3,7 @@ package {{configPackage}};
 import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 
+{{>generatedAnnotation}}
 public class WebMvcConfiguration extends WebMvcConfigurationSupport {
     @Override
     public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
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 8bbdbc8d140..e98ac462230 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,8 +1,10 @@
 io.swagger.codegen.languages.AndroidClientCodegen
 io.swagger.codegen.languages.AsyncScalaClientCodegen
 io.swagger.codegen.languages.CSharpClientCodegen
+io.swagger.codegen.languages.FlashClientCodegen
 io.swagger.codegen.languages.JavaClientCodegen
 io.swagger.codegen.languages.JaxRSServerCodegen
+io.swagger.codegen.languages.JavaInflectorServerCodegen
 io.swagger.codegen.languages.NodeJSServerCodegen
 io.swagger.codegen.languages.ObjcClientCodegen
 io.swagger.codegen.languages.PerlClientCodegen
@@ -14,11 +16,16 @@ io.swagger.codegen.languages.RetrofitClientCodegen
 io.swagger.codegen.languages.RubyClientCodegen
 io.swagger.codegen.languages.ScalaClientCodegen
 io.swagger.codegen.languages.ScalatraServerCodegen
+io.swagger.codegen.languages.SilexServerCodegen
+io.swagger.codegen.languages.SinatraServerCodegen
 io.swagger.codegen.languages.SpringMVCServerCodegen
 io.swagger.codegen.languages.StaticDocCodegen
 io.swagger.codegen.languages.StaticHtmlGenerator
 io.swagger.codegen.languages.SwaggerGenerator
 io.swagger.codegen.languages.SwaggerYamlGenerator
-io.swagger.codegen.languages.SwiftGenerator
+io.swagger.codegen.languages.SwiftCodegen
 io.swagger.codegen.languages.TizenClientCodegen
+io.swagger.codegen.languages.TypeScriptAngularClientCodegen
+io.swagger.codegen.languages.TypeScriptNodeClientCodegen
 io.swagger.codegen.languages.AkkaScalaClientCodegen
+io.swagger.codegen.languages.CsharpDotNet2ClientCodegen
diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.d.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.d.mustache
new file mode 100644
index 00000000000..a8bf1c58267
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.d.mustache
@@ -0,0 +1,13 @@
+{{#models}}
+{{#model}}
+/// <reference path="{{{classname}}}.ts" />
+{{/model}}
+{{/models}}
+
+{{#apiInfo}}
+{{#apis}}
+{{#operations}}
+/// <reference path="{{classname}}.ts" />
+{{/operations}}
+{{/apis}}
+{{/apiInfo}}
diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache
new file mode 100644
index 00000000000..427d847663b
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache
@@ -0,0 +1,78 @@
+/// <reference path="api.d.ts" />
+
+/* tslint:disable:no-unused-variable member-ordering */
+
+{{#operations}}
+module {{package}} {
+    'use strict';
+
+{{#description}}
+    /**
+    * {{&description}}
+    */
+{{/description}}
+    export class {{classname}} {
+        private basePath = '{{contextPath}}';
+
+        static $inject: string[] = ['$http'];
+
+        constructor(private $http: ng.IHttpService, basePath?: string) {
+            if (basePath) {
+                this.basePath = basePath;
+            }
+        }
+{{#operation}}
+
+        public {{nickname}} ({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}extraHttpRequestParams?: any ) : ng.IHttpPromise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}{}{{/returnType}}> {
+            var path = this.basePath + '{{path}}';
+
+{{#pathParams}}
+            path = path.replace('{' + '{{paramName}}' + '}', String({{paramName}}));
+
+{{/pathParams}}
+            var queryParameters: any = {};
+            var headerParams: any = {};
+
+{{#allParams}}
+{{#required}}
+            // verify required parameter '{{paramName}}' is set
+            if (!{{paramName}}) {
+                throw new Error('Missing required parameter {{paramName}} when calling {{nickname}}');
+            }
+
+{{/required}}
+{{/allParams}}
+{{#queryParams}}
+            if ({{paramName}} !== undefined) {
+                queryParameters['{{paramName}}'] = {{paramName}};
+            }
+
+{{/queryParams}}
+{{#headerParams}}
+            headerParams['{{paramName}}'] = {{paramName}};
+
+{{/headerParams}}
+            var httpRequestParams: any = {
+                method: '{{httpMethod}}',
+                url: path,
+                json: true,
+                {{#bodyParam}}data: {{paramName}},
+                {{/bodyParam}}
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                for (var k in extraHttpRequestParams) {
+                    if (extraHttpRequestParams.hasOwnProperty(k)) {
+                        httpRequestParams[k] = extraHttpRequestParams[k];
+                    }
+                }
+            }
+
+            return this.$http(httpRequestParams);
+        }
+{{/operation}}
+    }
+}
+{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/model.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/model.mustache
new file mode 100644
index 00000000000..b425d14d5e4
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/model.mustache
@@ -0,0 +1,39 @@
+/// <reference path="api.d.ts" />
+
+module {{package}} {
+    'use strict';
+
+{{#models}}
+{{#model}}
+{{#description}}
+    /**
+     * {{{description}}}
+     */
+{{/description}}
+    export class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{
+{{#vars}}
+
+{{#description}}
+        /**
+         * {{{description}}}
+         */
+{{/description}}
+        {{name}}: {{#isEnum}}{{classname}}.{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
+{{/vars}}
+    }
+
+{{#hasEnums}}
+    export module {{classname}} {
+{{#vars}}
+{{#isEnum}}
+
+        export enum {{datatypeWithEnum}} { {{#allowableValues}}{{#values}} 
+            {{.}} = <any> '{{.}}',{{/values}}{{/allowableValues}}
+        }
+{{/isEnum}}
+{{/vars}}
+    }
+{{/hasEnums}}
+{{/model}}
+{{/models}}
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache
new file mode 100644
index 00000000000..f8d4577ee7a
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache
@@ -0,0 +1,245 @@
+import request = require('request');
+import promise = require('bluebird');
+import http = require('http');
+
+// ===============================================
+// This file is autogenerated - Please do not edit
+// ===============================================
+
+/* tslint:disable:no-unused-variable */
+
+{{#models}}
+{{#model}}
+{{#description}}
+/**
+* {{{description}}}
+*/
+{{/description}}
+export class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{
+{{#vars}}
+{{#description}}
+    /**
+    * {{{description}}}
+    */
+{{/description}}
+    {{name}}: {{#isEnum}}{{classname}}.{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
+{{/vars}}
+}
+
+{{#hasEnums}}
+export module {{classname}} {
+{{#vars}}
+{{#isEnum}}
+    export enum {{datatypeWithEnum}} { {{#allowableValues}}{{#values}}
+        {{.}} = <any> '{{.}}',{{/values}}{{/allowableValues}}
+    }
+{{/isEnum}}
+{{/vars}}
+}
+{{/hasEnums}}
+{{/model}}
+{{/models}}
+
+interface Authentication {
+    /**
+    * Apply authentication settings to header and query params.
+    */
+    applyToRequest(requestOptions: request.Options): void;
+}
+
+class HttpBasicAuth implements Authentication {
+    public username: string;
+    public password: string;
+    applyToRequest(requestOptions: request.Options): void {
+        requestOptions.auth = {
+            username: this.username, password: this.password
+        }
+    }
+}
+
+class ApiKeyAuth implements Authentication {
+    public apiKey: string;
+
+    constructor(private location: string, private paramName: string) {
+    }
+
+    applyToRequest(requestOptions: request.Options): void {
+        if (this.location == "query") {
+            (<any>requestOptions.qs)[this.paramName] = this.apiKey;
+        } else if (this.location == "header") {
+            requestOptions.headers[this.paramName] = this.apiKey;
+        }
+    }
+}
+
+class OAuth implements Authentication {
+    applyToRequest(requestOptions: request.Options): void {
+        // TODO: support oauth
+    }
+}
+
+class VoidAuth implements Authentication {
+    public username: string;
+    public password: string;
+    applyToRequest(requestOptions: request.Options): void {
+        // Do nothing
+    }
+}
+
+{{#apiInfo}}
+{{#apis}}
+{{#operations}}
+{{#description}}
+/**
+* {{&description}}
+*/
+{{/description}}
+export class {{classname}} {
+    private basePath = '{{contextPath}}';
+    public authentications = {
+        'default': <Authentication>new VoidAuth(),
+{{#authMethods}}
+{{#isBasic}}
+        '{{name}}': new HttpBasicAuth(),
+{{/isBasic}}
+{{#isApiKey}}
+        '{{name}}': new ApiKeyAuth({{#isKeyInHeader}}'header'{{/isKeyInHeader}}{{^isKeyInHeader}}'query'{{/isKeyInHeader}}, '{{keyParamName}}'),
+{{/isApiKey}}
+{{#isOAuth}}
+        '{{name}}': new OAuth(),
+{{/isOAuth}}
+{{/authMethods}}
+    }
+
+    constructor(url: string, basePath?: string);
+{{#authMethods}}
+{{#isBasic}}
+    constructor(url: string, username: string, password: string, basePath?: string);
+{{/isBasic}}
+{{/authMethods}}
+    constructor(private url: string, basePathOrUsername: string, password?: string, basePath?: string) {
+        if (password) {
+{{#authMethods}}
+{{#isBasic}}
+            this.username = basePathOrUsername;
+            this.password = password
+{{/isBasic}}
+{{/authMethods}}
+            if (basePath) {
+                this.basePath = basePath;
+            }
+        } else {
+            if (basePathOrUsername) {
+                this.basePath = basePathOrUsername
+            }
+        }
+    }
+{{#authMethods}}
+{{#isBasic}}
+
+    set username(username: string) {
+        this.authentications.{{name}}.username = username;
+    }
+
+    set password(password: string) {
+        this.authentications.{{name}}.password = password;
+    }
+{{/isBasic}}
+{{#isApiKey}}
+
+    set apiKey(key: string) {
+        this.authentications.{{name}}.apiKey = key;
+    }
+{{/isApiKey}}
+{{#isOAuth}}
+{{/isOAuth}}
+{{/authMethods}}
+{{#operation}}
+
+    public {{nickname}} ({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) : Promise<{ response: http.ClientResponse; {{#returnType}}body: {{{returnType}}}; {{/returnType}} }> {
+        var path = this.url + this.basePath + '{{path}}';
+
+{{#pathParams}}
+        path = path.replace('{' + '{{paramName}}' + '}', String({{paramName}}));
+
+{{/pathParams}}
+        var queryParameters: any = {};
+        var headerParams: any = {};
+        var formParams: any = {};
+
+{{#allParams}}
+{{#required}}
+        // verify required parameter '{{paramName}}' is set
+        if (!{{paramName}}) {
+            throw new Error('Missing required parameter {{paramName}} when calling {{nickname}}');
+        }
+
+{{/required}}
+{{/allParams}}
+{{#queryParams}}
+        if ({{paramName}} !== undefined) {
+            queryParameters['{{paramName}}'] = {{paramName}};
+        }
+
+{{/queryParams}}
+{{#headerParams}}
+        headerParams['{{paramName}}'] = {{paramName}};
+
+{{/headerParams}}
+        var useFormData = false;
+
+{{#formParams}}
+        if ({{paramName}} !== undefined) {
+            formParams['{{paramName}}'] = {{paramName}};
+        }
+{{#isFile}}
+        useFormData = true;
+{{/isFile}}
+
+{{/formParams}}
+        var deferred = promise.defer<{ response: http.ClientResponse; {{#returnType}}body: {{{returnType}}}; {{/returnType}} }>();
+
+        var requestOptions: request.Options = {
+            method: '{{httpMethod}}',
+            qs: queryParameters,
+            headers: headerParams,
+            uri: path,
+            json: true,
+{{#bodyParam}}
+            body: {{paramName}},
+{{/bodyParam}}
+        }
+
+{{#authMethods}}
+        this.authentications.{{name}}.applyToRequest(requestOptions);
+
+{{/authMethods}}
+        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;
+    }
+{{/operation}}
+}
+{{/operations}}
+{{/apis}}
+{{/apiInfo}}
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 eb24f77c072..b9fd8603baa 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.0</swagger-core-version>
+        <swagger-core-version>1.5.3</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-java/Pair.mustache b/modules/swagger-codegen/src/main/resources/android-java/Pair.mustache
new file mode 100644
index 00000000000..5456028a1a0
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/android-java/Pair.mustache
@@ -0,0 +1,38 @@
+package {{invokerPackage}};
+
+public class Pair {
+    private String name = "";
+    private String value = "";
+
+    public Pair(String name, String value) {
+        setName(name);
+        setValue(value);
+    }
+
+    private void setName(String name) {
+        if (!isValidString(name)) return;
+
+        this.name = name;
+    }
+
+    private void setValue(String value) {
+        if (!isValidString(value)) return;
+
+        this.value = value;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    private boolean isValidString(String arg) {
+        if (arg == null) return false;
+        if (arg.trim().isEmpty()) return false;
+
+        return true;
+    }
+}
diff --git a/modules/swagger-codegen/src/main/resources/android-java/api.mustache b/modules/swagger-codegen/src/main/resources/android-java/api.mustache
index ed9538c1594..30c686b688b 100644
--- a/modules/swagger-codegen/src/main/resources/android-java/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/android-java/api.mustache
@@ -2,6 +2,7 @@ package {{package}};
 
 import {{invokerPackage}}.ApiException;
 import {{invokerPackage}}.ApiInvoker;
+import {{invokerPackage}}.Pair;
 
 import {{modelPackage}}.*;
 
@@ -55,20 +56,21 @@ public class {{classname}} {
     {{/required}}{{/allParams}}
 
     // create path and map variables
-    String path = "{{path}}".replaceAll("\\{format\\}","json"){{#pathParams}}.replaceAll("\\{" + "{{paramName}}" + "\\}", apiInvoker.escapeString({{{paramName}}}.toString())){{/pathParams}};
+    String path = "{{path}}".replaceAll("\\{format\\}","json"){{#pathParams}}.replaceAll("\\{" + "{{baseName}}" + "\\}", apiInvoker.escapeString({{{paramName}}}.toString())){{/pathParams}};
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    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}}if ({{paramName}} != null)
-      queryParams.put("{{baseName}}", ApiInvoker.parameterToString({{paramName}}));
+    {{#queryParams}}
+    queryParams.addAll(ApiInvoker.parameterToPairs("{{#collectionFormat}}{{{collectionFormat}}}{{/collectionFormat}}", "{{baseName}}", {{paramName}}));
     {{/queryParams}}
 
-    {{#headerParams}}headerParams.put("{{baseName}}", ApiInvoker.parameterToString({{paramName}}));
+    {{#headerParams}}
+    headerParams.put("{{baseName}}", ApiInvoker.parameterToString({{paramName}}));
     {{/headerParams}}
 
     String[] contentTypes = {
diff --git a/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache b/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache
index e759f8264a4..ac24335df18 100644
--- a/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache
+++ b/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache
@@ -23,6 +23,7 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.List;
+import java.util.ArrayList;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 
@@ -132,6 +133,62 @@ public class ApiInvoker {
     }
   }
 
+  /*
+    Format to {@code Pair} objects.
+  */
+  public static List<Pair> parameterToPairs(String collectionFormat, String name, Object value){
+    List<Pair> params = new ArrayList<Pair>();
+
+    // preconditions
+    if (name == null || name.isEmpty() || value == null) return params;
+
+    Collection valueCollection = null;
+    if (value instanceof Collection) {
+      valueCollection = (Collection) value;
+    } else {
+      params.add(new Pair(name, parameterToString(value)));
+      return params;
+    }
+
+    if (valueCollection.isEmpty()){
+      return params;
+    }
+
+    // get the collection format
+    collectionFormat = (collectionFormat == null || collectionFormat.isEmpty() ? "csv" : collectionFormat); // default: csv
+
+    // create the params based on the collection format
+    if (collectionFormat.equals("multi")) {
+      for (Object item : valueCollection) {
+        params.add(new Pair(name, parameterToString(item)));
+      }
+
+      return params;
+    }
+
+    String delimiter = ",";
+
+    if (collectionFormat.equals("csv")) {
+      delimiter = ",";
+    } else if (collectionFormat.equals("ssv")) {
+      delimiter = " ";
+    } else if (collectionFormat.equals("tsv")) {
+      delimiter = "\t";
+    } else if (collectionFormat.equals("pipes")) {
+      delimiter = "|";
+    }
+
+    StringBuilder sb = new StringBuilder() ;
+    for (Object item : valueCollection) {
+      sb.append(delimiter);
+      sb.append(parameterToString(item));
+    }
+
+    params.add(new Pair(name, sb.substring(1)));
+
+    return params;
+  }
+
   public ApiInvoker() {
     initConnectionManager();
   }
@@ -159,7 +216,7 @@ public class ApiInvoker {
       }
       else if(String.class.equals(cls)) {
         if(json != null && json.startsWith("\"") && json.endsWith("\"") && json.length() > 1)
-          return json.substring(1, json.length() - 2);
+          return json.substring(1, json.length() - 1);
         else
           return json;
       }
@@ -184,21 +241,24 @@ public class ApiInvoker {
     }
   }
 
-  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 {
+  public String invokeAPI(String host, String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, String> formParams, 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("?");
+    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("&");
-        b.append(escapeString(key)).append("=").append(escapeString(value));
+        }
       }
     }
-    String url = host + path + b.toString();
+
+    String querystring = b.substring(0, b.length() - 1);
+    String url = host + path + querystring;
 
     HashMap<String, String> headers = new HashMap<String, String>();
 
diff --git a/modules/swagger-codegen/src/main/resources/asyncscala/api.mustache b/modules/swagger-codegen/src/main/resources/asyncscala/api.mustache
index cd12ae18806..49b7c089704 100644
--- a/modules/swagger-codegen/src/main/resources/asyncscala/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/asyncscala/api.mustache
@@ -11,10 +11,9 @@ import collection.mutable
 class {{classname}}(client: TransportClient, config: SwaggerConfig) extends ApiClient(client, config) {
 
   {{#operation}}
-  def {{nickname}}({{#allParams}}{{#optional}}{{paramName}}: Option[{{dataType}}] = {{#defaultValue}}Some({{defaultValue}}){{/defaultValue}}{{^defaultValue}}None{{/defaultValue}}{{#hasMore}},
-  {{/hasMore}}
-      {{/optional}}{{^optional}}{{paramName}}: {{dataType}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{#hasMore}},
-      {{/hasMore}}{{/optional}}{{/allParams}})(implicit reader: ClientResponseReader[{{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}}]{{#bodyParams}}, writer: RequestWriter[{{dataType}}]{{/bodyParams}}){{#returnType}}: Future[{{returnType}}]{{/returnType}}{{^returnType}}: Future[Unit]{{/returnType}} = {
+  def {{nickname}}({{#allParams}}{{^required}}{{paramName}}: Option[{{dataType}}] = {{#defaultValue}}Some({{defaultValue}}){{/defaultValue}}{{^defaultValue}}None{{/defaultValue}}{{#hasMore}},{{/hasMore}}
+      {{/required}}{{#required}}{{paramName}}: {{dataType}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{#hasMore}},
+      {{/hasMore}}{{/required}}{{/allParams}})(implicit reader: ClientResponseReader[{{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}}]{{#bodyParams}}, writer: RequestWriter[{{dataType}}]{{/bodyParams}}){{#returnType}}: Future[{{returnType}}]{{/returnType}}{{^returnType}}: Future[Unit]{{/returnType}} = {
     // create path and map variables
     val path = (addFmt("{{path}}"){{#pathParams}}
         replaceAll ("\\{" + "{{baseName}}" + "\\}",{{paramName}}.toString){{/pathParams}})
@@ -27,8 +26,8 @@ class {{classname}}(client: TransportClient, config: SwaggerConfig) extends ApiC
     val paramCount = (Set[Any]({{/requiredParamCount}}{{#requiredParams}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/requiredParams}}{{#requiredParamCount}}) - null).size
     if (paramCount != {{requiredParamCount}}) sys.error("missing required params"){{/requiredParamCount}}
 
-    {{#queryParams}}{{#optional}}if({{paramName}} != null) {{paramName}}.foreach { v => queryParams += "{{baseName}}" -> v.toString }{{/optional}}{{^optional}}
-    if({{paramName}} != null)   queryParams += "{{baseName}}" -> {{paramName}}.toString{{/optional}}{{/queryParams}}
+    {{#queryParams}}{{^required}}if({{paramName}} != null) {{paramName}}.foreach { v => queryParams += "{{baseName}}" -> v.toString }{{/required}}{{#required}}
+    if({{paramName}} != null)   queryParams += "{{baseName}}" -> {{paramName}}.toString{{/required}}{{/queryParams}}
 
     {{#headerParams}}headerParams += "{{baseName}}" -> {{paramName}}.toString{{/headerParams}}
 
diff --git a/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
index ad57cffdf34..3399d84297d 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
@@ -1,217 +1,345 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
+using System.Text.RegularExpressions;
 using System.IO;
+using System.Web;
 using System.Linq;
 using System.Net;
 using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json;
 using RestSharp;
+using RestSharp.Extensions;
 
-namespace {{invokerPackage}} {
-  /// <summary>
-  /// API client is mainly responible for making the HTTP call to the API backend
-  /// </summary>
-  public class ApiClient {
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ApiClient"/> class.
-    /// </summary>
-    /// <param name="basePath">The base path.</param>
-    public ApiClient(String basePath="{{basePath}}") {
-      this.basePath = basePath;
-      this.restClient = new RestClient(this.basePath);
-    }
-
-    /// <summary>
-    /// Gets or sets the base path.
-    /// </summary>
-    /// <value>The base path.</value> 
-    public string basePath { get; set; }
-
+namespace {{packageName}}.Client
+{
     /// <summary>
-    /// Gets or sets the RestClient
+    /// API client is mainly responible for making the HTTP call to the API backend.
     /// </summary>
-    /// <value>The RestClient.</value> 
-    public RestClient restClient { get; set; }
-
-    private Dictionary<String, String> defaultHeaderMap = new Dictionary<String, String>();
-
-    public Object CallApi(String Path, RestSharp.Method Method, Dictionary<String, String> QueryParams, String PostBody,
-      Dictionary<String, String> HeaderParams, Dictionary<String, String> FormParams, Dictionary<String, String> FileParams, String[] AuthSettings) {
-      var response = Task.Run(async () => {
-                            var resp = await CallApiAsync(Path, Method, QueryParams, PostBody, HeaderParams, FormParams, FileParams, AuthSettings);
-                            return resp;
-                            });
-        return response.Result;
-    }
-
-    public async Task<Object> CallApiAsync(String Path, RestSharp.Method Method, Dictionary<String, String> QueryParams, String PostBody,
-      Dictionary<String, String> HeaderParams, Dictionary<String, String> FormParams, Dictionary<String, String> FileParams, String[] AuthSettings) {
-
-      var request = new RestRequest(Path, Method);
+    public class ApiClient
+    {
+        private readonly Dictionary<String, String> _defaultHeaderMap = new Dictionary<String, String>();
+  
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApiClient" /> class.
+        /// </summary>
+        /// <param name="basePath">The base path.</param>
+        public ApiClient(String basePath="{{basePath}}")
+        {
+            BasePath = basePath;
+            RestClient = new RestClient(BasePath);
+        }
+    
+        /// <summary>
+        /// Gets or sets the base path.
+        /// </summary>
+        /// <value>The base path</value>
+        public string BasePath { get; set; }
+    
+        /// <summary>
+        /// Gets or sets the RestClient.
+        /// </summary>
+        /// <value>An instance of the RestClient</value>
+        public RestClient RestClient { get; set; }
+    
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        public Dictionary<String, String> DefaultHeader
+        {
+            get { return _defaultHeaderMap; }
+        }
 
-      UpdateParamsForAuth(QueryParams, HeaderParams, AuthSettings);
+        /// <summary>
+        /// Gets the status code of the previous request
+        /// </summary>
+        public int StatusCode { get; private set; }
 
-      // add default header, if any
-      foreach(KeyValuePair<string, string> defaultHeader in this.defaultHeaderMap)
-        request.AddHeader(defaultHeader.Key, defaultHeader.Value);
+        /// <summary>
+        /// Gets the response headers of the previous request
+        /// </summary>
+        public Dictionary<String, String> ResponseHeaders { get; private set; } 
+    
+        // Creates and sets up a RestRequest prior to a call.
+        private RestRequest PrepareRequest(
+            String path, RestSharp.Method method, Dictionary<String, String> queryParams, String postBody,
+            Dictionary<String, String> headerParams, Dictionary<String, String> formParams,
+            Dictionary<String, FileParameter> fileParams, Dictionary<String, String> pathParams, String[] authSettings)
+        {
+            var request = new RestRequest(path, method);
+   
+            UpdateParamsForAuth(queryParams, headerParams, authSettings);
 
-      // add header parameter, if any
-      foreach(KeyValuePair<string, string> param in HeaderParams)
-        request.AddHeader(param.Key, param.Value);
-     
-      // add query parameter, if any
-      foreach(KeyValuePair<string, string> param in QueryParams)
-        request.AddQueryParameter(param.Key, param.Value);
+            // add default header, if any
+            foreach(var defaultHeader in _defaultHeaderMap)
+                request.AddHeader(defaultHeader.Key, defaultHeader.Value);
 
-      // add form parameter, if any
-      foreach(KeyValuePair<string, string> param in FormParams)
-        request.AddParameter(param.Key, param.Value);
+            // add path parameter, if any
+            foreach(var param in pathParams)
+                request.AddParameter(param.Key, param.Value, ParameterType.UrlSegment); 
 
-      // add file parameter, if any
-      foreach(KeyValuePair<string, string> param in FileParams)
-        request.AddFile(param.Key, param.Value);
+            // add header parameter, if any
+            foreach(var param in headerParams)
+                request.AddHeader(param.Key, param.Value);
 
-      if (PostBody != null) {
-        request.AddParameter("application/json", PostBody, ParameterType.RequestBody); // http body (model) parameter
-      }
+            // add query parameter, if any
+            foreach(var param in queryParams)
+                request.AddQueryParameter(param.Key, param.Value);
 
-      return (Object) await restClient.ExecuteTaskAsync(request);
+            // add form parameter, if any
+            foreach(var param in formParams)
+                request.AddParameter(param.Key, param.Value);
 
-    }
+            // add file parameter, if any
+            foreach(var param in fileParams)
+                request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType);
 
-    /// <summary>
-    /// Add default header
-    /// </summary>
-    /// <param name="key">  Header field name
-    /// <param name="value"> Header field value
-    /// <returns></returns>
-    public void AddDefaultHeader(string key, string value) {
-       defaultHeaderMap.Add(key, value);
-    }
+            if (postBody != null) // http body (model) parameter
+                request.AddParameter("application/json", postBody, ParameterType.RequestBody);
+    
+            return request;
+        }
 
-    /// <summary>
-    /// Get default header
-    /// </summary>
-    /// <returns>Dictionary of default header</returns>
-    public Dictionary<String, String> GetDefaultHeader() {
-       return defaultHeaderMap;
-    }
+        /// <summary>
+        /// Makes the HTTP request (Sync).
+        /// </summary>
+        /// <param name="path">URL path.</param>
+        /// <param name="method">HTTP method.</param>
+        /// <param name="queryParams">Query parameters.</param>
+        /// <param name="postBody">HTTP body (POST request).</param>
+        /// <param name="headerParams">Header parameters.</param>
+        /// <param name="formParams">Form parameters.</param>
+        /// <param name="fileParams">File parameters.</param>
+        /// <param name="pathParams">Path parameters.</param>
+        /// <param name="authSettings">Authentication settings.</param>
+        /// <returns>Object</returns>
+        public Object CallApi(
+            String path, RestSharp.Method method, Dictionary<String, String> queryParams, String postBody,
+            Dictionary<String, String> headerParams, Dictionary<String, String> formParams,
+            Dictionary<String, FileParameter> fileParams, Dictionary<String, String> pathParams, String[] authSettings)
+        {
+            var request = PrepareRequest(
+                path, method, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+            var response = RestClient.Execute(request);
+            StatusCode = (int) response.StatusCode;
+            ResponseHeaders = response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString());
+            return (Object) response;
+        }
 
-    /// <summary>
-    /// escape string (url-encoded)
-    /// </summary>
-    /// <param name="str"> String to be escaped
-    /// <returns>Escaped string</returns>
-    public string EscapeString(string str) {
-      return str;
-    }
+        /// <summary>
+        /// Makes the asynchronous HTTP request.
+        /// </summary>
+        /// <param name="path">URL path.</param>
+        /// <param name="method">HTTP method.</param>
+        /// <param name="queryParams">Query parameters.</param>
+        /// <param name="postBody">HTTP body (POST request).</param>
+        /// <param name="headerParams">Header parameters.</param>
+        /// <param name="formParams">Form parameters.</param>
+        /// <param name="fileParams">File parameters.</param>
+        /// <param name="pathParams">Path parameters.</param>
+        /// <param name="authSettings">Authentication settings.</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,
+            Dictionary<String, String> headerParams, Dictionary<String, String> formParams,
+            Dictionary<String, FileParameter> fileParams, Dictionary<String, String> pathParams, String[] authSettings)
+        {
+            var request = PrepareRequest(
+                path, method, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+            var response = await RestClient.ExecuteTaskAsync(request);
+            StatusCode = (int)response.StatusCode;
+            ResponseHeaders = response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString());
+            return (Object)response;
+        }
+    
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        public void AddDefaultHeader(string key, string value)
+        {
+            _defaultHeaderMap.Add(key, value);
+        }
+    
+        /// <summary>
+        /// Escape string (url-encoded).
+        /// </summary>
+        /// <param name="str">String to be escaped.</param>
+        /// <returns>Escaped string.</returns>
+        public string EscapeString(string str)
+        {
+            return RestSharp.Extensions.StringExtensions.UrlEncode(str);
+        }
+    
+        /// <summary>
+        /// Create FileParameter based on Stream.
+        /// </summary>
+        /// <param name="name">Parameter name.</param>
+        /// <param name="stream">Input stream.</param>
+        /// <returns>FileParameter.</returns>
+        public FileParameter ParameterToFile(string name, Stream stream)
+        {
+            if (stream is FileStream)
+                return FileParameter.Create(name, stream.ReadAsBytes(), Path.GetFileName(((FileStream)stream).Name));
+            else
+                return FileParameter.Create(name, stream.ReadAsBytes(), "no_file_name_provided");
+        }
+    
+        /// <summary>
+        /// If parameter is DateTime, output in ISO8601 format.
+        /// If parameter is a list of string, join the list with ",".
+        /// Otherwise just return the string.
+        /// </summary>
+        /// <param name="obj">The parameter (header, path, query, form).</param>
+        /// <returns>Formatted string.</returns>
+        public string ParameterToString(object obj)
+        {
+            if (obj is DateTime)
+                return ((DateTime)obj).ToString ("u");
+            else if (obj is List<string>)
+                return String.Join(",", obj as List<string>);
+            else
+                return Convert.ToString (obj);
+        }
+    
+        /// <summary>
+        /// Deserialize the JSON string into a proper object.
+        /// </summary>
+        /// <param name="content">HTTP body (e.g. string, JSON).</param>
+        /// <param name="type">Object type.</param>
+        /// <returns>Object representation of the JSON string.</returns>
+        public object Deserialize(string content, Type type, IList<Parameter> headers=null)
+        {
+            if (type == typeof(Object)) // return an object
+            {
+                return content;
+            }
 
-    /// <summary>
-    /// if parameter is DateTime, output in ISO8601 format
-    /// if parameter is a list of string, join the list with ","
-    /// otherwise just return the string
-    /// </summary>
-    /// <param name="obj"> The parameter (header, path, query, form)
-    /// <returns>Formatted string</returns>
-    public string ParameterToString(object obj)
-    {
-      if (obj is DateTime) {
-        return ((DateTime)obj).ToString ("u");
-      } else if (obj is List<string>) {
-        return String.Join(",", obj as List<string>);
-      } else {
-	return Convert.ToString (obj);
-      }
-    }
+            if (type == typeof(Stream))
+            {
+                var filePath = String.IsNullOrEmpty(Configuration.TempFolderPath)
+                    ? Path.GetTempPath()
+                    : Configuration.TempFolderPath;
 
-    /// <summary>
-    /// Deserialize the JSON string into a proper object
-    /// </summary>
-    /// <param name="json"> JSON string
-    /// <param name="type"> Object type
-    /// <returns>Object representation of the JSON string</returns>
-    public object Deserialize(string content, Type type) {
-      if (type.GetType() == typeof(Object))
-        return (Object)content;
-
-      try
-      {
-          return JsonConvert.DeserializeObject(content, type);
-      }
-      catch (IOException e) {
-        throw new ApiException(500, e.Message);
-      }
-    }
+                var fileName = filePath + Guid.NewGuid();
+                if (headers != null)
+                {
+                    var regex = new Regex(@"Content-Disposition:.*filename=['""]?([^'""\s]+)['""]?$");
+                    var match = regex.Match(headers.ToString());
+                    if (match.Success)
+                        fileName = filePath + match.Value.Replace("\"", "").Replace("'", "");
+                }
+                File.WriteAllText(fileName, content);
+                return new FileStream(fileName, FileMode.Open);
 
-    /// <summary>
-    /// Serialize an object into JSON string
-    /// </summary>
-    /// <param name="obj"> Object 
-    /// <returns>JSON string</returns>
-    public string Serialize(object obj) {
-      try
-      {
-          return obj != null ? JsonConvert.SerializeObject(obj) : null;
-      }
-      catch (Exception e) {
-        throw new ApiException(500, e.Message);
-      }
-    }
+            }
 
-    /// <summary>
-    /// Get the API key with prefix
-    /// </summary>
-    /// <param name="obj"> Object 
-    /// <returns>API key with prefix</returns>
-    public string GetApiKeyWithPrefix (string apiKey)
-    {
-      var apiKeyValue = "";
-      Configuration.apiKey.TryGetValue (apiKey, out apiKeyValue);
-      var apiKeyPrefix = "";
-      if (Configuration.apiKeyPrefix.TryGetValue (apiKey, out apiKeyPrefix)) {
-        return apiKeyPrefix + " " + apiKeyValue;
-      } else {
-        return apiKeyValue;
-      }
-    }
+            if (type.Name.StartsWith("System.Nullable`1[[System.DateTime")) // return a datetime object
+            {
+                return DateTime.Parse(content,  null, System.Globalization.DateTimeStyles.RoundtripKind);
+            }
 
-    /// <summary>
-    /// Update parameters based on authentication
-    /// </summary>
-    /// <param name="QueryParams">Query parameters</param>
-    /// <param name="HeaderParams">Header parameters</param>
-    /// <param name="AuthSettings">Authentication settings</param>
-    public void UpdateParamsForAuth(Dictionary<String, String> QueryParams, Dictionary<String, String> HeaderParams, string[] AuthSettings) {
-      if (AuthSettings == null || AuthSettings.Length == 0)
-        return;
-  
-      foreach (string auth in AuthSettings) {
-        // determine which one to use
-        switch(auth) {
-          {{#authMethods}}
-          case "{{name}}":
-            {{#isApiKey}}{{#isKeyInHeader}}HeaderParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInHeader}}{{#isKeyInQuery}}QueryParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}HeaderParams["Authorization"] = "Basic " + Base64Encode(Configuration.username + ":" + Configuration.password);{{/isBasic}}
-            {{#isOAuth}}//TODO support oauth{{/isOAuth}}
-            break;
-          {{/authMethods}}
-          default:
-            //TODO show warning about security definition not found
-          break;
+            if (type == typeof(String) || type.Name.StartsWith("System.Nullable")) // return primitive type
+            {
+                return ConvertType(content, type); 
+            }
+    
+            // at this point, it must be a model (json)
+            try
+            {
+                return JsonConvert.DeserializeObject(content, type);
+            }
+            catch (Exception e)
+            {
+                throw new ApiException(500, e.Message);
+            }
         }
-      }
-
-    }
+    
+        /// <summary>
+        /// Serialize an object into JSON string.
+        /// </summary>
+        /// <param name="obj">Object.</param>
+        /// <returns>JSON string.</returns>
+        public string Serialize(object obj)
+        {
+            try
+            {
+                return obj != null ? JsonConvert.SerializeObject(obj) : null;
+            }
+            catch (Exception e)
+            {
+                throw new ApiException(500, e.Message);
+            }
+        }
+    
+        /// <summary>
+        /// Get the API key with prefix.
+        /// </summary>
+        /// <param name="apiKeyIdentifier">API key identifier (authentication scheme).</param>
+        /// <returns>API key with prefix.</returns>
+        public string GetApiKeyWithPrefix (string apiKeyIdentifier)
+        {
+            var apiKeyValue = "";
+            Configuration.ApiKey.TryGetValue (apiKeyIdentifier, out apiKeyValue);
+            var apiKeyPrefix = "";
+            if (Configuration.ApiKeyPrefix.TryGetValue (apiKeyIdentifier, out apiKeyPrefix))
+                return apiKeyPrefix + " " + apiKeyValue;
+            else
+                return apiKeyValue;
+        }
+    
+        /// <summary>
+        /// Update parameters based on authentication.
+        /// </summary>
+        /// <param name="queryParams">Query parameters.</param>
+        /// <param name="headerParams">Header parameters.</param>
+        /// <param name="authSettings">Authentication settings.</param>
+        public void UpdateParamsForAuth(Dictionary<String, String> queryParams, Dictionary<String, String> headerParams, string[] authSettings)
+        {
+            if (authSettings == null || authSettings.Length == 0)
+                return;
 
-    /// <summary>
-    /// Encode string in base64 format 
-    /// </summary>
-    /// <param name="text">String to be encoded</param>
-    public static string Base64Encode(string text) {
-      var textByte = System.Text.Encoding.UTF8.GetBytes(text);
-      return System.Convert.ToBase64String(textByte);
+            foreach (string auth in authSettings)
+            {
+                // determine which one to use
+                switch(auth)
+                {
+                    {{#authMethods}}
+                    case "{{name}}":
+                        {{#isApiKey}}{{#isKeyInHeader}}headerParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInHeader}}{{#isKeyInQuery}}queryParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}headerParams["Authorization"] = "Basic " + Base64Encode(Configuration.Username + ":" + Configuration.Password);{{/isBasic}}
+                        {{#isOAuth}}//TODO support oauth{{/isOAuth}}
+                        break;
+                    {{/authMethods}}
+                    default:
+                        //TODO show warning about security definition not found
+                        break;
+                }
+            }
+        }
+ 
+        /// <summary>
+        /// Encode string in base64 format.
+        /// </summary>
+        /// <param name="text">String to be encoded.</param>
+        /// <returns>Encoded string.</returns>
+        public static string Base64Encode(string text)
+        {
+            var textByte = System.Text.Encoding.UTF8.GetBytes(text);
+            return System.Convert.ToBase64String(textByte);
+        }
+    
+        /// <summary>
+        /// Dynamically cast the object into target type.
+        /// Ref: http://stackoverflow.com/questions/4925718/c-dynamic-runtime-cast
+        /// </summary>
+        /// <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) {
+            return Convert.ChangeType(source, dest);
+        }
+  
     }
-
-  }
 }
diff --git a/modules/swagger-codegen/src/main/resources/csharp/ApiException.mustache b/modules/swagger-codegen/src/main/resources/csharp/ApiException.mustache
index 38a340be249..364e2e99912 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/ApiException.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/ApiException.mustache
@@ -1,41 +1,47 @@
 using System;
 
-namespace {{invokerPackage}} {
+namespace {{packageName}}.Client {
   /// <summary>
   /// API Exception
   /// </summary>
   public class ApiException : Exception {
-    /// <summary>
-    /// Gets or sets the error code (HTTP status code)
-    /// </summary>
-    /// <value>The error code (HTTP status code).</value>
-    public int ErrorCode { get; set; }
+      /// <summary>
+      /// Gets or sets the error code (HTTP status code)
+      /// </summary>
+      /// <value>The error code (HTTP status code).</value>
+      public int ErrorCode { get; set; }
 
-    /// <summary>
-    /// Gets or sets the error content (body json object)
-    /// </summary>
-    /// <value>The error content (Http response body).</value>
-    public dynamic ErrorContent { get; private set; }
+      /// <summary>
+      /// Gets or sets the error content (body json object)
+      /// </summary>
+      /// <value>The error content (Http response body).</value>
+      public dynamic ErrorContent { get; private set; }
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ApiException"/> class.
-    /// </summary>
-    /// <param name="basePath">The base path.</param>
-    public ApiException() {}
+      /// <summary>
+      /// Initializes a new instance of the <see cref="ApiException"/> class.
+      /// </summary>
+      /// <param name="basePath">The base path.</param>
+      public ApiException() {}
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ApiException"/> class.
-    /// </summary>
-    /// <param name="errorCode">HTTP status code.</param>
-    /// <param name="message">Error message.</param>
-    public ApiException(int errorCode, string message) : base(message) {
-      this.ErrorCode = errorCode;
-    }
+      /// <summary>
+      /// Initializes a new instance of the <see cref="ApiException"/> class.
+      /// </summary>
+      /// <param name="errorCode">HTTP status code.</param>
+      /// <param name="message">Error message.</param>
+      public ApiException(int errorCode, string message) : base(message) {
+          this.ErrorCode = errorCode;
+      }
 
-    public ApiException(int errorCode, string message, dynamic errorContent = null) : base(message) {
-       this.ErrorCode = errorCode;
-       this.ErrorContent = errorContent;
-    }
+      /// <summary>
+      /// Initializes a new instance of the <see cref="ApiException"/> class.
+      /// </summary>
+      /// <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) {
+          this.ErrorCode = errorCode;
+          this.ErrorContent = errorContent;
+      }
 
   }
 
diff --git a/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache b/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache
index 1f5c00a356d..67b07069e2f 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache
@@ -1,47 +1,99 @@
 using System;
+using System.Reflection;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Net;
 using System.Text;
-using {{invokerPackage}};
-
-namespace {{invokerPackage}} {
-  /// <summary>
-  /// Represents a set of configuration settings
-  /// </summary>
-  public class Configuration{
-
-    /// <summary>
-    /// Gets or sets the API client. This is the default API client for making HTTP calls.
-    /// </summary>
-    /// <value>The API client.</value>
-    public static ApiClient apiClient = new ApiClient();
 
+namespace {{packageName}}.Client
+{
     /// <summary>
-    /// Gets or sets the username (HTTP basic authentication)
+    /// Represents a set of configuration settings
     /// </summary>
-    /// <value>The username.</value>
-    public static String username { get; set; }
-
-    /// <summary>
-    /// Gets or sets the password (HTTP basic authentication)
-    /// </summary>
-    /// <value>The password.</value>
-    public static String password { get; set; }
-
-    /// <summary>
-    /// Gets or sets the API key based on the authentication name 
-    /// </summary>
-    /// <value>The API key.</value>
-    public static 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>
-    /// <value>The prefix of the API key.</value>
-    public static Dictionary<String, String> apiKeyPrefix = new Dictionary<String, String>();
-
-
-  }
+    public class Configuration
+    {
+  
+        /// <summary>
+        /// Version of the package.
+        /// </summary>
+        /// <value>Version of the package.</value>
+        public const string Version = "{{packageVersion}}";
+  
+        /// <summary>
+        /// Gets or sets the default API client for making HTTP calls.
+        /// </summary>
+        /// <value>The API client.</value>
+        public static ApiClient DefaultApiClient = new ApiClient();
+  
+        /// <summary>
+        /// Gets or sets the username (HTTP basic authentication).
+        /// </summary>
+        /// <value>The username.</value>
+        public static String Username { get; set; }
+  
+        /// <summary>
+        /// Gets or sets the password (HTTP basic authentication).
+        /// </summary>
+        /// <value>The password.</value>
+        public static String Password { get; set; }
+  
+        /// <summary>
+        /// Gets or sets the API key based on the authentication name.
+        /// </summary>
+        /// <value>The API key.</value>
+        public static 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>
+        /// <value>The prefix of the API key.</value>
+        public static Dictionary<String, String> ApiKeyPrefix = new Dictionary<String, String>();
+  
+        private static string _tempFolderPath = Path.GetTempPath();
+  
+        /// <summary>
+        /// Gets or sets the temporary folder path to store the files downloaded from the server.
+        /// </summary>
+        /// <value>Folder path.</value>
+        public static String TempFolderPath
+        {
+            get { return _tempFolderPath; }
+  
+            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;
+                else
+                    _tempFolderPath = value  + Path.DirectorySeparatorChar;
+            }
+        }
+  
+        /// <summary>
+        /// Returns a string with essential information for debugging.
+        /// </summary>
+        public static String ToDebugReport()
+        {
+            String report = "C# SDK ({{packageName}}) Debug Report:\n";
+            report += "    OS: " + Environment.OSVersion + "\n";
+            report += "    .NET Framework Version: " + Assembly
+                     .GetExecutingAssembly()
+                     .GetReferencedAssemblies()
+                     .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
index 26fdaffec14..ae725c4b598 100644
Binary files a/modules/swagger-codegen/src/main/resources/csharp/Newtonsoft.Json.dll and b/modules/swagger-codegen/src/main/resources/csharp/Newtonsoft.Json.dll differ
diff --git a/modules/swagger-codegen/src/main/resources/csharp/README.md b/modules/swagger-codegen/src/main/resources/csharp/README.md
new file mode 100644
index 00000000000..bbab203d23f
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/csharp/README.md
@@ -0,0 +1,15 @@
+## Frameworks supported
+- .NET 3.5 or later
+- Windows Phone 7.1 (Mango)
+
+## Dependencies
+- [RestSharp] (https://www.nuget.org/packages/RestSharp)
+- [Json.NET] (https://www.nuget.org/packages/Newtonsoft.Json/)
+
+
+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:
+```
+Install-Package RestSharp
+Install-Package Newtonsoft.Json
+``` 
+
diff --git a/modules/swagger-codegen/src/main/resources/csharp/RestSharp.dll b/modules/swagger-codegen/src/main/resources/csharp/RestSharp.dll
index c1da1b588cd..a7331ed6e23 100644
Binary files a/modules/swagger-codegen/src/main/resources/csharp/RestSharp.dll and b/modules/swagger-codegen/src/main/resources/csharp/RestSharp.dll differ
diff --git a/modules/swagger-codegen/src/main/resources/csharp/api.mustache b/modules/swagger-codegen/src/main/resources/csharp/api.mustache
index e22d5517ab5..24c65f85ba8 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/api.mustache
@@ -1,173 +1,178 @@
 using System;
+using System.IO;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using RestSharp;
-using {{invokerPackage}};
-using {{modelPackage}};
-{{#imports}}
-{{/imports}}
-
-namespace {{package}} {
-  {{#operations}}
-
-  public interface I{{classname}} {
-    {{#operation}}
-    /// <summary>
-    /// {{summary}} {{notes}}
-    /// </summary>
-    {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>{{/allParams}}
-    /// <returns>{{#returnType}}{{{returnType}}}{{/returnType}}</returns>
-    {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
-
-    /// <summary>
-    /// {{summary}} {{notes}}
-    /// </summary>
-    {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>{{/allParams}}
-    /// <returns>{{#returnType}}{{{returnType}}}{{/returnType}}</returns>
-    {{#returnType}}Task<{{{returnType}}}>{{/returnType}}{{^returnType}}Task{{/returnType}} {{nickname}}Async ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
-    {{/operation}}
-  }
-
-  /// <summary>
-  /// Represents a collection of functions to interact with the API endpoints
-  /// </summary>
-  public class {{classname}} : I{{classname}} {
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="{{classname}}"/> class.
-    /// </summary>
-    /// <param name="apiClient"> an instance of ApiClient (optional)
-    /// <returns></returns>
-    public {{classname}}(ApiClient apiClient = null) {
-      if (apiClient == null) { // use the default one in Configuration
-        this.apiClient = Configuration.apiClient; 
-      } else {
-        this.apiClient = apiClient;
-      }
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="{{classname}}"/> class.
-    /// </summary>
-    /// <returns></returns>
-    public {{classname}}(String basePath)
+using {{packageName}}.Client;
+{{#hasImport}}using {{packageName}}.Model;
+{{/hasImport}}
+
+namespace {{packageName}}.Api
+{
+    {{#operations}}
+    public interface I{{classname}}
     {
-      this.apiClient = new ApiClient(basePath);
-    }
-
-    /// <summary>
-    /// Sets the base path of the API client.
-    /// </summary>
-    /// <value>The base path</value>
-    public void SetBasePath(String basePath) {
-      this.apiClient.basePath = basePath;
-    }
-
-    /// <summary>
-    /// Gets the base path of the API client.
-    /// </summary>
-    /// <value>The base path</value>
-    public String GetBasePath(String basePath) {
-      return this.apiClient.basePath;
+        {{#operation}}
+        /// <summary>
+        /// {{summary}} {{notes}}
+        /// </summary>
+        {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
+        {{/allParams}}/// <returns>{{#returnType}}{{{returnType}}}{{/returnType}}</returns>
+        {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
+  
+        /// <summary>
+        /// {{summary}} {{notes}}
+        /// </summary>
+        {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
+        {{/allParams}}/// <returns>{{#returnType}}{{{returnType}}}{{/returnType}}</returns>
+        {{#returnType}}System.Threading.Tasks.Task<{{{returnType}}}>{{/returnType}}{{^returnType}}System.Threading.Tasks.Task{{/returnType}} {{nickname}}Async ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
+        {{/operation}}
     }
-
-    /// <summary>
-    /// Gets or sets the API client.
-    /// </summary>
-    /// <value>The API client</value>
-    public ApiClient apiClient {get; set;}
-
-
-    {{#operation}}
+  
     /// <summary>
-    /// {{summary}} {{notes}}
-    /// </summary>
-    {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>{{/allParams}}
-    /// <returns>{{#returnType}}{{{returnType}}}{{/returnType}}</returns>
-    public {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#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 {{nickname}}");
-      {{/required}}{{/allParams}}
-
-      var path = "{{path}}";
-      path = path.Replace("{format}", "json");
-      {{#pathParams}}path = path.Replace("{" + "{{baseName}}" + "}", apiClient.ParameterToString({{{paramName}}}));
-      {{/pathParams}}
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      {{#queryParams}} if ({{paramName}} != null) queryParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // query parameter
-      {{/queryParams}}
-      {{#headerParams}} if ({{paramName}} != null) headerParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // header parameter
-      {{/headerParams}}
-      {{#formParams}}if ({{paramName}} != null) {{#isFile}}fileParams.Add("{{baseName}}", {{paramName}});{{/isFile}}{{^isFile}}formParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // form parameter{{/isFile}}
-      {{/formParams}}
-      {{#bodyParam}}postBody = apiClient.Serialize({{paramName}}); // http body (model) parameter
-      {{/bodyParam}}
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.{{httpMethod}}, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling {{nickname}}: " + response.Content, response.Content);
-      }
-      {{#returnType}}return ({{{returnType}}}) apiClient.Deserialize(response.Content, typeof({{{returnType}}}));{{/returnType}}{{^returnType}}
-      return;{{/returnType}}
-    }
-	
-	 /// <summary>
-    /// {{summary}} {{notes}}
+    /// Represents a collection of functions to interact with the API endpoints
     /// </summary>
-    {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>{{/allParams}}
-    /// <returns>{{#returnType}}{{{returnType}}}{{/returnType}}</returns>
-    public async {{#returnType}}Task<{{{returnType}}}>{{/returnType}}{{^returnType}}Task{{/returnType}} {{nickname}}Async ({{#allParams}}{{{dataType}}} {{paramName}}{{#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 {{nickname}}");
-      {{/required}}{{/allParams}}
-
-      var path = "{{path}}";
-      path = path.Replace("{format}", "json");
-      {{#pathParams}}path = path.Replace("{" + "{{baseName}}" + "}", apiClient.ParameterToString({{{paramName}}}));
-      {{/pathParams}}
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      {{#queryParams}} if ({{paramName}} != null) queryParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // query parameter
-      {{/queryParams}}
-      {{#headerParams}} if ({{paramName}} != null) headerParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // header parameter
-      {{/headerParams}}
-      {{#formParams}}if ({{paramName}} != null) {{#isFile}}fileParams.Add("{{baseName}}", {{paramName}});{{/isFile}}{{^isFile}}formParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // form parameter{{/isFile}}
-      {{/formParams}}
-      {{#bodyParam}}postBody = apiClient.Serialize({{paramName}}); // http body (model) parameter
-      {{/bodyParam}}
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.{{httpMethod}}, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling {{nickname}}: " + response.Content, response.Content);
-      }
-      {{#returnType}}return ({{{returnType}}}) apiClient.Deserialize(response.Content, typeof({{{returnType}}}));{{/returnType}}{{^returnType}}
-      return;{{/returnType}}
+    public class {{classname}} : I{{classname}}
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="{{classname}}"/> class.
+        /// </summary>
+        /// <param name="apiClient"> an instance of ApiClient (optional)</param>
+        /// <returns></returns>
+        public {{classname}}(ApiClient apiClient = null)
+        {
+            if (apiClient == null) // use the default one in Configuration
+                this.ApiClient = Configuration.DefaultApiClient; 
+            else
+                this.ApiClient = apiClient;
+        }
+    
+        /// <summary>
+        /// Initializes a new instance of the <see cref="{{classname}}"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public {{classname}}(String basePath)
+        {
+            this.ApiClient = new ApiClient(basePath);
+        }
+    
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <param name="basePath">The base path</param>
+        /// <value>The base path</value>
+        public void SetBasePath(String basePath)
+        {
+            this.ApiClient.BasePath = basePath;
+        }
+    
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <param name="basePath">The base path</param>
+        /// <value>The base path</value>
+        public String GetBasePath(String basePath)
+        {
+            return this.ApiClient.BasePath;
+        }
+    
+        /// <summary>
+        /// Gets or sets the API client.
+        /// </summary>
+        /// <value>An instance of the ApiClient</param>
+        public ApiClient ApiClient {get; set;}
+    
+        {{#operation}}
+        /// <summary>
+        /// {{summary}} {{notes}}
+        /// </summary>
+        {{#allParams}}/// <param name="{{paramName}}">{{description}}</param> 
+        {{/allParams}}/// <returns>{{#returnType}}{{{returnType}}}{{/returnType}}</returns>            
+        public {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#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 {{nickname}}");
+            {{/required}}{{/allParams}}
+    
+            var path = "{{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;
+
+            pathParams.Add("format", "json");
+            {{#pathParams}}if ({{paramName}} != null) pathParams.Add("{{baseName}}", ApiClient.ParameterToString({{paramName}})); // path parameter
+            {{/pathParams}}
+            {{#queryParams}}if ({{paramName}} != null) queryParams.Add("{{baseName}}", ApiClient.ParameterToString({{paramName}})); // query parameter
+            {{/queryParams}}
+            {{#headerParams}}if ({{paramName}} != null) headerParams.Add("{{baseName}}", ApiClient.ParameterToString({{paramName}})); // header parameter
+            {{/headerParams}}
+            {{#formParams}}if ({{paramName}} != null) {{#isFile}}fileParams.Add("{{baseName}}", ApiClient.ParameterToFile("{{baseName}}", {{paramName}}));{{/isFile}}{{^isFile}}formParams.Add("{{baseName}}", ApiClient.ParameterToString({{paramName}})); // form parameter{{/isFile}}
+            {{/formParams}}
+            {{#bodyParam}}postBody = ApiClient.Serialize({{paramName}}); // http body (model) parameter
+            {{/bodyParam}}
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.{{httpMethod}}, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling {{nickname}}: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling {{nickname}}: " + response.ErrorMessage, response.ErrorMessage);
+    
+            {{#returnType}}return ({{{returnType}}}) ApiClient.Deserialize(response.Content, typeof({{{returnType}}}), response.Headers);{{/returnType}}{{^returnType}}return;{{/returnType}}
+        }
+    
+        /// <summary>
+        /// {{summary}} {{notes}}
+        /// </summary>
+        {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
+        {{/allParams}}/// <returns>{{#returnType}}{{{returnType}}}{{/returnType}}</returns>
+        {{#returnType}}public async System.Threading.Tasks.Task<{{{returnType}}}>{{/returnType}}{{^returnType}}public async System.Threading.Tasks.Task{{/returnType}} {{nickname}}Async ({{#allParams}}{{{dataType}}} {{paramName}}{{#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 {{nickname}}");
+            {{/required}}{{/allParams}}
+    
+            var path = "{{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;
+    
+            pathParams.Add("format", "json");
+            {{#pathParams}}if ({{paramName}} != null) pathParams.Add("{{baseName}}", ApiClient.ParameterToString({{paramName}})); // path parameter
+            {{/pathParams}}
+            {{#queryParams}}if ({{paramName}} != null) queryParams.Add("{{baseName}}", ApiClient.ParameterToString({{paramName}})); // query parameter
+            {{/queryParams}}
+            {{#headerParams}}if ({{paramName}} != null) headerParams.Add("{{baseName}}", ApiClient.ParameterToString({{paramName}})); // header parameter
+            {{/headerParams}}
+            {{#formParams}}if ({{paramName}} != null) {{#isFile}}fileParams.Add("{{baseName}}", ApiClient.ParameterToFile("{{baseName}}", {{paramName}}));{{/isFile}}{{^isFile}}formParams.Add("{{baseName}}", ApiClient.ParameterToString({{paramName}})); // form parameter{{/isFile}}
+            {{/formParams}}
+            {{#bodyParam}}postBody = ApiClient.Serialize({{paramName}}); // http body (model) parameter
+            {{/bodyParam}}
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.{{httpMethod}}, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling {{nickname}}: " + response.Content, response.Content);
+
+            {{#returnType}}return ({{{returnType}}}) ApiClient.Deserialize(response.Content, typeof({{{returnType}}}), response.Headers);{{/returnType}}{{^returnType}}
+            return;{{/returnType}}
+        }
+        {{/operation}}
     }
-    {{/operation}}
-  }  
-  {{/operations}}
+    {{/operations}}
 }
diff --git a/modules/swagger-codegen/src/main/resources/csharp/compile.mustache b/modules/swagger-codegen/src/main/resources/csharp/compile.mustache
index ed4481bb4bb..e35879e0efa 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/compile.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/compile.mustache
@@ -1,3 +1,3 @@
 SET CSCPATH=%SYSTEMROOT%\Microsoft.NET\Framework\v4.0.30319
-%CSCPATH%\csc /reference:bin/Newtonsoft.Json.dll;bin/RestSharp.dll /target:library /out:bin/{{invokerPackage}}.dll /recurse:src\*.cs /doc:bin/{{invokerPackage}}.xml
+%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/model.mustache b/modules/swagger-codegen/src/main/resources/csharp/model.mustache
index 111c98993a2..99da4f8302a 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/model.mustache
@@ -7,7 +7,7 @@ using Newtonsoft.Json;
 
 {{#models}}
 {{#model}}
-namespace {{package}} {
+namespace {{packageName}}.Model {
 
   /// <summary>
   /// {{description}}
@@ -15,7 +15,10 @@ namespace {{package}} {
   [DataContract]
   public class {{classname}}{{#parent}} : {{{parent}}}{{/parent}} {
     {{#vars}}
-    {{#description}}/* {{{description}}} */{{/description}}
+    /// <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; }
 
@@ -44,6 +47,6 @@ namespace {{package}} {
     }
 
 }
-  {{/model}}
-  {{/models}}
-}
\ No newline at end of file
+{{/model}}
+{{/models}}
+}
diff --git a/modules/swagger-codegen/src/main/resources/flash/api.mustache b/modules/swagger-codegen/src/main/resources/flash/api.mustache
index b1f11e92438..7fa8cb03d0a 100644
--- a/modules/swagger-codegen/src/main/resources/flash/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/flash/api.mustache
@@ -56,7 +56,7 @@ public class {{classname}} extends SwaggerApi {
         {{#headerParams}}headerParams["{{paramName}}"] = toPathValue({{paramName}});
         {{/headerParams}}
 
-        var token:AsyncToken = getApiInvoker().invokeAPI(path, "{{httpMethod}}", queryParams, {{#bodyParam}}{{bodyParam}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}, headerParams);
+        var token:AsyncToken = getApiInvoker().invokeAPI(path, "{{httpMethod}}", queryParams, {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}, headerParams);
 
         var requestId: String = getUniqueId();
 
@@ -70,4 +70,4 @@ public class {{classname}} extends SwaggerApi {
     {{/operation}}
 }
         {{/operations}}
-}
\ No newline at end of file
+}
diff --git a/modules/swagger-codegen/src/main/resources/flash/model.mustache b/modules/swagger-codegen/src/main/resources/flash/model.mustache
index c3369514e80..a365a99f2cf 100644
--- a/modules/swagger-codegen/src/main/resources/flash/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/flash/model.mustache
@@ -7,34 +7,30 @@ package {{package}} {
 {{#model}}
     [XmlRootNode(name="{{classname}}")]
     public class {{classname}} {
-    {{#vars}}
-
-    {{#description}}/* {{description}} */
-    {{/description}}
-
-        {{#isList}}
+        {{#vars}}
+        {{#description}}/* {{description}} */
+        {{/description}}
+        {{#isContainer}}
         // This declaration below of _{{name}}_obj_class is to force flash compiler to include this class
         private var _{{name}}_obj_class: {{baseType}} = null;
-        [XmlElementWrapper(name="{{name}}")]
-        [XmlElements(name="{{nameSingular}}", type="{{baseType}}")]
-        {{/isList}}
-        {{#isNotContainer}}[XmlElement(name="{{name}}")]
-        {{/isNotContainer}}
+        [XmlElementWrapper(name="{{baseName}}")]
+        [XmlElements(name="{{name}}", type="{{baseType}}")]
+        {{/isContainer}}
+        {{^isContainer}}[XmlElement(name="{{baseName}}")]
+        {{/isContainer}}
         public var {{name}}: {{{datatype}}} = {{{defaultValue}}};
-
     {{/vars}}
 
-        public function toString(): String {
-            var str: String = "{{classname}}: ";
-            {{#vars}}
-            str += " ({{name}}: " + {{name}} + ")";
-            {{/vars}}
-            return str;
-        }
-
+    public function toString(): String {
+        var str: String = "{{classname}}: ";
+        {{#vars}}
+        str += " ({{name}}: " + {{name}} + ")";
+        {{/vars}}
+        return str;
+    }
 
 }
 {{/model}}
-        {{/models}}
+{{/models}}
 
 }
diff --git a/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache b/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache
index ce881084bc2..584db3b7a85 100644
--- a/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache
+++ b/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache
@@ -1,52 +1,158 @@
-<html lang="en">
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <meta charset="utf-8" />
-    <title>API Reference</title>
+    <title>{{{appName}}}</title>
+    <link rel="stylesheet" type="text/css" href="site.css" media="screen" />
+    <style type="text/css">
+      {{>style.css}}
+    </style>
           <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
   <body>
   <h1>{{{appName}}}</h1>
-    <div class="app-desc">{{{appDescription}}} for {{partner}}</div>
+    <div class="app-desc">{{{appDescription}}}</div>
     {{#infoUrl}}<div class="app-desc">More information: <a href="{{{infoUrl}}}">{{{infoUrl}}}</a></div>{{/infoUrl}}
     {{#infoEmail}}<div class="app-desc">Contact Info: <a href="{{{infoEmail}}}">{{{infoEmail}}}</a></div>{{/infoEmail}}
     {{#version}}<div class="app-desc">Version: {{{version}}}</div>{{/version}}
     <div class="license-info">{{{licenseInfo}}}</div>
     <div class="license-url">{{{licenseUrl}}}</div>
   <h2>Access</h2>
-  <div class="method-summary">Customize this message as you see fit!</div>
-  <h2>Methods</h2>
+  {{access}}
+
+  <h2><a name="__Methods">Methods</a></h2>
+  [ Jump to <a href="#__Models">Models</a> ]
+
+  {{! for the tables of content, I cheat and don't use CSS styles.... }}
+  <h2>Table of Contents </h2>
+  <div class="method-summary">{{access}}</div>
+  {{#apiInfo}}
+  <ol>
+  {{#apis}}
+  {{#operations}}
+  {{#operation}}
+  <li><a href="#{{nickname}}"><code><span class="http-method">{{httpMethod}}</span> {{path}}</code></a></li>
+  {{/operation}}
+  {{/operations}}
+  {{/apis}}
+  </ol>
+  {{/apiInfo}}
+
   {{#apiInfo}}
   {{#apis}}
-  {{#operations}}{{#operation}}
-  <div class="method">
-    <div class="method-path"><pre class="{{httpMethod}}"><code class="huge"><span>{{httpMethod}}</span>: {{path}}</code></pre></div>
-    <div class="method-tags"> {{#tags}}<span class="method-tag">{{this}}</span>{{/tags}}</div>
-    <div class="method-summary"><span class="nickname">{{nickname}}</span> {{summary}}</div>
+  {{#operations}}
+  {{#operation}}
+  <div class="method"><a name="{{nickname}}"/>
+    <div class="method-path">
+    <a class="up" href="#__Methods">Up</a>
+    <pre class="{{httpMethod}}"><code class="huge"><span class="http-method">{{httpMethod}}</span> {{path}}</code></pre></div>
+    <div class="method-summary">{{summary}} (<span class="nickname">{{nickname}}</span>)</div>
+    {{! notes is operation.description. So why rename it and make it super confusing???? }}
     <div class="method-notes">{{notes}}</div>
 
-    <h3 class="field-label">Parameters</h3>
+    {{#hasPathParams}}
+    <h3 class="field-label">Path parameters</h3>
     <div class="field-items">
-      {{#allParams}}{{>queryParam}}{{>pathParam}}{{>bodyParam}}{{>headerParam}}{{>formParam}}
-      {{/allParams}}
+      {{#pathParams}}{{>pathParam}}{{/pathParams}}
     </div>  <!-- field-items -->
-    <h3 class="field-label">Return type</h3>
+    {{/hasPathParams}}
+
+    {{#hasConsumes}}
+    <h3 class="field-label">Consumes</h3>
+    This API call consumes the following media types via the <span class="heaader">Content-Type</span> request header:
+    <ul>
+    {{#consumes}}
+      <li><code>{{mediaType}}</code></li>
+    {{/consumes}}
+    </ul>
+    {{/hasConsumes}}
+
+    {{#hasBodyParam}}
+    <h3 class="field-label">Request body</h3>
+    <div class="field-items">
+      {{#bodyParams}}{{>bodyParam}}{{/bodyParams}}
+    </div>  <!-- field-items -->
+    {{/hasBodyParam}}
+
+    {{#hasHeaderParam}}
+    <h3 class="field-label">Request headers</h3>
+    <div class="field-items">
+      {{#headerParam}}{{>headerParam}}{{/headerParam}}
+    </div>  <!-- field-items -->
+    {{/hasHeaderParam}}
+
+    {{#hasQueryParams}}
+    <h3 class="field-label">Query parameters</h3>
+    <div class="field-items">
+      {{#queryParams}}{{>queryParam}}{{/queryParams}}
+    </div>  <!-- field-items -->
+    {{/hasQueryParams}}
 
+    <!-- Remove Return type... unclear where this comes from;
+         for our swagger.json files, it is always empty and there is no boolean guard or hasReturnType
+         do we end up with a heading but not content
+
+    {{#returnType}}
+    <h3 class="field-label">Return type</h3>
     <div class="return-type"><a href="#{{returnContainer}}">{{{returnType}}}</a></div>
+    {{/returnType}}
 
+    Todo: process Response Object and its headers, schema, examples
+    -->
+
+    {{#hasExamples}}
+    {{#examples}}
+    <h3 class="field-label">Example data</h3>
+    <div class="example-data-content-type">Content-Type: {{{contentType}}}</div>
+    <pre class="example"><code>{{{example}}}</code></pre>
+    {{/examples}}
+    {{/hasExamples}}
+
+    {{#hasProduces}}
+    <h3 class="field-label">Produces</h3>
+    This API call produces the following media types according to the <span class="header">Accept</span> request header;
+    the media type will be conveyed by the <span class="heaader">Content-Type</span> response header.
+    <ul>
+    {{#produces}}
+      <li><code>{{mediaType}}</code></li>
+    {{/produces}}
+    </ul>
+    {{/hasProduces}}
+
+    <h3 class="field-label">Responses</h3>
+    {{#responses}}
+    <h4 class="field-label">{{code}}</h4>
+    {{message}}
     {{#examples}}
     <h3 class="field-label">Example data</h3>
     <div class="example-data-content-type">Content-Type: {{{contentType}}}</div>
     <pre class="example"><code>{{example}}</code></pre>
     {{/examples}}
+    {{/responses}}
   </div> <!-- method -->
-  <hr>
-  {{/operation}}{{/operations}}
-  {{/apis}}{{/apiInfo}}
+  <hr/>
+  {{/operation}}
+  {{/operations}}
+  {{/apis}}
+  {{/apiInfo}}
+
+  <div class="up"><a href="#__Models">Up</a></div>
+  <h2><a name="__Models">Models</a></h2>
+  [ Jump to <a href="#__Methods">Methods</a> ]
+
+  <h2>Table of Contents</h2>
+  <ol>
+  {{#models}}
+  {{#model}}
+    <li><a href="#{{classname}}"><code>{{classname}}</code></a></li>
+  {{/model}}
+  {{/models}}
+  </ol>
 
-  <h2>Models</h2>
   {{#models}}
   {{#model}}
   <div class="model">
-    <h3 class="field-label"><a name="{{classname}}">{{classname}}</a></h3>
+    <h3 class="field-label"><a name="{{classname}}">{{classname}}</a> <a class="up" href="#__Models">Up</a></h3>
     <div class="field-items">
       {{#vars}}<div class="param">{{name}} {{#isNotRequired}}(optional){{/isNotRequired}}</div><div class="param-desc"><span class="param-type">{{datatype}}</span> {{description}}</div>
       {{/vars}}
@@ -54,8 +160,5 @@
   </div>
   {{/model}}
   {{/models}}
-  <style>
-{{>style.css}}
-  </style>
   </body>
 </html>
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/htmlDocs/style.css.mustache b/modules/swagger-codegen/src/main/resources/htmlDocs/style.css.mustache
index 14ab06a7f7e..d69f0e7b161 100644
--- a/modules/swagger-codegen/src/main/resources/htmlDocs/style.css.mustache
+++ b/modules/swagger-codegen/src/main/resources/htmlDocs/style.css.mustache
@@ -57,6 +57,10 @@ pre {
   margin-bottom: 2px;
 }
 
+.http-method {
+ text-transform: uppercase;
+}
+
 pre.get {
   background-color: #0f6ab4;
 }
@@ -96,6 +100,10 @@ code {
   background-color: #0f6ab4;
 }
 
+.up {
+  float:right;
+}
+
 .parameter {
   width: 500px;
 }
diff --git a/modules/swagger-codegen/src/main/resources/nodejs/swagger.mustache b/modules/swagger-codegen/src/main/resources/nodejs/swagger.mustache
index 8b4c8d33bdc..3b975e53b80 100644
--- a/modules/swagger-codegen/src/main/resources/nodejs/swagger.mustache
+++ b/modules/swagger-codegen/src/main/resources/nodejs/swagger.mustache
@@ -12,27 +12,28 @@
   "paths": {
 {{#apis}}
 {{#operations}}
-  {{#operation}}
+  {{#operationsByPath}}
   "{{{path}}}": {
+    {{#operation}}
     "{{httpMethod}}": {
+      "summary": "{{summary}}",
+      "description":"{{notes}}",
       "x-swagger-router-controller": "{{classname}}",
       "tags": ["{{baseName}}"],
       "operationId": "{{operationId}}",{{#hasParams}}
       "parameters": [
-        {{#allParams}}
-        {{{jsonSchema}}}{{#hasMore}},{{/hasMore}}
+        {{#allParams}}{{{jsonSchema}}}{{#hasMore}},{{/hasMore}}
         {{/allParams}}
       ],{{/hasParams}}
       "responses": {
-        {{#responses}}
-        "{{code}}": {{{jsonSchema}}}
+        {{#responses}}"{{code}}": {{{jsonSchema}}}
         {{#hasMore}},{{/hasMore}}
         {{/responses}}
       }
-    }
+    } {{#hasMore}},{{/hasMore}}
+    {{/operation}}
   } {{#hasMore}},{{/hasMore}}
-  {{/operation}}
-   {{#hasMore}},{{/hasMore}}
+  {{/operationsByPath}}
 {{/operations}}
 {{/apis}}
 {{/apiInfo}}
diff --git a/modules/swagger-codegen/src/main/resources/objc/ApiClient-body.mustache b/modules/swagger-codegen/src/main/resources/objc/ApiClient-body.mustache
new file mode 100644
index 00000000000..b7643de6ddd
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/objc/ApiClient-body.mustache
@@ -0,0 +1,729 @@
+#import "{{classPrefix}}ApiClient.h"
+
+NSString *const {{classPrefix}}ResponseObjectErrorKey = @"{{classPrefix}}ResponseObject";
+
+static long requestId = 0;
+static bool offlineState = false;
+static NSMutableSet * queuedRequests = nil;
+static bool cacheEnabled = false;
+static AFNetworkReachabilityStatus reachabilityStatus = AFNetworkReachabilityStatusNotReachable;
+static void (^reachabilityChangeBlock)(int);
+
+@implementation {{classPrefix}}ApiClient
+
+- (instancetype)init {
+    NSString *baseUrl = [[{{classPrefix}}Configuration sharedConfig] host];
+    return [self initWithBaseURL:[NSURL URLWithString:baseUrl]];
+}
+
+- (instancetype)initWithBaseURL:(NSURL *)url {
+    self = [super initWithBaseURL:url];
+    if (self) {
+        self.requestSerializer = [AFJSONRequestSerializer serializer];
+        self.responseSerializer = [AFJSONResponseSerializer serializer];
+        // configure reachability
+        [self configureCacheReachibility];
+    }
+    return self;
+}
+
++ (void)initialize {
+    if (self == [{{classPrefix}}ApiClient class]) {
+        queuedRequests = [[NSMutableSet alloc] init];
+        // initialize URL cache
+        [self configureCacheWithMemoryAndDiskCapacity:4*1024*1024 diskSize:32*1024*1024];
+    }
+}
+
+#pragma mark - Setter Methods
+
++ (void) setOfflineState:(BOOL) state {
+    offlineState = state;
+}
+
++ (void) setCacheEnabled:(BOOL)enabled {
+    cacheEnabled = enabled;
+}
+
+- (void)setHeaderValue:(NSString*) value
+                forKey:(NSString*) forKey {
+    [self.requestSerializer setValue:value forHTTPHeaderField:forKey];
+}
+
+#pragma mark - Log Methods
+
+- (void)logResponse:(AFHTTPRequestOperation *)operation
+         forRequest:(NSURLRequest *)request
+              error:(NSError*)error {
+    {{classPrefix}}Configuration *config = [{{classPrefix}}Configuration sharedConfig];
+
+    NSString *message = [NSString stringWithFormat:@"\n[DEBUG] Request body \n~BEGIN~\n %@\n~END~\n"\
+                         "[DEBUG] HTTP Response body \n~BEGIN~\n %@\n~END~\n",
+                        [[NSString alloc] initWithData:request.HTTPBody encoding:NSUTF8StringEncoding],
+                        operation.responseString];
+
+    if (config.loggingFileHanlder) {
+        [config.loggingFileHanlder seekToEndOfFile];
+        [config.loggingFileHanlder writeData:[message dataUsingEncoding:NSUTF8StringEncoding]];
+    }
+
+    NSLog(@"%@", message);
+}
+
+#pragma mark - Cache Methods
+
++(void)clearCache {
+    [[NSURLCache sharedURLCache] removeAllCachedResponses];
+}
+
++(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];
+}
+
+#pragma mark - Utility Methods
+
+/*
+ * Detect `Accept` from accepts
+ */
++ (NSString *) selectHeaderAccept:(NSArray *)accepts
+{
+    if (accepts == nil || [accepts count] == 0) {
+        return @"";
+    }
+
+    NSMutableArray *lowerAccepts = [[NSMutableArray alloc] initWithCapacity:[accepts count]];
+    [accepts enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+        [lowerAccepts addObject:[obj lowercaseString]];
+    }];
+
+
+    if ([lowerAccepts containsObject:@"application/json"]) {
+        return @"application/json";
+    }
+    else {
+        return [lowerAccepts componentsJoinedByString:@", "];
+    }
+}
+
+/*
+ * Detect `Content-Type` from contentTypes
+ */
++ (NSString *) selectHeaderContentType:(NSArray *)contentTypes
+{
+    if (contentTypes == nil || [contentTypes count] == 0) {
+        return @"application/json";
+    }
+
+    NSMutableArray *lowerContentTypes = [[NSMutableArray alloc] initWithCapacity:[contentTypes count]];
+    [contentTypes enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+        [lowerContentTypes addObject:[obj lowercaseString]];
+    }];
+
+    if ([lowerContentTypes containsObject:@"application/json"]) {
+        return @"application/json";
+    }
+    else {
+        return lowerContentTypes[0];
+    }
+}
+
++ (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];
+    }
+}
+
+#pragma mark - Request Methods
+
++(unsigned long)requestQueueSize {
+    return [queuedRequests count];
+}
+
++(NSNumber*) nextRequestId {
+    @synchronized(self) {
+        long nextId = ++requestId;
+        if([[{{classPrefix}}Configuration sharedConfig] debug])
+            NSLog(@"got id %ld", nextId);
+        return [NSNumber numberWithLong:nextId];
+    }
+}
+
++(NSNumber*) queueRequest {
+    NSNumber* requestId = [{{classPrefix}}ApiClient nextRequestId];
+    if([[{{classPrefix}}Configuration sharedConfig] debug])
+        NSLog(@"added %@ to request queue", requestId);
+    [queuedRequests addObject:requestId];
+    return requestId;
+}
+
++(void) cancelRequest:(NSNumber*)requestId {
+    [queuedRequests removeObject:requestId];
+}
+
+-(Boolean) executeRequestWithId:(NSNumber*) requestId {
+    NSSet* matchingItems = [queuedRequests objectsPassingTest:^BOOL(id obj, BOOL *stop) {
+        if([obj intValue]  == [requestId intValue]) {
+            return YES;
+        }
+        else {
+            return NO;
+        }
+    }];
+
+    if(matchingItems.count == 1) {
+        if([[{{classPrefix}}Configuration sharedConfig] debug])
+            NSLog(@"removing request id %@", requestId);
+        [queuedRequests removeObject:requestId];
+        return YES;
+    }
+    else {
+        return NO;
+    }
+}
+
+#pragma mark - Reachability Methods
+
++(AFNetworkReachabilityStatus) getReachabilityStatus {
+    return reachabilityStatus;
+}
+
++(void) setReachabilityChangeBlock:(void(^)(int))changeBlock {
+    reachabilityChangeBlock = changeBlock;
+}
+
+- (void) configureCacheReachibility {
+    [self.reachabilityManager setReachabilityStatusChangeBlock:^(AFNetworkReachabilityStatus status) {
+        reachabilityStatus = status;
+        switch (status) {
+            case AFNetworkReachabilityStatusUnknown:
+                if([[{{classPrefix}}Configuration sharedConfig] debug])
+                    NSLog(@"reachability changed to AFNetworkReachabilityStatusUnknown");
+                [{{classPrefix}}ApiClient setOfflineState:true];
+                break;
+
+            case AFNetworkReachabilityStatusNotReachable:
+                if([[{{classPrefix}}Configuration sharedConfig] debug])
+                    NSLog(@"reachability changed to AFNetworkReachabilityStatusNotReachable");
+                [{{classPrefix}}ApiClient setOfflineState:true];
+                break;
+
+            case AFNetworkReachabilityStatusReachableViaWWAN:
+                if([[{{classPrefix}}Configuration sharedConfig] debug])
+                    NSLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWWAN");
+                [{{classPrefix}}ApiClient setOfflineState:false];
+                break;
+
+            case AFNetworkReachabilityStatusReachableViaWiFi:
+                if([[{{classPrefix}}Configuration sharedConfig] debug])
+                    NSLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWiFi");
+                [{{classPrefix}}ApiClient setOfflineState:false];
+                break;
+            default:
+                break;
+        }
+
+        // call the reachability block, if configured
+        if(reachabilityChangeBlock != nil) {
+            reachabilityChangeBlock(status);
+        }
+    }];
+
+    [self.reachabilityManager startMonitoring];
+}
+
+#pragma mark - Deserialize methods
+
+- (id) deserialize:(id) data class:(NSString *) class {
+    NSRegularExpression *regexp = nil;
+    NSTextCheckingResult *match = nil;
+    NSMutableArray *resultArray = nil;
+    NSMutableDictionary *resultDict = nil;
+    NSString *innerType = nil;
+
+    // return nil if data is nil or class is nil
+    if (!data || !class) {
+        return nil;
+    }
+
+    // remove "*" from class, if ends with "*"
+    if ([class hasSuffix:@"*"]) {
+        class = [class substringToIndex:[class length] - 1];
+    }
+
+    // pure object
+    if ([class isEqualToString:@"NSObject"]) {
+        return [[NSObject alloc] init];
+    }
+
+    // list of models
+    NSString *arrayOfModelsPat = @"NSArray<(.+)>";
+    regexp = [NSRegularExpression regularExpressionWithPattern:arrayOfModelsPat
+                                                      options:NSRegularExpressionCaseInsensitive
+                                                        error:nil];
+
+    match = [regexp firstMatchInString:class
+                               options:0
+                                 range:NSMakeRange(0, [class length])];
+
+    if (match) {
+        innerType = [class substringWithRange:[match rangeAtIndex:1]];
+
+        resultArray = [NSMutableArray arrayWithCapacity:[data count]];
+        [data enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+                [resultArray addObject:[self deserialize:obj class:innerType]];
+            }
+        ];
+
+        return resultArray;
+    }
+
+    // list of primitives
+    NSString *arrayOfPrimitivesPat = @"NSArray\\* /\\* (.+) \\*/";
+    regexp = [NSRegularExpression regularExpressionWithPattern:arrayOfPrimitivesPat
+                                                       options:NSRegularExpressionCaseInsensitive
+                                                         error:nil];
+    match = [regexp firstMatchInString:class
+                               options:0
+                                 range:NSMakeRange(0, [class length])];
+
+    if (match) {
+        innerType = [class substringWithRange:[match rangeAtIndex:1]];
+
+        resultArray = [NSMutableArray arrayWithCapacity:[data count]];
+        [data enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+            [resultArray addObject:[self deserialize:obj class:innerType]];
+        }];
+
+        return resultArray;
+    }
+
+    // map
+    NSString *dictPat = @"NSDictionary\\* /\\* (.+?), (.+) \\*/";
+    regexp = [NSRegularExpression regularExpressionWithPattern:dictPat
+                                                       options:NSRegularExpressionCaseInsensitive
+                                                         error:nil];
+    match = [regexp firstMatchInString:class
+                               options:0
+                                 range:NSMakeRange(0, [class length])];
+
+    if (match) {
+        NSString *valueType = [class substringWithRange:[match rangeAtIndex:2]];
+
+        resultDict = [NSMutableDictionary dictionaryWithCapacity:[data count]];
+        [data enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
+            [resultDict setValue:[self deserialize:obj class:valueType] forKey:key];
+        }];
+
+        return resultDict;
+    }
+
+    // primitives
+    NSArray *primitiveTypes = @[@"NSString", @"NSDate", @"NSNumber"];
+
+    if ([primitiveTypes containsObject:class]) {
+        if ([class isEqualToString:@"NSString"]) {
+            return [NSString stringWithString:data];
+        }
+        else if ([class isEqualToString:@"NSDate"]) {
+            return [NSDate dateWithISO8601String:data];
+        }
+        else if ([class isEqualToString:@"NSNumber"]) {
+            // NSNumber from NSNumber
+            if ([data isKindOfClass:[NSNumber class]]) {
+                return data;
+            }
+            else if ([data isKindOfClass:[NSString class]]) {
+                // NSNumber (NSCFBoolean) from NSString
+                if ([[data lowercaseString] isEqualToString:@"true"] || [[data lowercaseString] isEqualToString:@"false"]) {
+                    return [NSNumber numberWithBool:[data boolValue]];
+                // NSNumber from NSString
+                } else {
+                    NSNumberFormatter *formatter = [[NSNumberFormatter alloc] init];
+                    formatter.numberStyle = NSNumberFormatterDecimalStyle;
+                    return [formatter numberFromString:data];
+                }
+            }
+        }
+    }
+
+   // model
+    Class ModelClass = NSClassFromString(class);
+    if ([ModelClass instancesRespondToSelector:@selector(initWithDictionary:error:)]) {
+        return [[ModelClass alloc] initWithDictionary:data error:nil];
+    }
+
+    return nil;
+}
+
+#pragma mark - Operation Methods
+
+- (void) operationWithCompletionBlock: (NSURLRequest *)request
+                            requestId: (NSNumber *) requestId
+                      completionBlock: (void (^)(id, NSError *))completionBlock {
+    AFHTTPRequestOperation *op = [self HTTPRequestOperationWithRequest:request
+                                                               success:^(AFHTTPRequestOperation *operation, id response) {
+                                                                   if([self executeRequestWithId:requestId]) {
+                                                                       if([[{{classPrefix}}Configuration sharedConfig] debug]) {
+                                                                           [self logResponse:operation 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[{{classPrefix}}ResponseObjectErrorKey] = operation.responseObject;
+                                                                       }
+                                                                       NSError *augmentedError = [error initWithDomain:error.domain code:error.code userInfo:userInfo];
+
+                                                                       if([[{{classPrefix}}Configuration sharedConfig] debug])
+                                                                           [self logResponse:nil forRequest:request error:augmentedError];
+                                                                       completionBlock(nil, augmentedError);
+                                                                   }
+                                                               }];
+
+    [self.operationQueue addOperation:op];
+}
+
+- (void) downloadOperationWithCompletionBlock: (NSURLRequest *)request
+                                    requestId: (NSNumber *) requestId
+                              completionBlock: (void (^)(id, NSError *))completionBlock {
+    AFHTTPRequestOperation *op = [self HTTPRequestOperationWithRequest:request
+                                                               success:^(AFHTTPRequestOperation *operation, id responseObject) {
+                                                                   {{classPrefix}}Configuration *config = [{{classPrefix}}Configuration sharedConfig];
+                                                                   NSString *directory = nil;
+                                                                   if (config.tempFolderPath) {
+                                                                       directory = config.tempFolderPath;
+                                                                   }
+                                                                   else {
+                                                                       directory = NSTemporaryDirectory();
+                                                                   }
+
+                                                                   NSDictionary *headers = operation.response.allHeaderFields;
+                                                                   NSString *filename = nil;
+                                                                   if ([headers objectForKey:@"Content-Disposition"]) {
+
+                                                                       NSString *pattern = @"filename=['\"]?([^'\"\\s]+)['\"]?";
+                                                                       NSRegularExpression *regexp = [NSRegularExpression regularExpressionWithPattern:pattern
+                                                                                                                                               options:NSRegularExpressionCaseInsensitive
+                                                                                                                                                 error:nil];
+                                                                       NSString *contentDispositionHeader = [headers objectForKey:@"Content-Disposition"];
+                                                                       NSTextCheckingResult *match = [regexp firstMatchInString:contentDispositionHeader
+                                                                                                                        options:0
+                                                                                                                          range:NSMakeRange(0, [contentDispositionHeader length])];
+                                                                       filename = [contentDispositionHeader substringWithRange:[match rangeAtIndex:1]];
+                                                                   }
+                                                                   else {
+                                                                       filename = [NSString stringWithFormat:@"%@", [[NSProcessInfo processInfo] globallyUniqueString]];
+                                                                   }
+
+                                                                   NSString *filepath = [directory stringByAppendingPathComponent:filename];
+                                                                   NSURL *file = [NSURL fileURLWithPath:filepath];
+
+                                                                   [operation.responseData writeToURL:file atomically:YES];
+                                                                   completionBlock(file, nil);
+                                                               } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
+
+                                                                   if ([self executeRequestWithId:requestId]) {
+                                                                       NSMutableDictionary *userInfo = [error.userInfo mutableCopy];
+                                                                       if (operation.responseObject) {
+                                                                           userInfo[{{classPrefix}}ResponseObjectErrorKey] = operation.responseObject;
+                                                                       }
+
+                                                                       NSError *augmentedError = [error initWithDomain:error.domain code:error.code userInfo:userInfo];
+
+                                                                       if ([[{{classPrefix}}Configuration sharedConfig] debug]) {
+                                                                           [self logResponse:nil forRequest:request error:augmentedError];
+                                                                       }
+
+                                                                       completionBlock(nil, augmentedError);
+                                                                   }
+                                                               }];
+
+    [self.operationQueue addOperation:op];
+}
+
+#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 {
+    // setting request serializer
+    if ([requestContentType isEqualToString:@"application/json"]) {
+        self.requestSerializer = [{{classPrefix}}JSONRequestSerializer serializer];
+    }
+    else if ([requestContentType isEqualToString:@"application/x-www-form-urlencoded"]) {
+        self.requestSerializer = [AFHTTPRequestSerializer serializer];
+    }
+    else if ([requestContentType isEqualToString:@"multipart/form-data"]) {
+        self.requestSerializer = [AFHTTPRequestSerializer serializer];
+    }
+    else {
+        NSAssert(false, @"unsupport request type %@", requestContentType);
+    }
+
+    // setting response serializer
+    if ([responseContentType isEqualToString:@"application/json"]) {
+        self.responseSerializer = [{{classPrefix}}JSONResponseSerializer serializer];
+    }
+    else {
+        self.responseSerializer = [AFHTTPResponseSerializer serializer];
+    }
+
+    // sanitize parameters
+    pathParams = [self sanitizeForSerialization:pathParams];
+    queryParams = [self sanitizeForSerialization:queryParams];
+    headerParams = [self sanitizeForSerialization:headerParams];
+    formParams = [self sanitizeForSerialization:formParams];
+    body = [self sanitizeForSerialization:body];
+
+    // auth setting
+    [self updateHeaderParams:&headerParams queryParams:&queryParams WithAuthSettings:authSettings];
+
+    NSMutableString *resourcePath = [NSMutableString stringWithString:path];
+    [pathParams enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
+        [resourcePath replaceCharactersInRange:[resourcePath rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", key, @"}"]]
+                                    withString:[SWGApiClient escape:obj]];
+    }];
+
+    NSMutableURLRequest * request = nil;
+
+    NSString* pathWithQueryParams = [self pathWithQueryParamsToString:resourcePath queryParams:queryParams];
+    if ([pathWithQueryParams hasPrefix:@"/"]) {
+        pathWithQueryParams = [pathWithQueryParams substringFromIndex:1];
+    }
+
+    NSString* urlString = [[NSURL URLWithString:pathWithQueryParams relativeToURL:self.baseURL] absoluteString];
+    if (files.count > 0) {
+        request = [self.requestSerializer multipartFormRequestWithMethod:@"POST"
+                                                               URLString:urlString
+                                                              parameters:nil
+                                               constructingBodyWithBlock:^(id<AFMultipartFormData> formData) {
+                                                   [formParams enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
+                                                       NSData *data = [obj dataUsingEncoding:NSUTF8StringEncoding];
+                                                       [formData appendPartWithFormData:data name:key];
+                                                   }];
+                                                   [files enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
+                                                       NSURL *filePath = (NSURL *)obj;
+                                                       [formData appendPartWithFileURL:filePath name:key error:nil];
+                                                   }];
+                                               } error:nil];
+    }
+    else {
+        if (formParams) {
+            request = [self.requestSerializer requestWithMethod:method
+                                                      URLString:urlString
+                                                     parameters:formParams
+                                                          error:nil];
+        }
+        if (body) {
+            request = [self.requestSerializer requestWithMethod:method
+                                                      URLString:urlString
+                                                     parameters:body
+                                                          error:nil];
+        }
+    }
+
+    // request cache
+    BOOL hasHeaderParams = false;
+    if(headerParams != nil && [headerParams count] > 0) {
+        hasHeaderParams = true;
+    }
+    if(offlineState) {
+        NSLog(@"%@ cache forced", resourcePath);
+        [request setCachePolicy:NSURLRequestReturnCacheDataDontLoad];
+    }
+    else if(!hasHeaderParams && [method isEqualToString:@"GET"] && cacheEnabled) {
+        NSLog(@"%@ cache enabled", resourcePath);
+        [request setCachePolicy:NSURLRequestUseProtocolCachePolicy];
+    }
+    else {
+        NSLog(@"%@ cache disabled", resourcePath);
+        [request setCachePolicy:NSURLRequestReloadIgnoringLocalCacheData];
+    }
+
+    if(hasHeaderParams){
+        for(NSString * key in [headerParams keyEnumerator]){
+            [request setValue:[headerParams valueForKey:key] forHTTPHeaderField:key];
+        }
+    }
+    [self.requestSerializer setValue:responseContentType forHTTPHeaderField:@"Accept"];
+
+
+    // Always disable cookies!
+    [request setHTTPShouldHandleCookies:NO];
+
+    NSNumber* requestId = [{{classPrefix}}ApiClient queueRequest];
+    if ([responseType isEqualToString:@"NSURL*"]) {
+        [self downloadOperationWithCompletionBlock:request requestId:requestId completionBlock:^(id data, NSError *error) {
+            completionBlock(data, error);
+        }];
+    }
+    else {
+        [self operationWithCompletionBlock:request requestId:requestId completionBlock:^(id data, NSError *error) {
+            completionBlock([self deserialize:data class:responseType], error);
+        }];
+    }
+    return requestId;
+}
+
+#pragma mark -
+
+- (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 = @"&";
+            id queryParam = [queryParams valueForKey:key];
+            if([queryParam isKindOfClass:[NSString class]]){
+                [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
+                                          [{{classPrefix}}ApiClient escape:key], [{{classPrefix}}ApiClient escape:[queryParams valueForKey:key]]]];
+            }
+            else if([queryParam isKindOfClass:[{{classPrefix}}QueryParamCollection class]]){
+                {{classPrefix}}QueryParamCollection * coll = ({{classPrefix}}QueryParamCollection*) queryParam;
+                NSArray* values = [coll values];
+                NSString* format = [coll format];
+
+                if([format isEqualToString:@"csv"]) {
+                    [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
+                        [{{classPrefix}}ApiClient escape:key], [NSString stringWithFormat:@"%@", [values componentsJoinedByString:@","]]]];
+
+                }
+                else if([format isEqualToString:@"tsv"]) {
+                    [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
+                        [{{classPrefix}}ApiClient escape:key], [NSString stringWithFormat:@"%@", [values componentsJoinedByString:@"\t"]]]];
+
+                }
+                else if([format isEqualToString:@"pipes"]) {
+                    [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
+                        [{{classPrefix}}ApiClient escape:key], [NSString stringWithFormat:@"%@", [values componentsJoinedByString:@"|"]]]];
+
+                }
+                else if([format isEqualToString:@"multi"]) {
+                    for(id obj in values) {
+                        [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
+                            [{{classPrefix}}ApiClient escape:key], [NSString stringWithFormat:@"%@", obj]]];
+                        counter += 1;
+                    }
+
+                }
+            }
+            else {
+                [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
+                                          [{{classPrefix}}ApiClient escape:key], [NSString stringWithFormat:@"%@", [queryParams valueForKey:key]]]];
+            }
+
+            counter += 1;
+        }
+    }
+    return requestUrl;
+}
+
+/**
+ * Update header and query params based on authentication settings
+ */
+- (void) updateHeaderParams:(NSDictionary *__autoreleasing *)headers
+                queryParams:(NSDictionary *__autoreleasing *)querys
+           WithAuthSettings:(NSArray *)authSettings {
+
+    if (!authSettings || [authSettings count] == 0) {
+        return;
+    }
+
+    NSMutableDictionary *headersWithAuth = [NSMutableDictionary dictionaryWithDictionary:*headers];
+    NSMutableDictionary *querysWithAuth = [NSMutableDictionary dictionaryWithDictionary:*querys];
+
+    {{classPrefix}}Configuration *config = [{{classPrefix}}Configuration sharedConfig];
+    for (NSString *auth in authSettings) {
+        NSDictionary *authSetting = [[config authSettings] objectForKey:auth];
+
+        if (authSetting) {
+            if ([authSetting[@"in"] isEqualToString:@"header"]) {
+                [headersWithAuth setObject:authSetting[@"value"] forKey:authSetting[@"key"]];
+            }
+            else if ([authSetting[@"in"] isEqualToString:@"query"]) {
+                [querysWithAuth setObject:authSetting[@"value"] forKey:authSetting[@"key"]];
+            }
+        }
+    }
+
+    *headers = [NSDictionary dictionaryWithDictionary:headersWithAuth];
+    *querys = [NSDictionary dictionaryWithDictionary:querysWithAuth];
+}
+
+- (id) sanitizeForSerialization:(id) object {
+    if (object == nil) {
+        return nil;
+    }
+    else if ([object isKindOfClass:[NSString class]] || [object isKindOfClass:[NSNumber class]] || [object isKindOfClass:[SWGQueryParamCollection class]]) {
+        return object;
+    }
+    else if ([object isKindOfClass:[NSDate class]]) {
+        return [object ISO8601String];
+    }
+    else if ([object isKindOfClass:[NSArray class]]) {
+        NSMutableArray *sanitizedObjs = [NSMutableArray arrayWithCapacity:[object count]];
+        [object enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+            if (obj) {
+                [sanitizedObjs addObject:[self sanitizeForSerialization:obj]];
+            }
+        }];
+        return sanitizedObjs;
+    }
+    else if ([object isKindOfClass:[NSDictionary class]]) {
+        NSMutableDictionary *sanitizedObjs = [NSMutableDictionary dictionaryWithCapacity:[object count]];
+        [object enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
+            if (obj) {
+                [sanitizedObjs setValue:[self sanitizeForSerialization:obj] forKey:key];
+            }
+        }];
+        return sanitizedObjs;
+    }
+    else if ([object isKindOfClass:[SWGObject class]]) {
+        return [object toDictionary];
+    }
+    else {
+        NSException *e = [NSException
+                          exceptionWithName:@"InvalidObjectArgumentException"
+                          reason:[NSString stringWithFormat:@"*** The argument object: %@ is invalid", object]
+                          userInfo:nil];
+        @throw e;
+    }
+}
+  
+@end
diff --git a/modules/swagger-codegen/src/main/resources/objc/ApiClient-header.mustache b/modules/swagger-codegen/src/main/resources/objc/ApiClient-header.mustache
new file mode 100644
index 00000000000..eba62705879
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/objc/ApiClient-header.mustache
@@ -0,0 +1,203 @@
+#import <Foundation/Foundation.h>
+#import <ISO8601/ISO8601.h>
+#import <AFNetworking/AFHTTPRequestOperationManager.h>
+#import "{{classPrefix}}JSONResponseSerializer.h"
+#import "{{classPrefix}}JSONRequestSerializer.h"
+#import "{{classPrefix}}QueryParamCollection.h"
+#import "{{classPrefix}}Configuration.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.
+ */
+
+{{#models}}{{#model}}#import "{{classname}}.h"
+{{/model}}{{/models}}
+
+@class {{classPrefix}}Configuration;
+
+/**
+ * A key for `NSError` user info dictionaries.
+ *
+ * The corresponding value is the parsed response body for an HTTP error.
+ */
+extern NSString *const {{classPrefix}}ResponseObjectErrorKey;
+
+
+@interface {{classPrefix}}ApiClient : AFHTTPRequestOperationManager
+
+@property(nonatomic, assign) NSURLRequestCachePolicy cachePolicy;
+@property(nonatomic, assign) NSTimeInterval timeoutInterval;
+@property(nonatomic, readonly) NSOperationQueue* queue;
+
+/**
+ * Clears Cache
+ */
++(void)clearCache;
+
+/**
+ * Turns on cache
+ *
+ * @param enabled If the cached is enable, must be `YES` or `NO`
+ */
++(void)setCacheEnabled:(BOOL) enabled;
+
+/**
+ * Gets the request queue size
+ *
+ * @return The size of `queuedRequests` static variable.
+ */
++(unsigned long)requestQueueSize;
+
+/**
+ * Sets the client unreachable
+ *
+ * @param state off line state, must be `YES` or `NO`
+ */
++(void) setOfflineState:(BOOL) state;
+
+/**
+ * Gets the client reachability
+ *
+ * @return The client reachability.
+ */
++(AFNetworkReachabilityStatus) getReachabilityStatus;
+
+/**
+ * Gets the next request id
+ *
+ * @return The next executed request id.
+ */
++(NSNumber*) nextRequestId;
+
+/**
+ * Generates request id and add it to the queue
+ *
+ * @return The next executed request id.
+ */
++(NSNumber*) queueRequest;
+
+/**
+ * Removes request id from the queue
+ *
+ * @param requestId The request which will be removed.
+ */
++(void) cancelRequest:(NSNumber*)requestId;
+
+/**
+ * Gets URL encoded NSString
+ *
+ * @param unescaped The string which will be escaped.
+ *
+ * @return The escaped string.
+ */
++(NSString*) escape:(id)unescaped;
+
+/**
+ * Customizes the behavior when the reachability changed
+ *
+ * @param changeBlock The block will be executed when the reachability changed.
+ */
++(void) setReachabilityChangeBlock:(void(^)(int))changeBlock;
+
+/**
+ * Sets the api client reachability strategy
+ */
+- (void)configureCacheReachibility;
+
+/**
+ * Detects Accept header from accepts NSArray
+ *
+ * @param accepts NSArray of header
+ *
+ * @return The Accept header
+ */
++(NSString *) selectHeaderAccept:(NSArray *)accepts;
+
+/**
+ * Detects Content-Type header from contentTypes NSArray
+ *
+ * @param contentTypes NSArray of header
+ *
+ * @return The Content-Type header
+ */
++(NSString *) selectHeaderContentType:(NSArray *)contentTypes;
+
+/**
+ * Sets header for request
+ *
+ * @param value The header value
+ * @param forKey The header key
+ */
+-(void)setHeaderValue:(NSString*) value
+               forKey:(NSString*) forKey;
+
+/**
+ * Updates header parameters and query parameters for authentication
+ *
+ * @param headers The header parameter will be udpated, passed by pointer to pointer.
+ * @param querys The query parameters will be updated, passed by pointer to pointer.
+ * @param authSettings The authentication names NSArray.
+ */
+- (void) updateHeaderParams:(NSDictionary **)headers
+                queryParams:(NSDictionary **)querys
+           WithAuthSettings:(NSArray *)authSettings;
+
+/**
+ * Deserializes the given data to Objective-C object.
+ *
+ * @param data The data will be deserialized.
+ * @param class The type of objective-c object.
+ */
+- (id) deserialize:(id) data class:(NSString *) class;
+
+/**
+ * Logs request and response
+ *
+ * @param operation AFHTTPRequestOperation for the HTTP request.
+ * @param request   The HTTP request.
+ * @param error     The error of the HTTP request.
+ */
+- (void)logResponse:(AFHTTPRequestOperation *)operation
+         forRequest:(NSURLRequest *)request
+              error:(NSError *)error;
+
+/**
+ * Performs request
+ *
+ * @param path Request url.
+ * @param method Request method.
+ * @param pathParams Request path parameters.
+ * @param queryParams Request query parameters.
+ * @param body Request body.
+ * @param headerParams Request header parameters.
+ * @param authSettings Request authentication names.
+ * @param requestContentType Request content-type.
+ * @param responseContentType Response content-type.
+ * @param completionBlock The block will be executed when the request completed.
+ *
+ * @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;
+
+/**
+ * Sanitize object for request
+ *
+ * @param object The query/path/header/form/body param to be sanitized.
+ */
+- (id) sanitizeForSerialization:(id) object;
+
+@end
diff --git a/modules/swagger-codegen/src/main/resources/objc/Configuration-body.mustache b/modules/swagger-codegen/src/main/resources/objc/Configuration-body.mustache
new file mode 100644
index 00000000000..9c941b107a0
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/objc/Configuration-body.mustache
@@ -0,0 +1,132 @@
+#import "{{classPrefix}}Configuration.h"
+
+@interface {{classPrefix}}Configuration ()
+
+@property (readwrite, nonatomic, strong) NSMutableDictionary *mutableApiKey;
+@property (readwrite, nonatomic, strong) NSMutableDictionary *mutableApiKeyPrefix;
+
+@end
+
+@implementation {{classPrefix}}Configuration
+
+#pragma mark - Singletion Methods
+
++ (instancetype) sharedConfig {
+    static {{classPrefix}}Configuration *shardConfig = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        shardConfig = [[self alloc] init];
+    });
+    return shardConfig;
+}
+
+#pragma mark - Initialize Methods
+
+- (instancetype) init {
+    self = [super init];
+    if (self) {
+        self.apiClient = nil;
+        self.host = @"{{basePath}}";
+        self.username = @"";
+        self.password = @"";
+        self.tempFolderPath = nil;
+        self.debug = NO;
+        self.loggingFile = nil;
+        self.mutableApiKey = [NSMutableDictionary dictionary];
+        self.mutableApiKeyPrefix = [NSMutableDictionary dictionary];
+    }
+    return self;
+}
+
+#pragma mark - Instance Methods
+
+- (NSString *) getApiKeyWithPrefix:(NSString *)key {
+    if ([self.apiKeyPrefix objectForKey:key] && [self.apiKey objectForKey:key]) {
+        return [NSString stringWithFormat:@"%@ %@", [self.apiKeyPrefix objectForKey:key], [self.apiKey objectForKey:key]];
+    }
+    else if ([self.apiKey objectForKey:key]) {
+        return [NSString stringWithFormat:@"%@", [self.apiKey objectForKey:key]];
+    }
+    else {
+        return @"";
+    }
+}
+
+- (NSString *) getBasicAuthToken {
+    NSString *basicAuthCredentials = [NSString stringWithFormat:@"%@:%@", self.username, self.password];
+    NSData *data = [basicAuthCredentials dataUsingEncoding:NSUTF8StringEncoding];
+    basicAuthCredentials = [NSString stringWithFormat:@"Basic %@", [data base64EncodedStringWithOptions:0]];
+
+    return basicAuthCredentials;
+}
+
+#pragma mark - Setter Methods
+
+- (void) setApiKey:(NSString *)apiKey forApiKeyIdentifier:(NSString *)identifier {
+    [self.mutableApiKey setValue:apiKey forKey:identifier];
+}
+
+- (void) removeApiKey:(NSString *)identifier {
+    [self.mutableApiKey removeObjectForKey:identifier];
+}
+
+- (void) setApiKeyPrefix:(NSString *)prefix forApiKeyPrefixIdentifier:(NSString *)identifier {
+    [self.mutableApiKeyPrefix setValue:prefix forKey:identifier];
+}
+
+- (void) removeApiKeyPrefix:(NSString *)identifier {
+    [self.mutableApiKeyPrefix removeObjectForKey:identifier];
+}
+
+- (void) setLoggingFile:(NSString *)loggingFile {
+    // close old file handler
+    if ([self.loggingFileHanlder isKindOfClass:[NSFileHandle class]]) {
+        [self.loggingFileHanlder closeFile];
+    }
+
+    _loggingFile = loggingFile;
+    _loggingFileHanlder = [NSFileHandle fileHandleForWritingAtPath:_loggingFile];
+    if (_loggingFileHanlder == nil) {
+        [[NSFileManager defaultManager] createFileAtPath:_loggingFile contents:nil attributes:nil];
+        _loggingFileHanlder = [NSFileHandle fileHandleForWritingAtPath:_loggingFile];
+    }
+}
+
+#pragma mark - Getter Methods
+
+- (NSDictionary *) apiKey {
+    return [NSDictionary dictionaryWithDictionary:self.mutableApiKey];
+}
+
+- (NSDictionary *) apiKeyPrefix {
+    return [NSDictionary dictionaryWithDictionary:self.mutableApiKeyPrefix];
+}
+
+#pragma mark -
+
+- (NSDictionary *) authSettings {
+    return @{
+{{#authMethods}}
+{{#isApiKey}}
+               @"{{name}}":
+                   @{
+                       @"type": @"api_key",
+                       @"in": {{#isKeyInHeader}}@"header"{{/isKeyInHeader}}{{#isKeyInQuery}}@"query"{{/isKeyInQuery}},
+                       @"key": @"{{keyParamName}}",
+                       @"value": [self getApiKeyWithPrefix:@"{{keyParamName}}"]
+                   },
+{{/isApiKey}}
+{{#isBasic}}
+               @"{{name}}":
+                   @{
+                       @"type": @"basic",
+                       @"in": @"header",
+                       @"key": @"Authorization",
+                       @"value": [self getBasicAuthToken]
+                   },
+{{/isBasic}}
+{{/authMethods}}
+               };
+}
+
+@end
diff --git a/modules/swagger-codegen/src/main/resources/objc/Configuration-header.mustache b/modules/swagger-codegen/src/main/resources/objc/Configuration-header.mustache
new file mode 100644
index 00000000000..c9bac508bbb
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/objc/Configuration-header.mustache
@@ -0,0 +1,128 @@
+#import <Foundation/Foundation.h>
+#import "{{classPrefix}}ApiClient.h"
+  
+/** The `{{classPrefix}}Configuration` class manages the configurations for the sdk.
+ *
+ * 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.
+ */
+
+@class {{classPrefix}}ApiClient;
+  
+@interface {{classPrefix}}Configuration : NSObject
+
+/**
+ * Default api client
+ */
+@property (nonatomic) {{classPrefix}}ApiClient *apiClient;
+  
+/**
+ * Default base url
+ */
+@property (nonatomic) NSString *host;
+
+/**
+ * Api key values for Api Key type Authentication
+ *
+ * To add or remove api key, use `setApiKey:forApiKeyIdentifier:`.
+ */
+@property (readonly, nonatomic, strong) NSDictionary *apiKey;
+
+/**
+ * Api key prefix values to be prepend to the respective api key
+ *
+ * To add or remove prefix, use `setApiKeyPrefix:forApiKeyPrefixIdentifier:`.
+ */
+@property (readonly, nonatomic, strong) NSDictionary *apiKeyPrefix;
+
+/**
+ * Usename for HTTP Basic Authentication
+ */
+ @property (nonatomic) NSString *username;
+
+/**
+ * Password for HTTP Basic Authentication
+ */
+@property (nonatomic) NSString *password;
+
+/**
+ * Temp folder for file download
+ */
+@property (nonatomic) NSString *tempFolderPath;
+
+/**
+ * Logging Settings
+ */
+
+/**
+ * Debug switch, default false
+ */
+@property (nonatomic) BOOL debug;
+
+/**
+ * Debug file location, default log in console
+ */
+@property (nonatomic) NSString *loggingFile;
+
+/**
+ * Log file handler, this property is used by sdk internally.
+ */
+@property (nonatomic, readonly) NSFileHandle *loggingFileHanlder;
+
+/**
+ * Gets configuration singleton instance
+ */
++ (instancetype) sharedConfig;
+
+/**
+ * Sets API key
+ *
+ * To remove a apiKey for an identifier, just set the apiKey to nil.
+ *
+ * @param apiKey     API key or token.
+ * @param identifier API key identifier (authentication schema).
+ *
+ */
+- (void) setApiKey:(NSString *)apiKey forApiKeyIdentifier:(NSString*)identifier;
+
+/**
+ * Removes api key
+ *
+ * @param identifier API key identifier.
+ */
+- (void) removeApiKey:(NSString *)identifier;
+
+/**
+ * Sets the prefix for API key
+ *
+ * To remove a apiKeyPrefix for an identifier, just set the apiKeyPrefix to nil.
+ *
+ * @param apiKeyPrefix API key prefix.
+ * @param identifier   API key identifier.
+ */
+- (void) setApiKeyPrefix:(NSString *)prefix forApiKeyPrefixIdentifier:(NSString *)identifier;
+
+/**
+ * Removes api key prefix
+ *
+ * @param identifier API key identifier.
+ */
+- (void) removeApiKeyPrefix:(NSString *)identifier;
+
+/**
+ * Gets API key (with prefix if set)
+ */
+- (NSString *) getApiKeyWithPrefix:(NSString *) key;
+
+/**
+ * Gets Basic Auth token
+ */
+- (NSString *) getBasicAuthToken;
+
+/**
+ * Gets Authentication Setings
+ */
+- (NSDictionary *) authSettings;
+
+@end
diff --git a/modules/swagger-codegen/src/main/resources/objc/JSONRequestSerializer-body.mustache b/modules/swagger-codegen/src/main/resources/objc/JSONRequestSerializer-body.mustache
new file mode 100644
index 00000000000..78b1409b6b9
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/objc/JSONRequestSerializer-body.mustache
@@ -0,0 +1,35 @@
+#import "{{classPrefix}}JSONRequestSerializer.h"
+
+@implementation {{classPrefix}}JSONRequestSerializer
+
+///
+/// When customize a request serializer,
+/// the serializer must conform the protocol `AFURLRequestSerialization`
+/// and implements the protocol method `requestBySerializingRequest:withParameters:error:`
+///
+/// @param request    The original request.
+/// @param parameters The parameters to be encoded.
+/// @param error      The error that occurred while attempting to encode the request parameters.
+///
+/// @return A serialized request.
+///
+- (NSURLRequest *)requestBySerializingRequest:(NSURLRequest *)request
+                               withParameters:(id)parameters
+                                        error:(NSError *__autoreleasing *)error
+{
+    // If the body data which will be serialized isn't NSArray or NSDictionary
+    // then put the data in the http request body directly.
+    if ([parameters isKindOfClass:[NSArray class]] || [parameters isKindOfClass:[NSDictionary class]]) {
+        return [super requestBySerializingRequest:request withParameters:parameters error:error];
+    } else {
+        NSMutableURLRequest *mutableRequest = [request mutableCopy];
+        
+        if (parameters) {
+            [mutableRequest setHTTPBody:[parameters dataUsingEncoding:self.stringEncoding]];
+        }
+        
+        return mutableRequest;
+    }
+}
+
+@end
diff --git a/modules/swagger-codegen/src/main/resources/objc/JSONRequestSerializer-header.mustache b/modules/swagger-codegen/src/main/resources/objc/JSONRequestSerializer-header.mustache
new file mode 100644
index 00000000000..a0732b93706
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/objc/JSONRequestSerializer-header.mustache
@@ -0,0 +1,5 @@
+#import <Foundation/Foundation.h>
+#import <AFNetworking/AFURLRequestSerialization.h>
+
+@interface {{classPrefix}}JSONRequestSerializer : AFJSONRequestSerializer
+@end
diff --git a/modules/swagger-codegen/src/main/resources/objc/JSONResponseSerializer-body.mustache b/modules/swagger-codegen/src/main/resources/objc/JSONResponseSerializer-body.mustache
new file mode 100644
index 00000000000..3a19dd1ca4e
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/objc/JSONResponseSerializer-body.mustache
@@ -0,0 +1,39 @@
+#import "{{classPrefix}}JSONResponseSerializer.h"
+
+static BOOL JSONParseError(NSError *error) {
+    if ([error.domain isEqualToString:NSCocoaErrorDomain] && error.code == 3840) {
+        return YES;
+    }
+    
+    return NO;
+}
+
+@implementation {{classPrefix}}JSONResponseSerializer
+
+///
+/// When customize a response serializer,
+/// the serializer must conform the protocol `AFURLResponseSerialization`
+/// and implements the protocol method `responseObjectForResponse:error:`
+///
+/// @param response The response to be processed.
+/// @param data     The response data to be decoded.
+/// @param error    The error that occurred while attempting to decode the respnse data.
+///
+/// @return The object decoded from the specified response data.
+///
+- (id) responseObjectForResponse:(NSURLResponse *)response
+                            data:(NSData *)data
+                           error:(NSError *__autoreleasing *)error {
+    NSDictionary *responseJson = [super responseObjectForResponse:response data:data error:error];
+
+    // if response data is not a valid json, return string of data.
+    if (JSONParseError(*error)) {
+        *error = nil;
+        NSString *responseString = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+        return responseString;
+    }
+    
+    return responseJson;
+}
+
+@end
diff --git a/modules/swagger-codegen/src/main/resources/objc/JSONResponseSerializer-header.mustache b/modules/swagger-codegen/src/main/resources/objc/JSONResponseSerializer-header.mustache
new file mode 100644
index 00000000000..7a5f152e271
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/objc/JSONResponseSerializer-header.mustache
@@ -0,0 +1,6 @@
+#import <Foundation/Foundation.h>
+#import <AFNetworking/AFURLResponseSerialization.h>
+
+@interface {{classPrefix}}JSONResponseSerializer : AFJSONResponseSerializer
+
+@end
diff --git a/modules/swagger-codegen/src/main/resources/objc/Object-body.mustache b/modules/swagger-codegen/src/main/resources/objc/Object-body.mustache
new file mode 100644
index 00000000000..122484f1ad4
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/objc/Object-body.mustache
@@ -0,0 +1,4 @@
+#import "{{classPrefix}}Object.h"
+
+@implementation {{classPrefix}}Object
+@end
diff --git a/modules/swagger-codegen/src/main/resources/objc/Object-header.mustache b/modules/swagger-codegen/src/main/resources/objc/Object-header.mustache
new file mode 100644
index 00000000000..d96e379908f
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/objc/Object-header.mustache
@@ -0,0 +1,5 @@
+#import <Foundation/Foundation.h>
+#import <JSONModel/JSONModel.h>
+
+@interface {{classPrefix}}Object : JSONModel
+@end
diff --git a/modules/swagger-codegen/src/main/resources/objc/Podfile.mustache b/modules/swagger-codegen/src/main/resources/objc/Podfile.mustache
deleted file mode 100644
index c61ab59dd8f..00000000000
--- a/modules/swagger-codegen/src/main/resources/objc/Podfile.mustache
+++ /dev/null
@@ -1,5 +0,0 @@
-platform :ios, '6.0'
-xcodeproj '{{projectName}}/{{projectName}}.xcodeproj'
-pod 'AFNetworking', '~> 2.1'
-pod 'JSONModel', '~> 1.0'
-pod 'ISO8601'
diff --git a/samples/client/petstore/objc/client/SWGQueryParamCollection.m b/modules/swagger-codegen/src/main/resources/objc/QueryParamCollection-body.mustache
similarity index 70%
rename from samples/client/petstore/objc/client/SWGQueryParamCollection.m
rename to modules/swagger-codegen/src/main/resources/objc/QueryParamCollection-body.mustache
index 83303045185..23d0c8eaa86 100644
--- a/samples/client/petstore/objc/client/SWGQueryParamCollection.m
+++ b/modules/swagger-codegen/src/main/resources/objc/QueryParamCollection-body.mustache
@@ -1,6 +1,6 @@
-#import "SWGQueryParamCollection.h"
+#import "{{classPrefix}}QueryParamCollection.h"
 
-@implementation SWGQueryParamCollection
+@implementation {{classPrefix}}QueryParamCollection
 
 @synthesize values = _values;
 @synthesize format = _format;
diff --git a/samples/client/petstore/objc/client/SWGQueryParamCollection.h b/modules/swagger-codegen/src/main/resources/objc/QueryParamCollection-header.mustache
similarity index 80%
rename from samples/client/petstore/objc/client/SWGQueryParamCollection.h
rename to modules/swagger-codegen/src/main/resources/objc/QueryParamCollection-header.mustache
index 3b771881b0f..0389cce98be 100644
--- a/samples/client/petstore/objc/client/SWGQueryParamCollection.h
+++ b/modules/swagger-codegen/src/main/resources/objc/QueryParamCollection-header.mustache
@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
 
-@interface SWGQueryParamCollection : NSObject
+@interface {{classPrefix}}QueryParamCollection : NSObject
 
 @property(nonatomic, readonly) NSArray* values;
 @property(nonatomic, readonly) NSString* format;
diff --git a/modules/swagger-codegen/src/main/resources/objc/README.mustache b/modules/swagger-codegen/src/main/resources/objc/README.mustache
new file mode 100644
index 00000000000..30a8927c41a
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/objc/README.mustache
@@ -0,0 +1,23 @@
+# {{podName}}
+
+## Requirements
+
+The API client library requires ARC (Automatic Reference Counting) to be enabled in your Xcode project.
+
+## Installation
+
+To install it, put the API client library in your project and then simply add the following line to your Podfile:
+
+```ruby
+pod "{{podName}}", :path => "/path/to/lib"
+```
+
+## Recommendation
+
+It's recommended to create an instance of ApiClient per thread in a multithreaded environment to avoid any potential issue.
+
+## Author
+
+{{#apiInfo}}{{#apis}}{{^hasMore}}{{infoEmail}}
+{{/hasMore}}{{/apis}}{{/apiInfo}}
+
diff --git a/modules/swagger-codegen/src/main/resources/objc/SWGApiClient.h b/modules/swagger-codegen/src/main/resources/objc/SWGApiClient.h
deleted file mode 100644
index 250811c4016..00000000000
--- a/modules/swagger-codegen/src/main/resources/objc/SWGApiClient.h
+++ /dev/null
@@ -1,216 +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;
-
-/**
- * Get the Api Client instance from pool
- *
- * @param baseUrl The base url of api client.
- *
- * @return The SWGApiClient instance.
- */
-+(SWGApiClient *)sharedClientFromPool:(NSString *)baseUrl;
-
-/**
- * Get the operations queue
- *
- * @return The `shardQueue` static variable.
- */
-+(NSOperationQueue*) sharedQueue;
-
-/**
- * Turn on logging
- *
- * @param state logging state, must be `YES` or `NO`
- */
-+(void)setLoggingEnabled:(bool) state;
-
-/**
- * Clear Cache
- */
-+(void)clearCache;
-
-/**
- * Turn on cache
- *
- * @param enabled If the cached is enable, must be `YES` or `NO`
- */
-+(void)setCacheEnabled:(BOOL) enabled;
-
-/**
- * Get the request queue size
- *
- * @return The size of `queuedRequests` static variable.
- */
-+(unsigned long)requestQueueSize;
-
-/**
- * Set the client unreachable
- *
- * @param state off line state, must be `YES` or `NO` 
- */
-+(void) setOfflineState:(BOOL) state;
-
-/**
- * Get the client reachability
- *
- * @return The client reachability.
- */
-+(AFNetworkReachabilityStatus) getReachabilityStatus;
-
-/**
- * Get the next request id
- *
- * @return The next executed request id.
- */
-+(NSNumber*) nextRequestId;
-
-/**
- * Generate request id and add it to the queue
- *
- * @return The next executed request id.
- */
-+(NSNumber*) queueRequest;
-
-/**
- * Remove request id from the queue
- *
- * @param requestId The request which will be removed.
- */
-+(void) cancelRequest:(NSNumber*)requestId;
-
-/**
- * URL encode NSString
- *
- * @param unescaped The string which will be escaped.
- *
- * @return The escaped string.
- */
-+(NSString*) escape:(id)unescaped;
-
-/**
- * Customize the behavior when the reachability changed
- *
- * @param changeBlock The block will be executed when the reachability changed.
- */
-+(void) setReachabilityChangeBlock:(void(^)(int))changeBlock;
-
-/**
- * Set the client reachability strategy
- *
- * @param host The host of SWGApiClient.
- */
-+(void) configureCacheReachibilityForHost:(NSString*)host;
-
-/**
- * Detect Accept header from accepts NSArray
- *
- * @param accepts NSArray of header
- *
- * @return The Accept header
- */
-+(NSString *) selectHeaderAccept:(NSArray *)accepts;
-
-/**
- * Detect Content-Type header from contentTypes NSArray
- *
- * @param contentTypes NSArray of header
- *
- * @return The Content-Type header
- */
-+(NSString *) selectHeaderContentType:(NSArray *)contentTypes;
-
-/**
- * Set header for request
- *
- * @param value The header value
- * @param forKey The header key
- */
--(void)setHeaderValue:(NSString*) value
-               forKey:(NSString*) forKey;
-
-/**
- * Update header parameters and query parameters for authentication
- *
- * @param headers The header parameter will be udpated, passed by pointer to pointer.
- * @param querys The query parameters will be updated, passed by pointer to pointer.
- * @param authSettings The authentication names NSArray.
- */
-- (void) updateHeaderParams:(NSDictionary **)headers
-                queryParams:(NSDictionary **)querys
-           WithAuthSettings:(NSArray *)authSettings;
-
-/**
- * Perform request
- *
- * Request with non-empty response
- *
- * @param path Request url.
- * @param method Request method.
- * @param queryParams Request query parameters.
- * @param body Request body.
- * @param headerParams Request header parameters.
- * @param authSettings Request authentication names.
- * @param requestContentType Request content-type.
- * @param responseContentType Response content-type.
- * @param completionBlock The block will be executed when the request completed. 
- *
- * @return The request id.
- */
--(NSNumber*)  dictionary:(NSString*) path
-                  method:(NSString*) method
-             queryParams:(NSDictionary*) queryParams
-                    body:(id) body
-            headerParams:(NSDictionary*) headerParams
-            authSettings: (NSArray *) authSettings
-      requestContentType:(NSString*) requestContentType
-     responseContentType:(NSString*) responseContentType
-         completionBlock:(void (^)(NSDictionary*, NSError *))completionBlock;
-
-/**
- * Perform request
- *
- * Request with empty response
- *
- * @param path Request url.
- * @param method Request method.
- * @param queryParams Request query parameters.
- * @param body Request body.
- * @param headerParams Request header parameters.
- * @param authSettings Request authentication names.
- * @param requestContentType Request content-type.
- * @param responseContentType Response content-type.
- * @param completionBlock The block will be executed when the request completed. 
- *
- * @return The request id.
- */
--(NSNumber*)  stringWithCompletionBlock:(NSString*) path
-                                 method:(NSString*) method
-                            queryParams:(NSDictionary*) queryParams
-                                   body:(id) body
-                           headerParams:(NSDictionary*) headerParams
-                           authSettings: (NSArray *) authSettings
-                     requestContentType:(NSString*) requestContentType
-                    responseContentType:(NSString*) responseContentType
-                        completionBlock:(void (^)(NSString*, NSError *))completionBlock;
-@end
-
-
diff --git a/modules/swagger-codegen/src/main/resources/objc/SWGApiClient.m b/modules/swagger-codegen/src/main/resources/objc/SWGApiClient.m
deleted file mode 100644
index 5e2985bbe79..00000000000
--- a/modules/swagger-codegen/src/main/resources/objc/SWGApiClient.m
+++ /dev/null
@@ -1,685 +0,0 @@
-#import "SWGApiClient.h"
-#import "SWGFile.h"
-#import "SWGQueryParamCollection.h"
-#import "SWGConfiguration.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 = true;
-
-#pragma mark - Log Methods
-
-+(void)setLoggingEnabled:(bool) state {
-    loggingEnabled = state;
-}
-
-- (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 );
-}
-
-#pragma mark -
-
-+(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;
-    }
-}
-
-/*
- * Detect `Accept` from accepts
- */
-+ (NSString *) selectHeaderAccept:(NSArray *)accepts
-{
-    if (accepts == nil || [accepts count] == 0) {
-        return @"";
-    }
-    
-    NSMutableArray *lowerAccepts = [[NSMutableArray alloc] initWithCapacity:[accepts count]];
-    [accepts enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
-        [lowerAccepts addObject:[obj lowercaseString]];
-    }];
-
-    
-    if ([lowerAccepts containsObject:@"application/json"]) {
-        return @"application/json";
-    }
-    else {
-        return [lowerAccepts componentsJoinedByString:@", "];
-    }
-}
-
-/*
- * Detect `Content-Type` from contentTypes
- */
-+ (NSString *) selectHeaderContentType:(NSArray *)contentTypes
-{
-    if (contentTypes == nil || [contentTypes count] == 0) {
-        return @"application/json";
-    }
-    
-    NSMutableArray *lowerContentTypes = [[NSMutableArray alloc] initWithCapacity:[contentTypes count]];
-    [contentTypes enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
-        [lowerContentTypes addObject:[obj lowercaseString]];
-    }];
-
-    if ([lowerContentTypes containsObject:@"application/json"]) {
-        return @"application/json";
-    }
-    else {
-        return lowerContentTypes[0];
-    }
-}
-
--(void)setHeaderValue:(NSString*) value
-               forKey:(NSString*) forKey {
-    [self.requestSerializer setValue:value forHTTPHeaderField:forKey];
-}
-
-+(unsigned long)requestQueueSize {
-    return [queuedRequests count];
-}
-
-+(NSNumber*) nextRequestId {
-    @synchronized(self) {
-        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;
-            id queryParam = [queryParams valueForKey:key];
-            if([queryParam isKindOfClass:[NSString class]]){
-                [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
-                                          [SWGApiClient escape:key], [SWGApiClient escape:[queryParams valueForKey:key]]]];
-            }
-            else if([queryParam isKindOfClass:[SWGQueryParamCollection class]]){
-                SWGQueryParamCollection * coll = (SWGQueryParamCollection*) queryParam;
-                NSArray* values = [coll values];
-                NSString* format = [coll format];
-
-                if([format isEqualToString:@"csv"]) {
-                    [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
-                        [SWGApiClient escape:key], [NSString stringWithFormat:@"%@", [values componentsJoinedByString:@","]]]];
-
-                }
-                else if([format isEqualToString:@"tsv"]) {
-                    [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
-                        [SWGApiClient escape:key], [NSString stringWithFormat:@"%@", [values componentsJoinedByString:@"\t"]]]];
-
-                }
-                else if([format isEqualToString:@"pipes"]) {
-                    [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
-                        [SWGApiClient escape:key], [NSString stringWithFormat:@"%@", [values componentsJoinedByString:@"|"]]]];
-
-                }
-                else if([format isEqualToString:@"multi"]) {
-                    for(id obj in values) {
-                        [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
-                            [SWGApiClient escape:key], [NSString stringWithFormat:@"%@", obj]]];
-                        counter += 1;
-                    }
-
-                }
-            }
-            else {
-                [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
-                                          [SWGApiClient escape:key], [NSString stringWithFormat:@"%@", [queryParams valueForKey:key]]]];
-            }
-
-            counter += 1;
-        }
-    }
-    return requestUrl;
-}
-
-- (NSString*)descriptionForRequest:(NSURLRequest*)request {
-    return [[request URL] absoluteString];
-}
-
-
-/**
- * Update header and query params based on authentication settings
- */
-- (void) updateHeaderParams:(NSDictionary *__autoreleasing *)headers
-                queryParams:(NSDictionary *__autoreleasing *)querys
-           WithAuthSettings:(NSArray *)authSettings {
-    
-    if (!authSettings || [authSettings count] == 0) {
-        return;
-    }
-    
-    NSMutableDictionary *headersWithAuth = [NSMutableDictionary dictionaryWithDictionary:*headers];
-    NSMutableDictionary *querysWithAuth = [NSMutableDictionary dictionaryWithDictionary:*querys];
-    
-    SWGConfiguration *config = [SWGConfiguration sharedConfig];
-    for (NSString *auth in authSettings) {
-        NSDictionary *authSetting = [[config authSettings] objectForKey:auth];
-        
-        if (authSetting) {
-            if ([authSetting[@"in"] isEqualToString:@"header"]) {
-                [headersWithAuth setObject:authSetting[@"value"] forKey:authSetting[@"key"]];
-            }
-            else if ([authSetting[@"in"] isEqualToString:@"query"]) {
-                [querysWithAuth setObject:authSetting[@"value"] forKey:authSetting[@"key"]];
-            }
-        }
-    }
-    
-    *headers = [NSDictionary dictionaryWithDictionary:headersWithAuth];
-    *querys = [NSDictionary dictionaryWithDictionary:querysWithAuth];
-}
-
-#pragma mark - Perform Request Methods
-
--(NSNumber*)  dictionary: (NSString*) path
-                  method: (NSString*) method
-             queryParams: (NSDictionary*) queryParams
-                    body: (id) body
-            headerParams: (NSDictionary*) headerParams
-            authSettings: (NSArray *) authSettings
-      requestContentType: (NSString*) requestContentType
-     responseContentType: (NSString*) responseContentType
-         completionBlock: (void (^)(NSDictionary*, NSError *))completionBlock {
-    // setting request serializer
-    if ([requestContentType isEqualToString:@"application/json"]) {
-        self.requestSerializer = [AFJSONRequestSerializer serializer];
-    }
-    else if ([requestContentType isEqualToString:@"application/x-www-form-urlencoded"]) {
-        self.requestSerializer = [AFHTTPRequestSerializer serializer];
-    }
-    else if ([requestContentType isEqualToString:@"multipart/form-data"]) {
-        self.requestSerializer = [AFHTTPRequestSerializer serializer];
-    }
-    else {
-        NSAssert(false, @"unsupport request type %@", requestContentType);
-    }
-
-    // setting response serializer
-    if ([responseContentType isEqualToString:@"application/json"]) {
-        self.responseSerializer = [AFJSONResponseSerializer serializer];
-    }
-    else {
-        self.responseSerializer = [AFHTTPResponseSerializer serializer];
-    }
-    
-    // auth setting
-    [self updateHeaderParams:&headerParams queryParams:&queryParams WithAuthSettings:authSettings];
-
-    NSMutableURLRequest * request = nil;
-    if (body != nil && [body isKindOfClass:[NSArray class]]){
-        SWGFile * file;
-        NSMutableDictionary * params = [[NSMutableDictionary alloc] init];
-        for(id obj in body) {
-            if([obj isKindOfClass:[SWGFile class]]) {
-                file = (SWGFile*) obj;
-                requestContentType = @"multipart/form-data";
-            }
-            else if([obj isKindOfClass:[NSDictionary class]]) {
-                for(NSString * key in obj) {
-                    params[key] = obj[key];
-                }
-            }
-        }
-        NSString * urlString = [[NSURL URLWithString:path relativeToURL:self.baseURL] absoluteString];
-
-        // request with multipart form
-        if([requestContentType isEqualToString:@"multipart/form-data"]) {
-            request = [self.requestSerializer multipartFormRequestWithMethod: @"POST"
-                                                                   URLString: urlString
-                                                                  parameters: nil
-                                                   constructingBodyWithBlock: ^(id<AFMultipartFormData> formData) {
-
-                                                       for(NSString * key in params) {
-                                                           NSData* data = [params[key] dataUsingEncoding:NSUTF8StringEncoding];
-                                                           [formData appendPartWithFormData: data name: key];
-                                                       }
-
-                                                       if (file) {
-                                                           [formData appendPartWithFileData: [file data]
-                                                                                       name: [file paramName]
-                                                                                   fileName: [file name]
-                                                                                   mimeType: [file mimeType]];
-                                                       }
-
-                                                   }
-                                                                       error:nil];
-        }
-        // request with form parameters or json
-        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:params
-                                                          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]]){
-            [self.requestSerializer 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];
-        }
-    }
-    [self.requestSerializer setValue: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
-                           authSettings: (NSArray *) authSettings
-                     requestContentType: (NSString*) requestContentType
-                    responseContentType: (NSString*) responseContentType
-                        completionBlock: (void (^)(NSString*, NSError *))completionBlock {
-    // setting request serializer
-    if ([requestContentType isEqualToString:@"application/json"]) {
-        self.requestSerializer = [AFJSONRequestSerializer serializer];
-    }
-    else if ([requestContentType isEqualToString:@"application/x-www-form-urlencoded"]) {
-        self.requestSerializer = [AFHTTPRequestSerializer serializer];
-    }
-    else if ([requestContentType isEqualToString:@"multipart/form-data"]) {
-        self.requestSerializer = [AFHTTPRequestSerializer serializer];
-    }
-    else {
-        NSAssert(false, @"unsupport request type %@", requestContentType);
-    }
-
-    // setting response serializer
-    if ([responseContentType isEqualToString:@"application/json"]) {
-        self.responseSerializer = [AFJSONResponseSerializer serializer];
-    }
-    else {
-        self.responseSerializer = [AFHTTPResponseSerializer serializer];
-    }
-    
-    // auth setting
-    [self updateHeaderParams:&headerParams queryParams:&queryParams WithAuthSettings:authSettings];
-
-    NSMutableURLRequest * request = nil;
-    if (body != nil && [body isKindOfClass:[NSArray class]]){
-        SWGFile * file;
-        NSMutableDictionary * params = [[NSMutableDictionary alloc] init];
-        for(id obj in body) {
-            if([obj isKindOfClass:[SWGFile class]]) {
-                file = (SWGFile*) obj;
-                requestContentType = @"multipart/form-data";
-            }
-            else if([obj isKindOfClass:[NSDictionary class]]) {
-                for(NSString * key in obj) {
-                    params[key] = obj[key];
-                }
-            }
-        }
-        NSString * urlString = [[NSURL URLWithString:path relativeToURL:self.baseURL] absoluteString];
-
-        // request with multipart form
-        if([requestContentType isEqualToString:@"multipart/form-data"]) {
-            request = [self.requestSerializer multipartFormRequestWithMethod: @"POST"
-                                                                   URLString: urlString
-                                                                  parameters: nil
-                                                   constructingBodyWithBlock: ^(id<AFMultipartFormData> formData) {
-
-                                                       for(NSString * key in params) {
-                                                           NSData* data = [params[key] dataUsingEncoding:NSUTF8StringEncoding];
-                                                           [formData appendPartWithFormData: data name: key];
-                                                       }
-
-                                                       if (file) {
-                                                           [formData appendPartWithFileData: [file data]
-                                                                                       name: [file paramName]
-                                                                                   fileName: [file name]
-                                                                                   mimeType: [file mimeType]];
-                                                       }
-
-                                                   }
-                                                                       error:nil];
-        }
-        // request with form parameters or json
-        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:params
-                                                          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]]){
-            [self.requestSerializer 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];
-        }
-    }
-    [self.requestSerializer setValue: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/modules/swagger-codegen/src/main/resources/objc/SWGConfiguration-body.mustache b/modules/swagger-codegen/src/main/resources/objc/SWGConfiguration-body.mustache
deleted file mode 100644
index 1e5e7135574..00000000000
--- a/modules/swagger-codegen/src/main/resources/objc/SWGConfiguration-body.mustache
+++ /dev/null
@@ -1,99 +0,0 @@
-#import "SWGConfiguration.h"
-
-@interface SWGConfiguration ()
-
-@property (readwrite, nonatomic, strong) NSMutableDictionary *mutableApiKey;
-@property (readwrite, nonatomic, strong) NSMutableDictionary *mutableApiKeyPrefix;
-
-@end
-
-@implementation SWGConfiguration
-
-#pragma mark - Singletion Methods
-
-+ (instancetype) sharedConfig {
-    static SWGConfiguration *shardConfig = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        shardConfig = [[self alloc] init];
-    });
-    return shardConfig;
-}
-
-#pragma mark - Initialize Methods
-
-- (instancetype) init {
-    self = [super init];
-    if (self) {
-        self.username = @"";
-        self.password = @"";
-        self.mutableApiKey = [NSMutableDictionary dictionary];
-        self.mutableApiKeyPrefix = [NSMutableDictionary dictionary];
-    }
-    return self;
-}
-
-#pragma mark - Instance Methods
-
-- (NSString *) getApiKeyWithPrefix:(NSString *)key {
-    if ([self.apiKeyPrefix objectForKey:key] && [self.apiKey objectForKey:key]) {
-        return [NSString stringWithFormat:@"%@ %@", [self.apiKeyPrefix objectForKey:key], [self.apiKey objectForKey:key]];
-    }
-    else if ([self.apiKey objectForKey:key]) {
-        return [NSString stringWithFormat:@"%@", [self.apiKey objectForKey:key]];
-    }
-    else {
-        return @"";
-    }
-}
-
-- (NSString *) getBasicAuthToken {
-    NSString *basicAuthCredentials = [NSString stringWithFormat:@"%@:%@", self.username, self.password];
-    NSData *data = [basicAuthCredentials dataUsingEncoding:NSUTF8StringEncoding];
-    basicAuthCredentials = [NSString stringWithFormat:@"Basic %@", [data base64EncodedStringWithOptions:0]];
-    
-    return basicAuthCredentials;
-}
-
-#pragma mark - Setter Methods
-
-- (void) setValue:(NSString *)value forApiKeyField:(NSString *)field {
-    [self.mutableApiKey setValue:value forKey:field];
-}
-
-- (void) setValue:(NSString *)value forApiKeyPrefixField:(NSString *)field {
-    [self.mutableApiKeyPrefix setValue:value forKey:field];
-}
-
-#pragma mark - Getter Methods
-
-- (NSDictionary *) apiKey {
-    return [NSDictionary dictionaryWithDictionary:self.mutableApiKey];
-}
-
-- (NSDictionary *) apiKeyPrefix {
-    return [NSDictionary dictionaryWithDictionary:self.mutableApiKeyPrefix];
-}
-
-#pragma mark -
-
-- (NSDictionary *) authSettings {
-    return @{ {{#authMethods}}{{#isApiKey}}
-                @"{{name}}": @{
-                    @"type": @"api_key",
-                    @"in": {{#isKeyInHeader}}@"header"{{/isKeyInHeader}}{{#isKeyInQuery}}@"query"{{/isKeyInQuery}},
-                    @"key": @"{{keyParamName}}",
-                    @"value": [self getApiKeyWithPrefix:@"{{keyParamName}}"]
-                },
-              {{/isApiKey}}{{#isBasic}}
-                @"{{name}}": @{
-                    @"type": @"basic",
-                    @"in": @"header",
-                    @"key": @"Authorization",
-                    @"value": [self getBasicAuthToken]
-                },
-              {{/isBasic}}{{/authMethods}}
-            };
-}
-
-@end
diff --git a/modules/swagger-codegen/src/main/resources/objc/SWGConfiguration-header.mustache b/modules/swagger-codegen/src/main/resources/objc/SWGConfiguration-header.mustache
deleted file mode 100644
index 33023ca3c6f..00000000000
--- a/modules/swagger-codegen/src/main/resources/objc/SWGConfiguration-header.mustache
+++ /dev/null
@@ -1,56 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface SWGConfiguration : NSObject
-
-
-/**
- * Api key values for Api Key type Authentication
- *
- * To add or remove api key, use `setValue:forApiKeyField:`.
- */
-@property (readonly, nonatomic, strong) NSDictionary *apiKey;
-
-/**
- * Api key prefix values to be prepend to the respective api key
- *
- * To add or remove prefix, use `setValue:forApiKeyPrefixField:`.
- */
-@property (readonly, nonatomic, strong) NSDictionary *apiKeyPrefix;
-
-/**
- * Usename and Password for Basic type Authentication
- */
-@property (nonatomic) NSString *username;
-@property (nonatomic) NSString *password;
-
-/**
- * Get configuration singleton instance
- */
-+ (instancetype) sharedConfig;
-
-/**
- * Sets field in `apiKey`
- */
-- (void) setValue:(NSString *)value forApiKeyField:(NSString*)field;
-
-/**
- * Sets field in `apiKeyPrefix`
- */
-- (void) setValue:(NSString *)value forApiKeyPrefixField:(NSString *)field;
-
-/**
- * Get API key (with prefix if set)
- */
-- (NSString *) getApiKeyWithPrefix:(NSString *) key;
-
-/**
- * Get Basic Auth token
- */
-- (NSString *) getBasicAuthToken;
-
-/**
- * Get Authentication Setings
- */
-- (NSDictionary *) authSettings;
-
-@end
diff --git a/modules/swagger-codegen/src/main/resources/objc/SWGFile.h b/modules/swagger-codegen/src/main/resources/objc/SWGFile.h
deleted file mode 100644
index fd87e13bace..00000000000
--- a/modules/swagger-codegen/src/main/resources/objc/SWGFile.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface SWGFile : NSObject
-
-@property(nonatomic, readonly) NSString* name;
-@property(nonatomic, readonly) NSString* mimeType;
-@property(nonatomic, readonly) NSData* data;
-@property(nonatomic) NSString* paramName;
-
-- (id) initWithNameData: (NSString*) filename
-               mimeType: (NSString*) mimeType
-                   data: (NSData*) data;
-    
-@end
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/objc/SWGFile.m b/modules/swagger-codegen/src/main/resources/objc/SWGFile.m
deleted file mode 100644
index 42552767af4..00000000000
--- a/modules/swagger-codegen/src/main/resources/objc/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/modules/swagger-codegen/src/main/resources/objc/api-body.mustache b/modules/swagger-codegen/src/main/resources/objc/api-body.mustache
index 40d75bd806b..534c887fe7b 100644
--- a/modules/swagger-codegen/src/main/resources/objc/api-body.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/api-body.mustache
@@ -1,7 +1,6 @@
 {{#operations}}
 #import "{{classname}}.h"
-#import "SWGFile.h"
-#import "SWGQueryParamCollection.h"
+#import "{{classPrefix}}QueryParamCollection.h"
 {{#imports}}#import "{{import}}.h"
 {{/imports}}
 {{newline}}
@@ -12,28 +11,25 @@
 
 @implementation {{classname}}
 
-static NSString * basePath = @"{{basePath}}";
-
 #pragma mark - Initialize methods
 
 - (id) init {
     self = [super init];
     if (self) {
-        self.apiClient = [SWGApiClient sharedClientFromPool:basePath];
+        {{classPrefix}}Configuration *config = [{{classPrefix}}Configuration sharedConfig];
+        if (config.apiClient == nil) {
+            config.apiClient = [[{{classPrefix}}ApiClient alloc] init];
+        }
+        self.apiClient = config.apiClient;
         self.defaultHeaders = [NSMutableDictionary dictionary];
     }
     return self;
 }
 
-- (id) initWithApiClient:(SWGApiClient *)apiClient {
+- (id) initWithApiClient:({{classPrefix}}ApiClient *)apiClient {
     self = [super init];
     if (self) {
-        if (apiClient) {
-            self.apiClient = apiClient;
-        }
-        else {
-            self.apiClient = [SWGApiClient sharedClientFromPool:basePath];
-        }
+        self.apiClient = apiClient;
         self.defaultHeaders = [NSMutableDictionary dictionary];
     }
     return self;
@@ -51,14 +47,6 @@ static NSString * basePath = @"{{basePath}}";
     return singletonAPI;
 }
 
-+(void) setBasePath:(NSString*)path {
-    basePath = path;
-}
-
-+(NSString*) getBasePath {
-    return basePath;
-}
-
 -(void) addHeader:(NSString*)value forKey:(NSString*)key {
     [self.defaultHeaders setValue:value forKey:key];
 }
@@ -69,40 +57,48 @@ static NSString * basePath = @"{{basePath}}";
 }
 
 -(unsigned long) requestQueueSize {
-    return [SWGApiClient requestQueueSize];
+    return [{{classPrefix}}ApiClient requestQueueSize];
 }
 
+#pragma mark - Api Methods
 
 {{#operation}}
-/*!
- * {{{summary}}}
- * {{{notes}}}
-{{#allParams}} * \param {{paramName}} {{{description}}}
-{{/allParams}} * \returns {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
- */
+///
+/// {{{summary}}}
+/// {{{notes}}}
+/// {{#allParams}} @param {{paramName}} {{{description}}}
+///
+/// {{/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}} {
+        {{#returnBaseType}}{{#hasParams}}completionHandler: {{/hasParams}}(void (^)({{{returnType}}} output, NSError* error))completionBlock { {{/returnBaseType}}
+        {{^returnBaseType}}{{#hasParams}}completionHandler: {{/hasParams}}(void (^)(NSError* error))completionBlock { {{/returnBaseType}}
 
     {{#allParams}}{{#required}}
     // verify the required parameter '{{paramName}}' is set
-    NSAssert({{paramName}} != nil, @"Missing the required parameter `{{paramName}}` when calling {{nickname}}");
+    if ({{paramName}} == nil) {
+        [NSException raise:@"Invalid parameter" format:@"Missing the required parameter `{{paramName}}` when calling `{{nickname}}`"];
+    }
     {{/required}}{{/allParams}}
 
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@{{path}}", basePath];
+    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"{{path}}"];
 
     // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
+    if ([resourcePath rangeOfString:@".{format}"].location != NSNotFound) {
+        [resourcePath replaceCharactersInRange: [resourcePath rangeOfString:@".{format}"] withString:@".json"];
+    }
 
-    {{#pathParams}}[requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"{{baseName}}", @"}"]] withString: [SWGApiClient escape:{{paramName}}]];
+    NSMutableDictionary *pathParams = [[NSMutableDictionary alloc] init];
+    {{#pathParams}}if ({{paramName}} != nil) {
+        pathParams[@"{{baseName}}"] = {{paramName}};
+    }
     {{/pathParams}}
 
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
     {{#queryParams}}if({{paramName}} != nil) {
         {{#collectionFormat}}
-        queryParams[@"{{baseName}}"] = [[SWGQueryParamCollection alloc] initWithValuesAndFormat: {{baseName}} format: @"{{collectionFormat}}"];
+        queryParams[@"{{baseName}}"] = [[{{classPrefix}}QueryParamCollection alloc] initWithValuesAndFormat: {{baseName}} format: @"{{collectionFormat}}"];
         {{/collectionFormat}}
         {{^collectionFormat}}queryParams[@"{{baseName}}"] = {{paramName}};{{/collectionFormat}}
     }
@@ -112,9 +108,9 @@ static NSString * basePath = @"{{basePath}}";
     {{#headerParams}}if({{paramName}} != nil)
         headerParams[@"{{baseName}}"] = {{paramName}};
     {{/headerParams}}
-    
-    // HTTP header `Accept` 
-    headerParams[@"Accept"] = [SWGApiClient selectHeaderAccept:@[{{#produces}}@"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}}]];
+
+    // HTTP header `Accept`
+    headerParams[@"Accept"] = [{{classPrefix}}ApiClient selectHeaderAccept:@[{{#produces}}@"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}}]];
     if ([headerParams[@"Accept"] length] == 0) {
         [headerParams removeObjectForKey:@"Accept"];
     }
@@ -129,62 +125,25 @@ static NSString * basePath = @"{{basePath}}";
     }
 
     // request content type
-    NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[{{#consumes}}@"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}}]];
+    NSString *requestContentType = [{{classPrefix}}ApiClient selectHeaderContentType:@[{{#consumes}}@"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}}]];
 
     // Authentication setting
     NSArray *authSettings = @[{{#authMethods}}@"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}}];
-    
-    id bodyDictionary = nil;
-    {{#bodyParam}}
-    id __body = {{paramName}};
-
-    if(__body != nil && [__body isKindOfClass:[NSArray class]]){
-        NSMutableArray * objs = [[NSMutableArray alloc] init];
-        for (id dict in (NSArray*)__body) {
-            if([dict respondsToSelector:@selector(toDictionary)]) {
-                [objs addObject:[(SWGObject*)dict toDictionary]];
-            }
-            else{
-                [objs addObject:dict];
-            }
-        }
-        bodyDictionary = objs;
-    }
-    else if([__body respondsToSelector:@selector(toDictionary)]) {
-        bodyDictionary = [(SWGObject*)__body toDictionary];
-    }
-    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;
-    }
-    {{/bodyParam}}
-    {{^bodyParam}}
-
-    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init];
 
+    id bodyParam = nil;
+    NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
+    {{#bodyParam}}
+    bodyParam = {{paramName}};
+    {{/bodyParam}}{{^bodyParam}}
     {{#formParams}}
     {{#notFile}}
-    formParams[@"{{paramName}}"] = {{paramName}};
-    {{/notFile}}{{#isFile}}
-    requestContentType = @"multipart/form-data";
-    if(bodyDictionary == nil) {
-      bodyDictionary = [[NSMutableArray alloc] init];
-    }
-    if({{paramName}} != nil) {
-      [bodyDictionary addObject:{{paramName}}];
-      {{paramName}}.paramName  = @"{{baseName}}";
+    if ({{paramName}}) {
+        formParams[@"{{baseName}}"] = {{paramName}};
     }
+    {{/notFile}}{{#isFile}}
+    files[@"{{paramName}}"] = {{paramName}};
     {{/isFile}}
-    if(bodyDictionary == nil) {
-      bodyDictionary = [[NSMutableArray alloc] init];
-    }
-    [bodyDictionary addObject:formParams];
     {{/formParams}}
     {{/bodyParam}}
 
@@ -195,27 +154,23 @@ static NSString * basePath = @"{{basePath}}";
     }
     {{/requiredParams}}
     {{/requiredParamCount}}
-
-    {{#returnContainer}}
-    // response is in a container
-    {{>apiBodyResponseWithContainer}}{{/returnContainer}}
-
-    {{#returnSimpleType}}
-    // non container response
-
-    {{#returnTypeIsPrimitive}}
-    // primitive response
-    {{>apiPrimitiveResponse}}{{/returnTypeIsPrimitive}}
-
-    {{#returnBaseType}}
-    // complex response
-    {{>apiNonPrimitiveResponse}}{{/returnBaseType}}
-    {{/returnSimpleType}}
-
-    {{^returnSimpleType}}{{^returnContainer}}
-    // it's void
-    {{>voidResponse}}
-    {{/returnContainer}}{{/returnSimpleType}}
+    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}}
+              }
+          ];
 }
 
 {{/operation}}
@@ -223,6 +178,3 @@ static NSString * basePath = @"{{basePath}}";
 {{newline}}
 {{/operations}}
 @end
-
-
-
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 65f4c39e0b3..d9f691f7227 100644
--- a/modules/swagger-codegen/src/main/resources/objc/api-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/api-header.mustache
@@ -1,32 +1,35 @@
 #import <Foundation/Foundation.h>
 {{#imports}}#import "{{import}}.h"
 {{/imports}}
-#import "SWGObject.h"
-#import "SWGApiClient.h"
+#import "{{classPrefix}}Object.h"
+#import "{{classPrefix}}ApiClient.h"
 {{newline}}
 
+/**
+ * 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.
+ */
+
 {{#operations}}
 @interface {{classname}}: NSObject
 
-@property(nonatomic, assign)SWGApiClient *apiClient;
+@property(nonatomic, assign){{classPrefix}}ApiClient *apiClient;
 
--(instancetype) initWithApiClient:(SWGApiClient *)apiClient;
+-(instancetype) initWithApiClient:({{classPrefix}}ApiClient *)apiClient;
 -(void) addHeader:(NSString*)value forKey:(NSString*)key;
 -(unsigned long) requestQueueSize;
 +({{classname}}*) apiWithHeader:(NSString*)headerValue key:(NSString*)key;
-+(void) setBasePath:(NSString*)basePath;
-+(NSString*) getBasePath;
 {{#operation}}
-/**
-
- {{{summary}}}
- {{#notes}}{{{notes}}}{{/notes}}
-
- {{#allParams}}@param {{paramName}} {{description}}
- {{/allParams}}
-
- return type: {{{returnType}}}
- */
+///
+///
+/// {{{summary}}}
+/// {{#notes}}{{{notes}}}{{/notes}}
+///
+/// {{#allParams}}@param {{paramName}} {{description}}
+/// {{/allParams}}
+///
+/// @return {{{returnType}}}
 -(NSNumber*) {{nickname}}WithCompletionBlock {{^allParams}}:{{/allParams}}{{#allParams}}{{#secondaryParam}}     {{paramName}}{{/secondaryParam}}:({{{dataType}}}) {{paramName}} {{#hasMore}}
 {{/hasMore}}{{/allParams}}
     {{#returnBaseType}}{{#hasParams}}
diff --git a/modules/swagger-codegen/src/main/resources/objc/apiBodyResponseWithContainer.mustache b/modules/swagger-codegen/src/main/resources/objc/apiBodyResponseWithContainer.mustache
deleted file mode 100644
index acaeaf2ddf5..00000000000
--- a/modules/swagger-codegen/src/main/resources/objc/apiBodyResponseWithContainer.mustache
+++ /dev/null
@@ -1,38 +0,0 @@
-    // {{returnContainer}} container response type
-    return [self.apiClient dictionary: requestUrl 
-                       method: @"{{httpMethod}}" 
-                  queryParams: queryParams 
-                         body: bodyDictionary 
-                 headerParams: headerParams
-                 authSettings: authSettings
-           requestContentType: requestContentType
-          responseContentType: responseContentType
-              completionBlock: ^(NSDictionary *data, NSError *error) {
-                if (error) {
-                    {{#returnBaseType}}completionBlock(nil, error);{{/returnBaseType}}{{^returnBaseType}}completionBlock(error);{{/returnBaseType}}
-                    return;
-                }
-                {{#isMapContainer}}
-                NSDictionary *result = nil;
-                if (data) {
-                    result = [[NSDictionary alloc]initWithDictionary: data];
-                }
-                completionBlock(data, nil);
-                {{/isMapContainer}}{{#isListContainer}}
-                {{#returnBaseType}}if([data isKindOfClass:[NSArray class]]){
-                    NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[data count]];
-                    for (NSDictionary* dict in (NSArray*)data) {
-                        {{#returnTypeIsPrimitive}}
-                        {{returnBaseType}}* d = [[{{{returnBaseType}}} alloc]initWithString: dict];
-                        {{/returnTypeIsPrimitive}}
-                        {{^returnTypeIsPrimitive}}
-                        {{{returnBaseType}}}* d = [[{{{returnBaseType}}} alloc] initWithDictionary:dict error:nil];
-                        {{/returnTypeIsPrimitive}}
-                        [objs addObject:d];
-                    }
-                    completionBlock(({{{returnType}}})objs, nil);
-                }
-                {{/returnBaseType}}
-                {{/isListContainer}}
-            }];
-    
diff --git a/modules/swagger-codegen/src/main/resources/objc/apiNonPrimitiveResponse.mustache b/modules/swagger-codegen/src/main/resources/objc/apiNonPrimitiveResponse.mustache
deleted file mode 100644
index da8ea063bfb..00000000000
--- a/modules/swagger-codegen/src/main/resources/objc/apiNonPrimitiveResponse.mustache
+++ /dev/null
@@ -1,24 +0,0 @@
-    {{^returnTypeIsPrimitive}}
-    // comples response type
-    return [self.apiClient dictionary: requestUrl
-                       method: @"{{httpMethod}}"
-                  queryParams: queryParams
-                         body: bodyDictionary
-                 headerParams: headerParams
-                 authSettings: authSettings
-           requestContentType: requestContentType
-          responseContentType: responseContentType
-              completionBlock: ^(NSDictionary *data, NSError *error) {
-                if (error) {
-                    {{#returnBaseType}}completionBlock(nil, error);{{/returnBaseType}}
-                    {{^returnBaseType}}completionBlock(error);{{/returnBaseType}}
-                    return;
-                }
-                {{#returnType}}{{returnType}} result = nil;
-                if (data) {
-                    result = [[{{#instantiationType}}NSClassFromString(@"{{{instantiationType}}}") {{/instantiationType}}{{^instantiationType}}{{{returnBaseType}}} {{/instantiationType}} alloc] {{#returnContainer}}{{#isMapContainer}}initWithDictionary{{/isMapContainer}}{{#isListContainer}} initWithDictionary{{/isListContainer}}{{/returnContainer}}{{^returnContainer}} initWithDictionary{{/returnContainer}}:data error:nil];
-                }
-                {{#returnType}}completionBlock(result , nil);{{/returnType}}
-                {{/returnType}}
-              }];
-    {{/returnTypeIsPrimitive}}
diff --git a/modules/swagger-codegen/src/main/resources/objc/apiPrimitiveResponse.mustache b/modules/swagger-codegen/src/main/resources/objc/apiPrimitiveResponse.mustache
deleted file mode 100644
index d44d356526d..00000000000
--- a/modules/swagger-codegen/src/main/resources/objc/apiPrimitiveResponse.mustache
+++ /dev/null
@@ -1,36 +0,0 @@
-        // primitive response type
-    {{#returnBaseType}}return [self.apiClient stringWithCompletionBlock: requestUrl 
-                                              method: @"{{httpMethod}}" 
-                                         queryParams: queryParams 
-                                                body: bodyDictionary 
-                                        headerParams: headerParams
-                                        authSettings: authSettings
-                                  requestContentType: requestContentType
-                                 responseContentType: responseContentType
-                                     completionBlock: ^(NSString *data, NSError *error) {
-                         if (error) {
-                             completionBlock(nil, error);
-                             return;
-                         }
-                        {{returnBaseType}} *result = data ? [[{{#instantiationType}}NSClassFromString(@"{{{instantiationType}}}") {{/instantiationType}}{{^instantiationType}}{{{returnBaseType}}} {{/instantiationType}} alloc]initWithString: data] : nil;
-                        completionBlock(result, nil);
-                     }];
-    {{/returnBaseType}}
-    {{^returnBaseType}}
-    // no return base type
-    return [self.apiClient stringWithCompletionBlock: requestUrl 
-                                      method: @"{{httpMethod}}" 
-                                 queryParams: queryParams 
-                                        body: bodyDictionary 
-                                headerParams: headerParams
-                          requestContentType: requestContentType
-                         responseContentType: responseContentType
-                             completionBlock: ^(NSString *data, NSError *error) {
-                if (error) {
-                    completionBlock(error);
-                    return;
-                }
-                completionBlock(nil);
-                    }];
-    {{/returnBaseType}}
-    
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 b728e6bb06c..33c0f8cf42b 100644
--- a/modules/swagger-codegen/src/main/resources/objc/model-body.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/model-body.mustache
@@ -3,12 +3,21 @@
 #import "{{classname}}.h"
 
 @implementation {{classname}}
-  
+
+/**
+ * Maps json key to property name.
+ * This method is used by `JSONModel`.
+ */
 + (JSONKeyMapper *)keyMapper
 {
   return [[JSONKeyMapper alloc] initWithDictionary:@{ {{#vars}}@"{{baseName}}": @"{{name}}"{{#hasMore}}, {{/hasMore}}{{/vars}} }];
 }
 
+/**
+ * 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 = @[{{#vars}}{{^required}}@"{{name}}"{{#hasMore}}, {{/hasMore}}{{/required}}{{/vars}}];
@@ -21,6 +30,14 @@
   }
 }
 
+/**
+ * Gets the string presentation of the object.
+ * This method will be called when logging model object using `NSLog`.
+ */
+- (NSString *)description {
+    return [[self toDictionary] description];
+}
+
 {{/model}}
 @end
 {{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/objc/model-header.mustache b/modules/swagger-codegen/src/main/resources/objc/model-header.mustache
index 81ac19a0b73..c3f3c865424 100644
--- a/modules/swagger-codegen/src/main/resources/objc/model-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/model-header.mustache
@@ -1,5 +1,12 @@
 #import <Foundation/Foundation.h>
-#import "SWGObject.h"
+#import "{{classPrefix}}Object.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.
+ */
+
 {{#imports}}#import "{{import}}.h"
 {{/imports}}
 {{newline}}
@@ -8,8 +15,8 @@
 
 @protocol {{classname}}
 @end
-  
-@interface {{classname}} : SWGObject
+
+@interface {{classname}} : {{classPrefix}}Object
 
 {{#vars}}
 {{#description}}/* {{{description}}} {{^required}}[optional]{{/required}}
diff --git a/modules/swagger-codegen/src/main/resources/objc/podspec.mustache b/modules/swagger-codegen/src/main/resources/objc/podspec.mustache
new file mode 100644
index 00000000000..9ce03695bcf
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/objc/podspec.mustache
@@ -0,0 +1,31 @@
+#
+# Be sure to run `pod lib lint {{podName}}.podspec' to ensure this is a
+# valid spec and remove all comments before submitting the spec.
+#
+# Any lines starting with a # are optional, but encouraged
+#
+# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html
+#
+
+Pod::Spec.new do |s|
+    s.name             = "{{podName}}"
+    s.version          = "{{podVersion}}"
+{{#apiInfo}}{{#apis}}{{^hasMore}}
+    s.summary          = "{{appName}}"
+    s.description      = <<-DESC
+                         {{appDescription}}
+                         DESC
+{{/hasMore}}{{/apis}}{{/apiInfo}}
+    s.platform     = :ios, '7.0'
+    s.requires_arc = true
+
+    s.framework    = 'SystemConfiguration'
+
+    s.source_files = '{{podName}}/**/*'
+    s.public_header_files = '{{podName}}/**/*.h'
+
+    s.dependency 'AFNetworking', '~> 2.3'
+    s.dependency 'JSONModel', '~> 1.1'
+    s.dependency 'ISO8601', '~> 0.3'
+end
+
diff --git a/modules/swagger-codegen/src/main/resources/objc/voidResponse.mustache b/modules/swagger-codegen/src/main/resources/objc/voidResponse.mustache
deleted file mode 100644
index 7bbbc14c066..00000000000
--- a/modules/swagger-codegen/src/main/resources/objc/voidResponse.mustache
+++ /dev/null
@@ -1,15 +0,0 @@
-    return [self.apiClient stringWithCompletionBlock: requestUrl 
-                                      method: @"{{httpMethod}}" 
-                                 queryParams: queryParams 
-                                        body: bodyDictionary 
-                                headerParams: headerParams
-                                authSettings: authSettings
-                          requestContentType: requestContentType
-                         responseContentType: responseContentType
-                             completionBlock: ^(NSString *data, NSError *error) {
-                if (error) {
-                    completionBlock(error);
-                    return;
-                }
-                completionBlock(nil);
-                    }];
diff --git a/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache
index 2bcdd6da690..fa88dbd0333 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::{{invokerPackage}}::ApiClient;
+package WWW::{{moduleName}}::ApiClient;
 
 use strict;
 use warnings;
@@ -18,18 +18,18 @@ use Log::Any qw($log);
 use Carp;
 use Module::Runtime qw(use_module);
 
-use WWW::{{invokerPackage}}::Configuration;
+use WWW::{{moduleName}}::Configuration;
 
 sub new
 {
-  my $class = shift;
-  my (%args) = (
-    'ua' => LWP::UserAgent->new,
-    'base_url' => '{{basePath}}',
-    @_
-  );
-
-  return bless \%args, $class;
+    my $class = shift;
+    my (%args) = (
+        'ua' => LWP::UserAgent->new,
+        'base_url' => '{{basePath}}',
+        @_
+    );
+  
+    return bless \%args, $class;
 }
 
 # Set the user agent of the API client
@@ -37,8 +37,8 @@ sub new
 # @param string $user_agent The user agent of the API client
 #
 sub set_user_agent {
-  my ($self, $user_agent) = @_;
-  $self->{http_user_agent}= $user_agent;
+    my ($self, $user_agent) = @_;
+    $self->{http_user_agent}= $user_agent;
 }
 
 # Set timeout
@@ -46,11 +46,11 @@ sub set_user_agent {
 # @param integer $seconds Number of seconds before timing out [set to 0 for no timeout]
 # 
 sub set_timeout {
-  my ($self, $seconds) = @_;
-  if (!looks_like_number($seconds)) {
-    croak('Timeout variable must be numeric.');
-  }
-  $self->{http_timeout} = $seconds;
+    my ($self, $seconds) = @_;
+    if (!looks_like_number($seconds)) {
+        croak('Timeout variable must be numeric.');
+    }
+    $self->{http_timeout} = $seconds;
 }
 
 # make the HTTP request
@@ -61,71 +61,71 @@ sub set_timeout {
 # @param array $headerParams parameters to be place in request header
 # @return mixed
 sub call_api {
-  my $self = shift;
-  my ($resource_path, $method, $query_params, $post_params, $header_params, $body_data, $auth_settings) = @_;
-
-  # update parameters based on authentication settings
-  $self->update_params_for_auth($header_params, $query_params, $auth_settings); 
-
-
-  my $_url = $self->{base_url} . $resource_path;
-
-  # build query 
-  if (%$query_params) {
-    $_url = ($_url . '?' . eval { URI::Query->new($query_params)->stringify });
-  }
-
-
-  # body data
-  $body_data = to_json($body_data->to_hash) if defined $body_data && $body_data->can('to_hash'); # model to json string
-  my $_body_data = %$post_params ? $post_params : $body_data;
-
-  # Make the HTTP request
-  my $_request;
-  if ($method eq 'POST') {
-      # multipart
-      $header_params->{'Content-Type'} = lc $header_params->{'Content-Type'} eq 'multipart/form' ? 
-          'form-data' : $header_params->{'Content-Type'};
-      
-      $_request = POST($_url, %$header_params, Content => $_body_data);
-
-  }
-  elsif ($method eq 'PUT') {
-      # multipart
-      $header_params->{'Content-Type'}  = lc $header_params->{'Content-Type'} eq 'multipart/form' ? 
-          'form-data' : $header_params->{'Content-Type'};
-
-      $_request = PUT($_url, %$header_params, Content => $_body_data);
-
-  }
-  elsif ($method eq 'GET') {
-      my $headers = HTTP::Headers->new(%$header_params);
-      $_request = GET($_url, %$header_params);
-  }
-  elsif ($method eq 'HEAD') {
-      my $headers = HTTP::Headers->new(%$header_params);
-      $_request = HEAD($_url,%$header_params); 
-  }
-  elsif ($method eq 'DELETE') { #TODO support form data
-      my $headers = HTTP::Headers->new(%$header_params);
-      $_request = DELETE($_url, %$headers);
-  }
-  elsif ($method eq 'PATCH') { #TODO
-  }
-  else {
-  }
- 
-  $self->{ua}->timeout($self->{http_timeout} || $WWW::{{invokerPackage}}::Configuration::http_timeout); 
-  $self->{ua}->agent($self->{http_user_agent} || $WWW::{{invokerPackage}}::Configuration::http_user_agent);
+    my $self = shift;
+    my ($resource_path, $method, $query_params, $post_params, $header_params, $body_data, $auth_settings) = @_;
+  
+    # update parameters based on authentication settings
+    $self->update_params_for_auth($header_params, $query_params, $auth_settings); 
+  
+  
+    my $_url = $self->{base_url} . $resource_path;
+  
+    # build query 
+    if (%$query_params) {
+        $_url = ($_url . '?' . eval { URI::Query->new($query_params)->stringify });
+    }
+  
+  
+    # body data
+    $body_data = to_json($body_data->to_hash) if defined $body_data && $body_data->can('to_hash'); # model to json string
+    my $_body_data = %$post_params ? $post_params : $body_data;
+  
+    # Make the HTTP request
+    my $_request;
+    if ($method eq 'POST') {
+        # multipart
+        $header_params->{'Content-Type'} = lc $header_params->{'Content-Type'} eq 'multipart/form' ? 
+            'form-data' : $header_params->{'Content-Type'};
+        
+        $_request = POST($_url, %$header_params, Content => $_body_data);
+  
+    }
+    elsif ($method eq 'PUT') {
+        # multipart
+        $header_params->{'Content-Type'}  = lc $header_params->{'Content-Type'} eq 'multipart/form' ? 
+            'form-data' : $header_params->{'Content-Type'};
+  
+        $_request = PUT($_url, %$header_params, Content => $_body_data);
+  
+    }
+    elsif ($method eq 'GET') {
+        my $headers = HTTP::Headers->new(%$header_params);
+        $_request = GET($_url, %$header_params);
+    }
+    elsif ($method eq 'HEAD') {
+        my $headers = HTTP::Headers->new(%$header_params);
+        $_request = HEAD($_url,%$header_params); 
+    }
+    elsif ($method eq 'DELETE') { #TODO support form data
+        my $headers = HTTP::Headers->new(%$header_params);
+        $_request = DELETE($_url, %$headers);
+    }
+    elsif ($method eq 'PATCH') { #TODO
+    }
+    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);
+    
+    my $_response = $self->{ua}->request($_request);
+  
+    unless ($_response->is_success) {
+        croak("API Exception(".$_response->code."): ".$_response->message);
+    }
+       
+    return $_response->content;
   
-  my $_response = $self->{ua}->request($_request);
-
-  unless ($_response->is_success) {
-    croak("API Exception(".$_response->code."): ".$_response->message);
-  }
-     
-  return $_response->content;
-
 }
 
 #  Take value and turn it into a string suitable for inclusion in
@@ -180,13 +180,13 @@ sub to_form_value {
 # @param string $value the value of the parameter
 # @return string the header string
 sub to_string {
-  my ($self, $value) = @_;
-  if (ref($value) eq "DateTime") { # datetime in ISO8601 format
-    return $value->datetime();
-  }
-  else {
-    return $value;
-  }
+    my ($self, $value) = @_;
+    if (ref($value) eq "DateTime") { # datetime in ISO8601 format
+        return $value->datetime();
+    }
+    else {
+        return $value;
+    }
 }
 
 # Deserialize a JSON string into an object
@@ -196,35 +196,55 @@ sub to_string {
 # @return object an instance of $class
 sub deserialize
 {
-  my ($self, $class, $data) = @_;
-  $log->debugf("deserializing %s for %s", $data, $class);
-  my $_result;
-
-  if (not defined $data) {
-    return undef;
-  } elsif ( lc(substr($class, 0, 4)) eq 'map[') { #hash
-    $_result = \(json_decode $data);
-  } elsif ( lc(substr($class, 0, 6)) eq 'array[' ) { # array of data
-    return $data if $data eq '[]'; # return if empty array
-
-    my $_sub_class = substr($class, 6, -1);
-    my @_json_data = json_decode $data;
-    my @_values = ();
-    foreach my $_value (@_json_data) {
-      push @_values, $self->deserialize($_sub_class, $_value);
+    my ($self, $class, $data) = @_;
+    $log->debugf("deserializing %s for %s", $data, $class);
+  
+    if (not defined $data) {
+        return undef;
+    } elsif ( (substr($class, 0, 5)) eq 'HASH[') { #hash
+        if ($class =~ /^HASH\[(.*),(.*)\]$/) {
+            my ($key_type, $type) = ($1, $2);
+            my %hash;
+            my $decoded_data = decode_json $data;
+            foreach my $key (keys %$decoded_data) {
+                if (ref $decoded_data->{$key} eq 'HASH') {
+                    $hash{$key} = $self->deserialize($type, encode_json $decoded_data->{$key});
+                } else {
+                    $hash{$key} = $self->deserialize($type, $decoded_data->{$key});
+                }
+            }
+            return \%hash;
+        } else {
+          #TODO log error
+        }
+    
+    } elsif ( (substr($class, 0, 6)) eq 'ARRAY[' ) { # array of data
+        return $data if $data eq '[]'; # return if empty array
+    
+        my $_sub_class = substr($class, 6, -1);
+        my $_json_data = decode_json $data;
+        my @_values = ();
+        foreach my $_value (@$_json_data) {
+            if (ref $_value eq 'ARRAY') {
+                push @_values, $self->deserialize($_sub_class, encode_json $_value);
+            } else {
+                push @_values, $self->deserialize($_sub_class, $_value);
+            }
+        }
+        return \@_values;
+    } elsif ($class eq 'DateTime') {
+        return DateTime->from_epoch(epoch => str2time($data));
+    } elsif (grep /^$class$/, ('string', 'int', 'float', 'bool', 'object')) {
+        return $data;
+    } else { # model
+        my $_instance = use_module("WWW::{{moduleName}}::Object::$class")->new;
+        if (ref $data eq "HASH") {
+            return $_instance->from_hash($data);
+        } else { # string, need to json decode first
+            return $_instance->from_hash(decode_json $data);
+        }
     }
-    $_result = \@_values;
-  } elsif ($class eq 'DateTime') {
-    $_result = DateTime->from_epoch(epoch => str2time($data));
-  } elsif (grep /^$class$/, ('string', 'int', 'float', 'bool', 'object')) { #TODO revise the primitive type
-    $_result= $data;
-  } else { # model
-    my $_instance = use_module("WWW::{{invokerPackage}}::Object::$class")->new;
-    $_result = $_instance->from_hash(decode_json $data);
-  }
-
-  return $_result;
-
+  
 }
 
 # return 'Accept' based on an array of accept provided
@@ -232,16 +252,16 @@ sub deserialize
 # @return String Accept (e.g. application/json)
 sub select_header_accept
 {
-  my ($self, @header) = @_;
-
-  if (@header == 0 || (@header == 1 && $header[0] eq '')) {
-    return undef;
-  } elsif (grep(/^application\/json$/i, @header)) {
-    return 'application/json';
-  } else {
-    return join(',', @header);
-  }
-
+    my ($self, @header) = @_;
+  
+    if (@header == 0 || (@header == 1 && $header[0] eq '')) {
+        return undef;
+    } elsif (grep(/^application\/json$/i, @header)) {
+        return 'application/json';
+    } else {
+        return join(',', @header);
+    }
+  
 }
 
 # return the content type based on an array of content-type provided
@@ -249,16 +269,16 @@ sub select_header_accept
 # @return String Content-Type (e.g. application/json)
 sub select_header_content_type
 {
-  my ($self, @header) = @_;
-
-  if (@header == 0 || (@header == 1 && $header[0] eq '')) {
-    return 'application/json'; # default to application/json
-  } elsif (grep(/^application\/json$/i, @header)) {
-    return 'application/json';
-  } else {
-    return join(',', @header);
-  }
-
+    my ($self, @header) = @_;
+  
+    if (@header == 0 || (@header == 1 && $header[0] eq '')) {
+        return 'application/json'; # default to application/json
+    } elsif (grep(/^application\/json$/i, @header)) {
+        return 'application/json';
+    } else {
+        return join(',', @header);
+    }
+  
 }
 
 # Get API key (with prefix if set)
@@ -267,10 +287,10 @@ sub select_header_content_type
 sub get_api_key_with_prefix
 {
     my ($self, $api_key) = @_;
-    if ($WWW::{{invokerPackage}}::Configuration::api_key_prefix->{$api_key}) {
-      return $WWW::{{invokerPackage}}::Configuration::api_key_prefix->{$api_key}." ".$WWW::{{invokerPackage}}::Configuration::api_key->{$api_key};
+    if ($WWW::{{moduleName}}::Configuration::api_key_prefix->{$api_key}) {
+        return $WWW::{{moduleName}}::Configuration::api_key_prefix->{$api_key}." ".$WWW::{{moduleName}}::Configuration::api_key->{$api_key};
     } else {
-      return $WWW::{{invokerPackage}}::Configuration::api_key->{$api_key};
+        return $WWW::{{moduleName}}::Configuration::api_key->{$api_key};
     }
 }
 
@@ -280,24 +300,24 @@ sub get_api_key_with_prefix
 # @param array $queryParams query parameters (by ref)
 # @param array $authSettings array of authentication scheme (e.g ['api_key'])
 sub update_params_for_auth {
-  my ($self, $header_params, $query_params, $auth_settings) = @_;
-
-  return if (!defined($auth_settings) || scalar(@$auth_settings) == 0);
-
-  # one endpoint can have more than 1 auth settings
-  foreach my $auth (@$auth_settings) {
-    # determine which one to use
-    if (!defined($auth)) {
-    }
-    {{#authMethods}}elsif ($auth eq '{{name}}') {
-      {{#isApiKey}}{{#isKeyInHeader}}$header_params->{'{{keyParamName}}'} = $self->get_api_key_with_prefix('{{keyParamName}}');{{/isKeyInHeader}}{{#isKeyInQuery}}$query_params->{'{{keyParamName}}'} = $self->get_api_key_with_prefix('{{keyParamName}}');{{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}$header_params->{'Authorization'} = 'Basic '.encode_base64($WWW::{{invokerPackage}}::Configuration::username.":".$WWW::{{invokerPackage}}::Configuration::password);{{/isBasic}}
-        {{#isOAuth}}# TODO support oauth{{/isOAuth}}
-    }
-    {{/authMethods}}
-    else {
-      # TODO show warning about security definition not found
+    my ($self, $header_params, $query_params, $auth_settings) = @_;
+  
+    return if (!defined($auth_settings) || scalar(@$auth_settings) == 0);
+  
+    # one endpoint can have more than 1 auth settings
+    foreach my $auth (@$auth_settings) {
+        # determine which one to use
+        if (!defined($auth)) {
+        }
+        {{#authMethods}}elsif ($auth eq '{{name}}') {
+            {{#isApiKey}}{{#isKeyInHeader}}$header_params->{'{{keyParamName}}'} = $self->get_api_key_with_prefix('{{keyParamName}}');{{/isKeyInHeader}}{{#isKeyInQuery}}$query_params->{'{{keyParamName}}'} = $self->get_api_key_with_prefix('{{keyParamName}}');{{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}$header_params->{'Authorization'} = 'Basic '.encode_base64($WWW::{{moduleName}}::Configuration::username.":".$WWW::{{moduleName}}::Configuration::password);{{/isBasic}}
+            {{#isOAuth}}# TODO support oauth{{/isOAuth}}
+        }
+        {{/authMethods}}
+        else {
+            # TODO show warning about security definition not found
+        }
     }
-  }
 }
 
 
diff --git a/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache b/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache
index b4a7885a798..f3fca3f41a7 100644
--- a/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache
@@ -1,4 +1,4 @@
-package WWW::{{invokerPackage}}::Object::BaseObject;
+package WWW::{{moduleName}}::Object::BaseObject;
 
 require 5.6.0;
 use strict;
@@ -21,56 +21,56 @@ use DateTime;
 
 # return json string
 sub to_hash {
-  return decode_json(JSON->new->convert_blessed->encode( shift ));
+    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->get_attribute_map) {
-    if (defined $self->{$_key}) {
-      $_data->{$self->get_attribute_map->{$_key}} = $self->{$_key};
+    my $self = shift;
+    my $_data = {};
+    foreach my $_key (keys $self->get_attribute_map) {
+        if (defined $self->{$_key}) {
+            $_data->{$self->get_attribute_map->{$_key}} = $self->{$_key};
+        }
     }
-  }
-  return $_data;
+    return $_data;
 }
 
 # from json string
 sub from_hash {
-  my ($self, $hash) = @_;
-  # loop through attributes and use swagger_types to deserialize the data
-  while ( my ($_key, $_type) = each $self->get_swagger_types ) {
-    if ($_type =~ /^array\[/i) { # array
-      my $_subclass = substr($_type, 6, -1);
-      my @_array = ();
-      foreach my $_element (@{$hash->{$self->get_attribute_map->{$_key}}}) {
-        push @_array, $self->_deserialize($_subclass, $_element);
-      }
-      $self->{$_key} = \@_array;
-    } elsif (defined $hash->{$_key}) { #hash(model), primitive, datetime
-      $self->{$_key} = $self->_deserialize($_type, $hash->{$_key});
-    } else {
-      $log->debugf("warning: %s not defined\n", $_key);
+    my ($self, $hash) = @_;
+    # loop through attributes and use swagger_types to deserialize the data
+    while ( my ($_key, $_type) = each $self->get_swagger_types ) {
+        if ($_type =~ /^array\[/i) { # array
+            my $_subclass = substr($_type, 6, -1);
+            my @_array = ();
+            foreach my $_element (@{$hash->{$self->get_attribute_map->{$_key}}}) {
+                push @_array, $self->_deserialize($_subclass, $_element);
+            }
+            $self->{$_key} = \@_array;
+        } elsif (defined $hash->{$_key}) { #hash(model), primitive, datetime
+            $self->{$_key} = $self->_deserialize($_type, $hash->{$_key});
+        } else {
+            $log->debugf("warning: %s not defined\n", $_key);
+        }
     }
-  }
-
-  return $self;
+  
+    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::{{invokerPackage}}::Object::$type->new()";
-    return $_instance->from_hash($data);
-  }
+    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::{{moduleName}}::Object::$type->new()";
+        return $_instance->from_hash($data);
+    }
 }
 
 1;
diff --git a/modules/swagger-codegen/src/main/resources/perl/Configuration.mustache b/modules/swagger-codegen/src/main/resources/perl/Configuration.mustache
index 38eb2ad8dae..0a097dda7bd 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::{{invokerPackage}}::Configuration;
+package WWW::{{moduleName}}::Configuration;
 
 use strict;
 use warnings;
@@ -7,6 +7,8 @@ use utf8;
 use Log::Any qw($log);
 use Carp;
 
+use constant VERSION => '{{moduleVersion}}';
+
 # class/static variables
 our $api_client;
 our $http_timeout = 180;
diff --git a/modules/swagger-codegen/src/main/resources/perl/api.mustache b/modules/swagger-codegen/src/main/resources/perl/api.mustache
index c67139ee33d..e69e4e3066f 100644
--- a/modules/swagger-codegen/src/main/resources/perl/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/api.mustache
@@ -17,7 +17,7 @@
 # NOTE: This class is auto generated by the swagger code generator program. 
 # Do not edit the class manually.
 #
-package WWW::{{invokerPackage}}::{{classname}};
+package WWW::{{moduleName}}::{{classname}};
 
 require 5.6.0;
 use strict;
@@ -27,18 +27,12 @@ use Exporter;
 use Carp qw( croak );
 use Log::Any qw($log);
 
-use WWW::{{invokerPackage}}::ApiClient;
-use WWW::{{invokerPackage}}::Configuration;
-
-{{#operations}}
-our @EXPORT_OK = qw(
-  {{#operation}}{{{nickname}}} 
-  {{/operation}}
-);
+use WWW::{{moduleName}}::ApiClient;
+use WWW::{{moduleName}}::Configuration;
 
 sub new {
     my $class   = shift;
-    my $default_api_client = $WWW::{{invokerPackage}}::Configuration::api_client ? $WWW::{{invokerPackage}}::Configuration::api_client  : WWW::{{invokerPackage}}::ApiClient->new;
+    my $default_api_client = $WWW::{{moduleName}}::Configuration::api_client ? $WWW::{{moduleName}}::Configuration::api_client  : WWW::{{moduleName}}::ApiClient->new;
     my (%self) = (
         'api_client' => $default_api_client,
         @_
@@ -52,89 +46,90 @@ sub new {
     bless \%self, $class;
 
 }
+{{#operations}}
 
-    {{#operation}}
-    #
-    # {{{nickname}}}
-    #
-    # {{{summary}}}
-    # 
- {{#allParams}}   # @param {{dataType}} ${{paramName}} {{description}} {{^optional}}(required){{/optional}}{{#optional}}(optional){{/optional}}
- {{/allParams}}   # @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
-    #
-    sub {{nickname}} {
-      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}}");
-      }
-      {{/required}}{{/allParams}}
-
-      # parse inputs
-      my $_resource_path = '{{path}}';
-      $_resource_path =~ s/{format}/json/; # default format to json
-
-      my $_method = '{{httpMethod}}';
-      my $query_params = {};
-      my $header_params = {};
-      my $form_params = {};
-
-      # 'Accept' and 'Content-Type' header
-      my $_header_accept = $self->{api_client}->select_header_accept({{#produces}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/produces}});
-      if ($_header_accept) {
+{{#operation}}
+#
+# {{{nickname}}}
+#
+# {{{summary}}}
+# 
+{{#allParams}}# @param {{dataType}} ${{paramName}} {{description}} {{#required}}(required){{/required}}{{^required}}(optional){{/required}}
+{{/allParams}}# @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
+#
+sub {{nickname}} {
+    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}}");
+    }
+    {{/required}}{{/allParams}}
+
+    # parse inputs
+    my $_resource_path = '{{path}}';
+    $_resource_path =~ s/{format}/json/; # default format to json
+
+    my $_method = '{{httpMethod}}';
+    my $query_params = {};
+    my $header_params = {};
+    my $form_params = {};
+
+    # 'Accept' and 'Content-Type' header
+    my $_header_accept = $self->{api_client}->select_header_accept({{#produces}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/produces}});
+    if ($_header_accept) {
         $header_params->{'Accept'} = $_header_accept;
-      }
-      $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type({{#consumes}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/consumes}});
+    }
+    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type({{#consumes}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/consumes}});
 
-      {{#queryParams}}# query params
-      if ( exists $args{'{{paramName}}'}) {
+    {{#queryParams}}# query params
+    if ( exists $args{'{{paramName}}'}) {
         $query_params->{'{{baseName}}'} = $self->{api_client}->to_query_value($args{'{{paramName}}'});
-      }{{/queryParams}}
-      {{#headerParams}}# header params
-      if ( exists $args{'{{paramName}}'}) {
+    }{{/queryParams}}
+    {{#headerParams}}# header params
+    if ( exists $args{'{{paramName}}'}) {
         $header_params->{'{{baseName}}'} = $self->{api_client}->to_header_value($args{'{{paramName}}'});
-      }{{/headerParams}}
-      {{#pathParams}}# path params
-      if ( exists $args{'{{paramName}}'}) {
+    }{{/headerParams}}
+    {{#pathParams}}# path params
+    if ( exists $args{'{{paramName}}'}) {
         my $_base_variable = "{" . "{{baseName}}" . "}";
         my $_base_value = $self->{api_client}->to_path_value($args{'{{paramName}}'});
         $_resource_path =~ s/$_base_variable/$_base_value/g;
-      }{{/pathParams}}
-      {{#formParams}}# form params
-      if ( exists $args{'{{paramName}}'} ) {
+    }{{/pathParams}}
+    {{#formParams}}# form params
+    if ( exists $args{'{{paramName}}'} ) {
         {{#isFile}}$form_params->{'{{baseName}}'} = [] unless defined $form_params->{'{{baseName}}'};
         push $form_params->{'{{baseName}}'}, $args{'{{paramName}}'};
         {{/isFile}}
         {{^isFile}}$form_params->{'{{baseName}}'} = $self->{api_client}->to_form_value($args{'{{paramName}}'});
         {{/isFile}}
-      }{{/formParams}}
-      my $_body_data;
-      {{#bodyParams}}# body params
-      if ( exists $args{'{{paramName}}'}) {
+    }{{/formParams}}
+    my $_body_data;
+    {{#bodyParams}}# body params
+    if ( exists $args{'{{paramName}}'}) {
         $_body_data = $args{'{{paramName}}'};
-      }{{/bodyParams}}
+    }{{/bodyParams}}
 
-      # authentication setting, if any
-      my $auth_settings = [{{#authMethods}}'{{name}}'{{#hasMore}}, {{/hasMore}}{{/authMethods}}];
+    # authentication setting, if any
+    my $auth_settings = [{{#authMethods}}'{{name}}'{{#hasMore}}, {{/hasMore}}{{/authMethods}}];
 
-      # make the API Call
-      {{#returnType}}my $response = $self->{api_client}->call_api($_resource_path, $_method,
-                                             $query_params, $form_params,
-                                             $header_params, $_body_data, $auth_settings);
-      if (!$response) {
+    # make the API Call
+    {{#returnType}}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('{{returnType}}', $response);
-      return $_response_object;{{/returnType}}
-      {{^returnType}}$self->{api_client}->call_api($_resource_path, $_method,
-                                             $query_params, $form_params,
-                                             $header_params, $_body_data, $auth_settings);
-      return;
-      {{/returnType}}
-  }
-  {{/operation}}
+    }
+    my $_response_object = $self->{api_client}->deserialize('{{returnType}}', $response);
+    return $_response_object;{{/returnType}}
+    {{^returnType}}$self->{api_client}->call_api($_resource_path, $_method,
+                                           $query_params, $form_params,
+                                           $header_params, $_body_data, $auth_settings);
+    return;
+    {{/returnType}}
+}
+{{/operation}}
 {{newline}}
 {{/operations}}
 
diff --git a/modules/swagger-codegen/src/main/resources/perl/object.mustache b/modules/swagger-codegen/src/main/resources/perl/object.mustache
index c527957a9b1..d4d6961c646 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::{{invokerPackage}}::Object::{{classname}};
+package WWW::{{moduleName}}::Object::{{classname}};
 
 require 5.6.0;
 use strict;
@@ -13,7 +13,7 @@ use Log::Any qw($log);
 use Date::Parse;
 use DateTime;
 
-use base "WWW::{{invokerPackage}}::Object::BaseObject";
+use base "WWW::{{moduleName}}::Object::BaseObject";
 
 #
 #{{description}}
@@ -22,13 +22,13 @@ use base "WWW::{{invokerPackage}}::Object::BaseObject";
 #
 
 my $swagger_types = {
-      {{#vars}}'{{name}}' => '{{{datatype}}}'{{#hasMore}},
-      {{/hasMore}}{{/vars}}
+    {{#vars}}'{{name}}' => '{{{datatype}}}'{{#hasMore}},
+    {{/hasMore}}{{/vars}}
 };
 
 my $attribute_map = {
-      {{#vars}}'{{name}}' => '{{baseName}}'{{#hasMore}},
-      {{/hasMore}}{{/vars}}
+    {{#vars}}'{{name}}' => '{{baseName}}'{{#hasMore}},
+    {{/hasMore}}{{/vars}}
 };
 
 # new object
@@ -45,12 +45,12 @@ sub new {
 
 # get swagger type of the attribute
 sub get_swagger_types {
-  return $swagger_types;
+    return $swagger_types;
 }
 
 # get attribute mappping
 sub get_attribute_map {
-  return $attribute_map;
+    return $attribute_map;
 }
 
 1;
diff --git a/modules/swagger-codegen/src/main/resources/php/APIClient.mustache b/modules/swagger-codegen/src/main/resources/php/APIClient.mustache
deleted file mode 100644
index 6356143f914..00000000000
--- a/modules/swagger-codegen/src/main/resources/php/APIClient.mustache
+++ /dev/null
@@ -1,449 +0,0 @@
-<?php
-/**
- *  Copyright 2015 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.
- */
-
-namespace {{invokerPackage}};
-
-class ApiClient {
-
-  public static $PATCH = "PATCH";
-  public static $POST = "POST";
-  public static $GET = "GET";
-  public static $PUT = "PUT";
-  public static $DELETE = "DELETE";
-  
-  private static $default_header = array();
-
-  /*
-   * @var string timeout (second) of the HTTP request, by default set to 0, no timeout
-   */
-  protected $curl_timeout = 0;
-
-  /*
-   * @var string user agent of the HTTP request, set to "PHP-Swagger" by default
-   */
-  protected $user_agent = "PHP-Swagger";
-
-  /**
-   * @param string $host Base url of the API server (optional)
-   */
-  function __construct($host = null) {
-    if ($host === null) {
-      $this->host = '{{basePath}}';
-    } else {
-      $this->host = $host;
-    }
-  }
-
-  /**
-   * add default header 
-   *
-   * @param string $header_name header name (e.g. Token)
-   * @param string $header_value header value (e.g. 1z8wp3)
-   */
-  public function addDefaultHeader($header_name, $header_value) {
-    if (!is_string($header_name)) 
-      throw new \InvalidArgumentException('Header name must be a string.');
-
-    self::$default_header[$header_name] =  $header_value;
-  }
-
-  /**
-   * get the default header 
-   *
-   * @return array default header
-   */
-  public function getDefaultHeader() {
-    return self::$default_header;
-  }
-
-  /**
-   * delete the default header based on header name
-   *
-   * @param string $header_name header name (e.g. Token)
-   */
-  public function deleteDefaultHeader($header_name) {
-    unset(self::$default_header[$header_name]);
-  }
-
-  /**
-   * set the user agent of the api client
-   *
-   *  @param string $user_agent the user agent of the api client
-   */
-  public function setUserAgent($user_agent) {
-    if (!is_string($user_agent))
-      throw new \InvalidArgumentException('User-agent must be a string.');
-
-    $this->user_agent= $user_agent;
-  }
-
-  /**
-   * get the user agent of the api client
-   * 
-   * @return string user agent
-   */
-  public function getUserAgent($user_agent) {
-    return $this->user_agent;
-  }
-
-  /**
-   * set the HTTP timeout value
-   *
-   * @param integer $seconds Number of seconds before timing out [set to 0 for no timeout]
-   */
-  public function setTimeout($seconds) {
-    if (!is_numeric($seconds) || $seconds < 0)
-      throw new \InvalidArgumentException('Timeout value must be numeric and a non-negative number.');
-
-    $this->curl_timeout = $seconds;
-  }
-
-  /**
-   * get the HTTP timeout value
-   *
-   * @return string HTTP timeout value
-   */
-  public function getTimeout() {
-    return $this->curl_timeout;
-  }
-
-
-  /**
-   * Get API key (with prefix if set)
-   * @param string key name
-   * @return string API key with the prefix
-   */
-  public function getApiKeyWithPrefix($apiKey) {
-    if (isset(Configuration::$apiKeyPrefix[$apiKey])) {
-      return Configuration::$apiKeyPrefix[$apiKey]." ".Configuration::$apiKey[$apiKey];
-    } else if (isset(Configuration::$apiKey[$apiKey])) {
-      return Configuration::$apiKey[$apiKey];
-    } else {
-      return;
-    }
-  }
-
-  /**
-   * update hearder and query param based on authentication setting
-   * 
-   * @param array $headerParams header parameters (by ref)
-   * @param array $queryParams query parameters (by ref)
-   * @param array $authSettings array of authentication scheme (e.g ['api_key'])
-   */
-  public function updateParamsForAuth(&$headerParams, &$queryParams, $authSettings)
-  {
-    if (count($authSettings) == 0)
-      return;
-
-    // one endpoint can have more than 1 auth settings
-    foreach($authSettings as $auth) {
-      // determine which one to use
-      switch($auth) {
-        {{#authMethods}}
-        case '{{name}}':
-          {{#isApiKey}}{{#isKeyInHeader}}$headerParams['{{keyParamName}}'] = $this->getApiKeyWithPrefix('{{keyParamName}}');{{/isKeyInHeader}}{{#isKeyInQuery}}$queryParams['{{keyParamName}}'] = $this->getApiKeyWithPrefix('{{keyParamName}}');{{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}$headerParams['Authorization'] = 'Basic '.base64_encode(Configuration::$username.":".Configuration::$password);{{/isBasic}}
-          {{#isOAuth}}//TODO support oauth{{/isOAuth}}
-          break;
-        {{/authMethods}}
-        default:
-          //TODO show warning about security definition not found
-      }
-    }
-  }
-  
-  /**
-   * @param string $resourcePath path to method endpoint
-   * @param string $method method to call
-   * @param array $queryParams parameters to be place in query URL
-   * @param array $postData parameters to be placed in POST body
-   * @param array $headerParams parameters to be place in request header
-   * @return mixed
-   */
-  public function callApi($resourcePath, $method, $queryParams, $postData,
-    $headerParams, $authSettings) {
-
-    $headers = array();
-
-    # determine authentication setting
-    $this->updateParamsForAuth($headerParams, $queryParams, $authSettings);
-
-    # construct the http header
-    $headerParams = array_merge((array)self::$default_header, (array)$headerParams);
-
-    foreach ($headerParams as $key => $val) {
-      $headers[] = "$key: $val";
-    }
-
-    // form data
-    if ($postData and in_array('Content-Type: application/x-www-form-urlencoded', $headers)) {
-      $postData = http_build_query($postData);
-    }
-    else if ((is_object($postData) or is_array($postData)) and !in_array('Content-Type: multipart/form-data', $headers)) { // json model
-      $postData = json_encode($this->sanitizeForSerialization($postData));
-    }
-
-    $url = $this->host . $resourcePath;
-
-    $curl = curl_init();
-    // set timeout, if needed
-    if ($this->curl_timeout != 0) {
-      curl_setopt($curl, CURLOPT_TIMEOUT, $this->curl_timeout);
-    }
-    // return the result on success, rather than just TRUE
-    curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-
-    curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
-
-    if (! empty($queryParams)) {
-      $url = ($url . '?' . http_build_query($queryParams));
-    }
-
-    if ($method == self::$POST) {
-      curl_setopt($curl, CURLOPT_POST, true);
-      curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
-    } else if ($method == self::$PATCH) {
-      curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "PATCH");
-      curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
-    } else if ($method == self::$PUT) {
-      curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "PUT");
-      curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
-    } else if ($method == self::$DELETE) {
-      curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "DELETE");
-      curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
-    } else if ($method != self::$GET) {
-      throw new ApiException('Method ' . $method . ' is not recognized.');
-    }
-    curl_setopt($curl, CURLOPT_URL, $url);
-
-    // Set user agent
-    curl_setopt($curl, CURLOPT_USERAGENT, $this->user_agent);
-
-    // debugging for curl
-    if (Configuration::$debug) {
-      error_log("[DEBUG] HTTP Request body  ~BEGIN~\n".print_r($postData, true)."\n~END~\n", 3, Configuration::$debug_file);
-
-      curl_setopt($curl, CURLOPT_VERBOSE, 1);
-      curl_setopt($curl, CURLOPT_STDERR, fopen(Configuration::$debug_file, 'a'));
-    } else {
-      curl_setopt($curl, CURLOPT_VERBOSE, 0);
-    }
-
-    // obtain the HTTP response headers
-    curl_setopt($curl, CURLOPT_HEADER, 1);
-
-    // Make the request
-    $response = curl_exec($curl);
-    $http_header_size = curl_getinfo($curl, CURLINFO_HEADER_SIZE);
-    $http_header = substr($response, 0, $http_header_size);
-    $http_body = substr($response, $http_header_size);
-    $response_info = curl_getinfo($curl);
-
-    // debug HTTP response body
-    if (Configuration::$debug) {
-        error_log("[DEBUG] HTTP Response body ~BEGIN~\n".print_r($http_body, true)."\n~END~\n", 3, Configuration::$debug_file);
-    }
-
-    // Handle the response
-    if ($response_info['http_code'] == 0) {
-      throw new ApiException("API call to $url timed out: ".serialize($response_info), 0, null, null);
-    } else if ($response_info['http_code'] >= 200 && $response_info['http_code'] <= 299 ) {
-      $data = json_decode($http_body);
-      if (json_last_error() > 0) { // if response is a string
-        $data = $http_body;
-      }
-    } else {
-      throw new ApiException("[".$response_info['http_code']."] Error connecting to the API ($url)",
-        $response_info['http_code'], $http_header, $http_body);
-    }
-    return $data;
-  }
-
-  /**
-   * Build a JSON POST object
-   */
-  protected function sanitizeForSerialization($data)
-  {
-    if (is_scalar($data) || null === $data) {
-      $sanitized = $data;
-    } else if ($data instanceof \DateTime) {
-      $sanitized = $data->format(\DateTime::ISO8601);
-    } else if (is_array($data)) {
-      foreach ($data as $property => $value) {
-        $data[$property] = $this->sanitizeForSerialization($value);
-      }
-      $sanitized = $data;
-    } else if (is_object($data)) {
-      $values = array();
-      foreach (array_keys($data::$swaggerTypes) as $property) {
-        if ($data->$property !== null) {
-          $values[$data::$attributeMap[$property]] = $this->sanitizeForSerialization($data->$property);
-        }
-      }
-      $sanitized = $values;
-    } else {
-      $sanitized = (string)$data;
-    }
-
-    return $sanitized;
-  }
-
-  /**
-   * Take value and turn it into a string suitable for inclusion in
-   * the path, by url-encoding.
-   * @param string $value a string which will be part of the path
-   * @return string the serialized object
-   */
-  public static function toPathValue($value) {
-      return rawurlencode(self::toString($value));
-  }
-
-  /**
-   * Take value and turn it into a string suitable for inclusion in
-   * the query, by imploding comma-separated if it's an object.
-   * If it's a string, pass through unchanged. It will be url-encoded
-   * later.
-   * @param object $object an object to be serialized to a string
-   * @return string the serialized object
-   */
-  public static function toQueryValue($object) {
-        if (is_array($object)) {
-            return implode(',', $object);
-        } else {
-            return self::toString($object);
-        }
-  }
-
-  /**
-   * Take value and turn it into a string suitable for inclusion in
-   * the header. If it's a string, pass through unchanged
-   * If it's a datetime object, format it in ISO8601
-   * @param string $value a string which will be part of the header
-   * @return string the header string
-   */
-  public static function toHeaderValue($value) {
-      return self::toString($value);
-  }
-
-  /**
-   * Take value and turn it into a string suitable for inclusion in
-   * the http body (form parameter). If it's a string, pass through unchanged
-   * If it's a datetime object, format it in ISO8601
-   * @param string $value the value of the form parameter
-   * @return string the form string
-   */
-  public static function toFormValue($value) {
-      return self::toString($value);
-  }
-
-  /**
-   * Take value and turn it into a string suitable for inclusion in
-   * the parameter. If it's a string, pass through unchanged
-   * If it's a datetime object, format it in ISO8601
-   * @param string $value the value of the parameter
-   * @return string the header string
-   */
-  public static function toString($value) {
-    if ($value instanceof \DateTime) { // datetime in ISO8601 format
-      return $value->format(\DateTime::ISO8601);
-    }
-    else {
-      return $value;
-    }
-   }
-
-  /**
-   * Deserialize a JSON string into an object
-   *
-   * @param object $object object or primitive to be deserialized
-   * @param string $class class name is passed as a string
-   * @return object an instance of $class
-   */
-  public static function deserialize($data, $class)
-  {
-    if (null === $data) {
-      $deserialized = null;
-    } elseif (substr($class, 0, 4) == 'map[') { # for associative array e.g. map[string,int]
-      $inner = substr($class, 4, -1);
-      $deserialized = array();
-      if(strrpos($inner, ",") !== false) {
-        $subClass_array = explode(',', $inner, 2);
-        $subClass = $subClass_array[1];
-        foreach ($data as $key => $value) {
-          $deserialized[$key] = self::deserialize($value, $subClass);
-        }        
-      }
-    } elseif (strcasecmp(substr($class, 0, 6),'array[') == 0) {
-      $subClass = substr($class, 6, -1);
-      $values = array();
-      foreach ($data as $key => $value) {
-        $values[] = self::deserialize($value, $subClass);
-      }
-      $deserialized = $values;
-    } elseif ($class == 'DateTime') {
-      $deserialized = new \DateTime($data);
-    } elseif (in_array($class, array('string', 'int', 'float', 'double', 'bool', 'object'))) {
-      settype($data, $class);
-      $deserialized = $data;
-    } else {
-      $class = "{{invokerPackage}}\\models\\".$class;
-      $instance = new $class();
-      foreach ($instance::$swaggerTypes as $property => $type) {
-        $original_property_name = $instance::$attributeMap[$property];
-        if (isset($original_property_name) && isset($data->$original_property_name)) {
-          $instance->$property = self::deserialize($data->$original_property_name, $type);
-        }
-      }
-      $deserialized = $instance;
-    }
-
-    return $deserialized;
-  }
-
-  /*
-   * return the header 'Accept' based on an array of Accept provided
-   *
-   * @param array[string] $accept Array of header
-   * @return string Accept (e.g. application/json)
-   */
-  public static function selectHeaderAccept($accept) {
-    if (count($accept) === 0 or (count($accept) === 1 and $accept[0] === '')) {
-      return NULL;
-    } elseif (preg_grep("/application\/json/i", $accept)) {
-      return 'application/json';
-    } else {
-      return implode(',', $accept);
-    }
-  }
-
-  /*
-   * return the content type based on an array of content-type provided
-   *
-   * @param array[string] content_type_array Array fo content-type
-   * @return string Content-Type (e.g. application/json)
-   */
-  public static function selectHeaderContentType($content_type) {
-    if (count($content_type) === 0 or (count($content_type) === 1 and $content_type[0] === '')) {
-      return 'application/json';
-    } elseif (preg_grep("/application\/json/i", $content_type)) {
-      return 'application/json';
-    } else {
-      return implode(',', $content_type);
-    }
-  }
-
-}
-
diff --git a/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache
new file mode 100644
index 00000000000..3c6819ab73b
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache
@@ -0,0 +1,272 @@
+<?php
+/**
+ * ApiClient
+ * 
+ * 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 2015 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 {{invokerPackage}};
+
+/**
+ * ApiClient 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
+ */
+class ApiClient
+{
+
+    public static $PATCH = "PATCH";
+    public static $POST = "POST";
+    public static $GET = "GET";
+    public static $PUT = "PUT";
+    public static $DELETE = "DELETE";
+  
+    /** 
+     * Configuration
+     * @var Configuration
+     */
+    protected $config;
+  
+    /**
+     * Object Serializer
+     * @var ObjectSerializer
+     */
+    protected $serializer;
+  
+    /**
+     * Constructor of the class
+     * @param Configuration $config config for this ApiClient
+     */
+    function __construct(Configuration $config = null)
+    {
+        if ($config == null) {
+            $config = Configuration::getDefaultConfiguration();
+        }
+        
+        $this->config = $config;
+        $this->serializer = new ObjectSerializer();
+    }
+  
+    /**
+     * Get the config
+     * @return Configuration
+     */
+    public function getConfig()
+    {
+        return $this->config;
+    }
+  
+    /**
+     * Get the serializer
+     * @return ObjectSerializer
+     */
+    public function getSerializer()
+    {
+        return $this->serializer;
+    }
+  
+    /**
+     * Get API key (with prefix if set)
+     * @param  string $apiKeyIdentifier name of apikey
+     * @return string API key with the prefix
+     */
+    public function getApiKeyWithPrefix($apiKeyIdentifier)
+    {
+        $prefix = $this->config->getApiKeyPrefix($apiKeyIdentifier);
+        $apiKey = $this->config->getApiKey($apiKeyIdentifier);
+  
+        if (!isset($apiKey)) {
+            return null;
+        }
+  
+        if (isset($prefix)) {
+            $keyWithPrefix = $prefix." ".$apiKey;
+        } else {
+            $keyWithPrefix = $apiKey;
+        }
+  
+        return $keyWithPrefix;
+    }
+    
+    /**
+     * Make the HTTP call (Sync)
+     * @param string $resourcePath path to method endpoint
+     * @param string $method       method to call
+     * @param array  $queryParams  parameters to be place in query URL
+     * @param array  $postData     parameters to be placed in POST body
+     * @param array  $headerParams parameters to be place in request header
+     * @param string $responseType expected response type of the endpoint
+     * @throws \{{invokerPackage}}\ApiException on a non 2xx response
+     * @return mixed
+     */
+    public function callApi($resourcePath, $method, $queryParams, $postData, $headerParams, $responseType=null)
+    {
+  
+        $headers = array();
+  
+        // construct the http header
+        $headerParams = array_merge(
+            (array)$this->config->getDefaultHeaders(), 
+            (array)$headerParams
+        );
+  
+        foreach ($headerParams as $key => $val) {
+            $headers[] = "$key: $val";
+        }
+  
+        // form data
+        if ($postData and in_array('Content-Type: application/x-www-form-urlencoded', $headers)) {
+            $postData = http_build_query($postData);
+        } else if ((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));
+        }
+  
+        $url = $this->config->getHost() . $resourcePath;
+  
+        $curl = curl_init();
+        // set timeout, if needed
+        if ($this->config->getCurlTimeout() != 0) {
+            curl_setopt($curl, CURLOPT_TIMEOUT, $this->config->getCurlTimeout());
+        }
+        // return the result on success, rather than just TRUE
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+  
+        curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
+  
+        if (! empty($queryParams)) {
+            $url = ($url . '?' . http_build_query($queryParams));
+        }
+  
+        if ($method == self::$POST) {
+            curl_setopt($curl, CURLOPT_POST, true);
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
+        } else if ($method == self::$PATCH) {
+            curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "PATCH");
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
+        } else if ($method == self::$PUT) {
+            curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "PUT");
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
+        } else if ($method == self::$DELETE) {
+            curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "DELETE");
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
+        } else if ($method != self::$GET) {
+            throw new ApiException('Method ' . $method . ' is not recognized.');
+        }
+        curl_setopt($curl, CURLOPT_URL, $url);
+  
+        // Set user agent
+        curl_setopt($curl, CURLOPT_USERAGENT, $this->config->getUserAgent());
+  
+        // debugging for curl
+        if ($this->config->getDebug()) {
+            error_log("[DEBUG] HTTP Request body  ~BEGIN~\n".print_r($postData, true)."\n~END~\n", 3, $this->config->getDebugFile());
+  
+            curl_setopt($curl, CURLOPT_VERBOSE, 1);
+            curl_setopt($curl, CURLOPT_STDERR, fopen($this->config->getDebugFile(), 'a'));
+        } else {
+            curl_setopt($curl, CURLOPT_VERBOSE, 0);
+        }
+  
+        // obtain the HTTP response headers
+        curl_setopt($curl, CURLOPT_HEADER, 1);
+  
+        // Make the request
+        $response = curl_exec($curl);
+        $http_header_size = curl_getinfo($curl, CURLINFO_HEADER_SIZE);
+        $http_header = substr($response, 0, $http_header_size);
+        $http_body = substr($response, $http_header_size);
+        $response_info = curl_getinfo($curl);
+  
+        // debug HTTP response body
+        if ($this->config->getDebug()) {
+            error_log("[DEBUG] HTTP Response body ~BEGIN~\n".print_r($http_body, true)."\n~END~\n", 3, $this->config->getDebugFile());
+        }
+  
+        // Handle the response
+        if ($response_info['http_code'] == 0) {
+            throw new ApiException("API call to $url timed out: ".serialize($response_info), 0, null, null);
+        } else if ($response_info['http_code'] >= 200 && $response_info['http_code'] <= 299 ) {
+            // return raw body if response is a file 
+            if ($responseType == '\SplFileObject') {
+                return array($http_body, $http_header);
+            }
+  
+            $data = json_decode($http_body);
+            if (json_last_error() > 0) { // if response is a string
+                $data = $http_body;
+            }
+        } else {
+            throw new ApiException(
+                "[".$response_info['http_code']."] Error connecting to the API ($url)",
+                $response_info['http_code'], $http_header, $http_body
+            );
+        }
+        return array($data, $http_header);
+    }
+  
+    /**
+     * Return the header 'Accept' based on an array of Accept provided
+     *
+     * @param string[] $accept Array of header
+     *
+     * @return string Accept (e.g. application/json)
+     */
+    public static function selectHeaderAccept($accept)
+    {
+        if (count($accept) === 0 or (count($accept) === 1 and $accept[0] === '')) {
+            return null;
+        } elseif (preg_grep("/application\/json/i", $accept)) {
+            return 'application/json';
+        } else {
+            return implode(',', $accept);
+        }
+    }
+  
+    /**
+     * Return the content type based on an array of content-type provided
+     *
+     * @param string[] $content_type Array fo content-type
+     *
+     * @return string Content-Type (e.g. application/json)
+     */
+    public static function selectHeaderContentType($content_type)
+    {
+        if (count($content_type) === 0 or (count($content_type) === 1 and $content_type[0] === '')) {
+            return 'application/json';
+        } elseif (preg_grep("/application\/json/i", $content_type)) {
+            return 'application/json';
+        } else {
+            return implode(',', $content_type);
+        }
+    }
+}
diff --git a/modules/swagger-codegen/src/main/resources/php/ApiException.mustache b/modules/swagger-codegen/src/main/resources/php/ApiException.mustache
index b66c3a51eb7..79d1b4fe0a1 100644
--- a/modules/swagger-codegen/src/main/resources/php/ApiException.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/ApiException.mustache
@@ -1,4 +1,14 @@
 <?php
+/**
+ * ApiException
+ * 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 2015 SmartBear Software
  *
@@ -14,45 +24,97 @@
  *  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 {{invokerPackage}};
 
 use \Exception;
 
-class ApiException extends Exception {
-
-  /**
-   * The HTTP body of the server response.
-   */
-  protected $response_body;
-
-  /**
-   * The HTTP header of the server response.
-   */
-  protected $response_headers;
-
-  public function __construct($message="", $code=0, $responseHeaders=null, $responseBody=null) {
-    parent::__construct($message, $code);
-    $this->response_headers = $responseHeaders;
-    $this->response_body = $responseBody;
-  }
-
-  /**
-   * Get the HTTP response header
-   *
-   * @return string HTTP response header
-   */
-  public function getResponseHeaders() {
-    return $this->response_headers;
-  }
+/**
+ * ApiException 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
+ */
+class ApiException extends Exception
+{
 
-  /**
-   * Get the HTTP response body
-   *
-   * @return string HTTP response body
-   */
-  public function getResponseBody() {
-    return $this->response_body;
-  }
+    /** 
+     * The HTTP body of the server response.
+     * @var string
+     */
+    protected $responseBody;
+  
+    /**
+     * The HTTP header of the server response.
+     * @var string[]
+     */
+    protected $responseHeaders;
+  
+    /**
+     * The deserialized response object
+     * @var $responseObject;
+     */
+    protected $responseObject;
+ 
+    /**
+     * Constructor
+     * @param string $message         Error message
+     * @param string $code            HTTP status code
+     * @param string $responseHeaders HTTP response header
+     * @param string $responseBody    Deseralized response object
+     */
+    public function __construct($message="", $code=0, $responseHeaders=null, $responseBody=null)
+    {
+        parent::__construct($message, $code);
+        $this->responseHeaders = $responseHeaders;
+        $this->responseBody = $responseBody;
+    }
+  
+    /**
+     * Gets the HTTP response header
+     *
+     * @return string HTTP response header
+     */
+    public function getResponseHeaders()
+    {
+        return $this->responseHeaders;
+    }
+  
+    /**
+     * Gets the HTTP response body
+     *
+     * @return string HTTP response body
+     */
+    public function getResponseBody()
+    {
+        return $this->responseBody;
+    }
+  
+    /**
+     * Sets the deseralized response object (during deserialization)
+     * @param mixed $obj Deserialized response object
+     * @return void
+     */
+    public function setResponseObject($obj)
+    {
+        $this->responseObject = $obj;
+    }
 
+    /**
+     * Gets the deseralized response object (during deserialization)
+     *
+     * @return mixed the deserialized response object
+     */
+    public function getResponseObject()
+    {
+        return $this->responseObject;
+    }
 }
diff --git a/modules/swagger-codegen/src/main/resources/php/ObjectSerializer.mustache b/modules/swagger-codegen/src/main/resources/php/ObjectSerializer.mustache
new file mode 100644
index 00000000000..45b56aa9b97
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/php/ObjectSerializer.mustache
@@ -0,0 +1,229 @@
+<?php
+/**
+ * ObjectSerializer 
+ *
+ * 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 2015 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 {{invokerPackage}};
+
+/**
+ * ObjectSerializer 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
+ */
+class ObjectSerializer
+{
+
+    /**
+     * Build a JSON POST object
+     *
+     * @param mixed $data the data to serialize
+     *
+     * @return string serialized form of $data
+     */
+    public function sanitizeForSerialization($data)
+    {
+        if (is_scalar($data) || null === $data) {
+            $sanitized = $data;
+        } else if ($data instanceof \DateTime) {
+            $sanitized = $data->format(\DateTime::ISO8601);
+        } else if (is_array($data)) {
+            foreach ($data as $property => $value) {
+                $data[$property] = $this->sanitizeForSerialization($value);
+            }
+            $sanitized = $data;
+        } else if (is_object($data)) {
+            $values = array();
+            foreach (array_keys($data::$swaggerTypes) as $property) {
+                $getter = $data::$getters[$property];
+                if ($data->$getter() !== null) {
+                    $values[$data::$attributeMap[$property]] = $this->sanitizeForSerialization($data->$getter());
+                }
+            }
+            $sanitized = $values;
+        } else {
+            $sanitized = (string)$data;
+        }
+
+        return $sanitized;
+    }
+
+    /**
+     * Take value and turn it into a string suitable for inclusion in
+     * the path, by url-encoding.
+     *
+     * @param string $value a string which will be part of the path
+     *
+     * @return string the serialized object
+     */
+    public function toPathValue($value)
+    {
+        return rawurlencode($this->toString($value));
+    }
+
+    /**
+     * Take value and turn it into a string suitable for inclusion in
+     * the query, by imploding comma-separated if it's an object.
+     * If it's a string, pass through unchanged. It will be url-encoded
+     * later.
+     *
+     * @param object $object an object to be serialized to a string
+     *
+     * @return string the serialized object
+     */
+    public function toQueryValue($object)
+    {
+        if (is_array($object)) {
+            return implode(',', $object);
+        } else {
+            return $this->toString($object);
+        }
+    }
+
+    /**
+     * Take value and turn it into a string suitable for inclusion in
+     * the header. If it's a string, pass through unchanged
+     * If it's a datetime object, format it in ISO8601
+     *
+     * @param string $value a string which will be part of the header
+     *
+     * @return string the header string
+     */
+    public function toHeaderValue($value)
+    {
+        return $this->toString($value);
+    }
+
+    /**
+     * Take value and turn it into a string suitable for inclusion in
+     * the http body (form parameter). If it's a string, pass through unchanged
+     * If it's a datetime object, format it in ISO8601
+     *
+     * @param string $value the value of the form parameter
+     *
+     * @return string the form string
+     */
+    public function toFormValue($value)
+    {
+        if ($value instanceof SplFileObject) {
+            return $value->getRealPath();
+        } else {
+            return $this->toString($value);
+        }
+    }
+
+    /**
+     * Take value and turn it into a string suitable for inclusion in
+     * the parameter. If it's a string, pass through unchanged
+     * If it's a datetime object, format it in ISO8601
+     *
+     * @param string $value the value of the parameter
+     *
+     * @return string the header string
+     */
+    public function toString($value)
+    {
+        if ($value instanceof \DateTime) { // datetime in ISO8601 format
+            return $value->format(\DateTime::ISO8601);
+        } else {
+            return $value;
+        }
+    }
+
+    /**
+     * 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
+     *
+     * @return object an instance of $class
+     */
+    public function deserialize($data, $class, $httpHeader=null)
+    {
+        if (null === $data) {
+            $deserialized = null;
+        } elseif (substr($class, 0, 4) === 'map[') { // for associative array e.g. map[string,int]
+            $inner = substr($class, 4, -1);
+            $deserialized = array();
+            if (strrpos($inner, ",") !== false) {
+                $subClass_array = explode(',', $inner, 2);
+                $subClass = $subClass_array[1];
+                foreach ($data as $key => $value) {
+                    $deserialized[$key] = $this->deserialize($value, $subClass);
+                }
+            }
+        } elseif (strcasecmp(substr($class, -2), '[]') == 0) {
+            $subClass = substr($class, 0, -2);
+            $values = array();
+            foreach ($data as $key => $value) {
+                $values[] = $this->deserialize($value, $subClass);
+            }
+            $deserialized = $values;
+        } elseif ($class === '\DateTime') {
+            $deserialized = new \DateTime($data);
+        } elseif (in_array($class, array({{&primitives}}))) {
+            settype($data, $class);
+            $deserialized = $data;
+        } elseif ($class === '\SplFileObject') {
+            // determine file name
+            if (preg_match('/Content-Disposition: inline; filename=[\'"]?([^\'"\s]+)[\'"]?$/i', $httpHeader, $match)) {
+                $filename = Configuration::getDefaultConfiguration()->getTempFolderPath().$match[1];
+            } else {
+                $filename = tempnam(Configuration::getDefaultConfiguration()->getTempFolderPath(), '');
+            }
+            $deserialized = new \SplFileObject($filename, "w");
+            $byte_written = $deserialized->fwrite($data);
+            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 {
+            $instance = new $class();
+            foreach ($instance::$swaggerTypes as $property => $type) {
+                $propertySetter = $instance::$setters[$property];
+     
+                if (!isset($propertySetter) || !isset($data->{$instance::$attributeMap[$property]})) {
+                    continue;
+                }
+     
+                $propertyValue = $data->{$instance::$attributeMap[$property]};
+                if (isset($propertyValue)) {
+                    $instance->$propertySetter($this->deserialize($propertyValue, $type));
+                }
+            }
+            $deserialized = $instance;
+        }
+     
+        return $deserialized;
+    }
+}
diff --git a/modules/swagger-codegen/src/main/resources/php/api.mustache b/modules/swagger-codegen/src/main/resources/php/api.mustache
index 12d2eb80744..bb40ae7a98d 100644
--- a/modules/swagger-codegen/src/main/resources/php/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/api.mustache
@@ -1,4 +1,14 @@
 <?php
+/**
+ * {{classname}}
+ * 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 2015 SmartBear Software
  *
@@ -16,122 +26,168 @@
  */
 
 /**
- *
- * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+ * 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 {{invokerPackage}};
-
-{{#operations}}
-class {{classname}} {
-
-  function __construct($apiClient = null) {
-    if (null === $apiClient) {
-      if (Configuration::$apiClient === null) {
-        Configuration::$apiClient = new ApiClient(); // create a new API client if not present
-        $this->apiClient = Configuration::$apiClient;
-      }
-      else
-        $this->apiClient = Configuration::$apiClient; // use the default one
-    } else {
-      $this->apiClient = $apiClient; // use the one provided by the user
-    }
-  }
-
-  private $apiClient; // instance of the ApiClient
-
-  /**
-   * get the API client
-   */
-  public function getApiClient() {
-    return $this->apiClient;
-  }
-
-  /**
-   * set the API client
-   */
-  public function setApiClient($apiClient) {
-    $this->apiClient = $apiClient;
-  }
-
-  {{#operation}}
-  /**
-   * {{{nickname}}}
-   *
-   * {{{summary}}}
-   *
-{{#allParams}}   * @param {{dataType}} ${{paramName}} {{description}} {{^optional}}(required){{/optional}}{{#optional}}(optional){{/optional}}
-{{/allParams}}   * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
-   */
-   public function {{nickname}}({{#allParams}}${{paramName}}{{#optional}}=null{{/optional}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {
-      {{#allParams}}{{#required}}
-      // verify the required parameter '{{paramName}}' is set
-      if (${{paramName}} === null) {
-        throw new \InvalidArgumentException('Missing the required parameter ${{paramName}} when calling {{nickname}}');
-      }
-      {{/required}}{{/allParams}}
-
-      // parse inputs
-      $resourcePath = "{{path}}";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "{{httpMethod}}";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array({{#produces}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/produces}}));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array({{#consumes}}'{{mediaType}}'{{#hasMore}},{{/hasMore}}{{/consumes}}));
+namespace {{apiPackage}};
 
-      {{#queryParams}}// query params
-      if(${{paramName}} !== null) {
-        $queryParams['{{baseName}}'] = $this->apiClient->toQueryValue(${{paramName}});
-      }{{/queryParams}}
-      {{#headerParams}}// header params
-      if(${{paramName}} !== null) {
-        $headerParams['{{baseName}}'] = $this->apiClient->toHeaderValue(${{paramName}});
-      }{{/headerParams}}
-      {{#pathParams}}// path params
-      if(${{paramName}} !== null) {
-        $resourcePath = str_replace("{" . "{{baseName}}" . "}",
-                                    $this->apiClient->toPathValue(${{paramName}}), $resourcePath);
-      }{{/pathParams}}
-      {{#formParams}}// form params
-      if (${{paramName}} !== null) {
-        $formParams['{{baseName}}'] = {{#isFile}}'@' . {{/isFile}}$this->apiClient->toFormValue(${{paramName}});
-      }{{/formParams}}
-      {{#bodyParams}}// body params
-      $_tempBody = null;
-      if (isset(${{paramName}})) {
-        $_tempBody = ${{paramName}};
-      }{{/bodyParams}}
+use \{{invokerPackage}}\Configuration;
+use \{{invokerPackage}}\ApiClient;
+use \{{invokerPackage}}\ApiException;
+use \{{invokerPackage}}\ObjectSerializer;
 
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array({{#authMethods}}'{{name}}'{{#hasMore}}, {{/hasMore}}{{/authMethods}});
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      {{#returnType}}if(! $response) {
-        return null;
-      }
+/**
+ * {{classname}} 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}}
+{
 
-      $responseObject = $this->apiClient->deserialize($response,'{{returnType}}');
-      return $responseObject;{{/returnType}}
-  }
-  {{/operation}}
-{{newline}}
-{{/operations}}
+    /**
+     * API Client
+     * @var \{{invokerPackage}}\ApiClient instance of the ApiClient
+     */
+    protected $apiClient;
+  
+    /**
+     * Constructor
+     * @param \{{invokerPackage}}\ApiClient|null $apiClient The api client to use
+     */
+    function __construct($apiClient = null)
+    {
+        if ($apiClient == null) {
+            $apiClient = new ApiClient();
+            $apiClient->getConfig()->setHost('{{basePath}}');
+        }
+  
+        $this->apiClient = $apiClient;
+    }
+  
+    /**
+     * Get API client
+     * @return \{{invokerPackage}}\ApiClient get the API client
+     */
+    public function getApiClient()
+    {
+        return $this->apiClient;
+    }
+  
+    /**
+     * Set the API client
+     * @param \{{invokerPackage}}\ApiClient $apiClient set the API client
+     * @return {{classname}}
+     */
+    public function setApiClient(ApiClient $apiClient)
+    {
+        $this->apiClient = $apiClient;
+        return $this;
+    }
+  
+    {{#operation}}
+    /**
+     * {{{nickname}}}
+     *
+     * {{{summary}}}
+     *
+  {{#allParams}}   * @param {{dataType}} ${{paramName}} {{description}} {{#required}}(required){{/required}}{{^required}}(optional){{/required}}
+  {{/allParams}}   * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
+     * @throws \{{invokerPackage}}\ApiException on non-2xx response
+     */
+    public function {{nickname}}({{#allParams}}${{paramName}}{{^required}}=null{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
+    {
+        {{#allParams}}{{#required}}
+        // verify the required parameter '{{paramName}}' is set
+        if (${{paramName}} === null) {
+            throw new \InvalidArgumentException('Missing the required parameter ${{paramName}} when calling {{nickname}}');
+        }{{/required}}{{/allParams}}
+  
+        // parse inputs
+        $resourcePath = "{{path}}";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "{{httpMethod}}";
+        $httpBody = '';
+        $queryParams = array();
+        $headerParams = array();
+        $formParams = array();
+        $_header_accept = ApiClient::selectHeaderAccept(array({{#produces}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/produces}}));
+        if (!is_null($_header_accept)) {
+            $headerParams['Accept'] = $_header_accept;
+        }
+        $headerParams['Content-Type'] = ApiClient::selectHeaderContentType(array({{#consumes}}'{{mediaType}}'{{#hasMore}},{{/hasMore}}{{/consumes}}));
+  
+        {{#queryParams}}// query params
+        if (${{paramName}} !== null) {
+            $queryParams['{{baseName}}'] = $this->apiClient->getSerializer()->toQueryValue(${{paramName}});
+        }{{/queryParams}}
+        {{#headerParams}}// header params
+        if (${{paramName}} !== null) {
+            $headerParams['{{baseName}}'] = $this->apiClient->getSerializer()->toHeaderValue(${{paramName}});
+        }{{/headerParams}}
+        {{#pathParams}}// path params
+        if (${{paramName}} !== null) {
+            $resourcePath = str_replace(
+                "{" . "{{baseName}}" . "}",
+                $this->apiClient->getSerializer()->toPathValue(${{paramName}}),
+                $resourcePath
+            );
+        }{{/pathParams}}
+        {{#formParams}}// form params
+        if (${{paramName}} !== null) {
+            $formParams['{{baseName}}'] = {{#isFile}}'@' . {{/isFile}}$this->apiClient->getSerializer()->toFormValue(${{paramName}});
+        }{{/formParams}}
+        {{#bodyParams}}// body params
+        $_tempBody = null;
+        if (isset(${{paramName}})) {
+            $_tempBody = ${{paramName}};
+        }{{/bodyParams}}
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        {{#authMethods}}{{#isApiKey}}
+        $apiKey = $this->apiClient->getApiKeyWithPrefix('{{keyParamName}}');
+        if (isset($apiKey)) {
+            {{#isKeyInHeader}}$headerParams['{{keyParamName}}'] = $apiKey;{{/isKeyInHeader}}{{#isKeyInQuery}}$queryParams['{{keyParamName}}'] = $apiKey;{{/isKeyInQuery}}
+        }{{/isApiKey}}
+        {{#isBasic}}$headerParams['Authorization'] = 'Basic '.base64_encode($this->apiClient->getConfig()->getUsername().":".$this->apiClient->getConfig()->getPassword());{{/isBasic}}
+        {{#isOAuth}}//TODO support oauth{{/isOAuth}}
+        {{/authMethods}}
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams{{#returnType}}, '{{returnType}}'{{/returnType}}
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { {{#responses}}{{#dataType}}
+            case {{code}}:
+                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '{{dataType}}', $httpHeader);
+                $e->setResponseObject($data);
+                break;{{/dataType}}{{/responses}}
+            }
+  
+            throw $e;
+        }
+        {{#returnType}}
+        if (!$response) {
+            return null;
+        }
+  
+        return $this->apiClient->getSerializer()->deserialize($response, '{{returnType}}');
+        {{/returnType}}
+    }
+    {{/operation}}
 }
+{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/php/autoload.mustache b/modules/swagger-codegen/src/main/resources/php/autoload.mustache
new file mode 100644
index 00000000000..04be6e11992
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/php/autoload.mustache
@@ -0,0 +1,41 @@
+<?php
+/**
+ * An example of a project-specific implementation.
+ * 
+ * After registering this autoload function with SPL, the following line
+ * would cause the function to attempt to load the \{{invokerPackage}}\Baz\Qux class
+ * from /path/to/project/{{srcBasePath}}/Baz/Qux.php:
+ * 
+ *      new \{{invokerPackage}}\Baz\Qux;
+ *      
+ * @param string $class The fully-qualified class name.
+ * @return void
+ */
+spl_autoload_register(function ($class) {
+
+    // project-specific namespace prefix
+    $prefix = '{{escapedInvokerPackage}}\\';
+
+    // base directory for the namespace prefix
+    $base_dir = __DIR__ . '/{{srcBasePath}}/';
+
+    // does the class use the namespace prefix?
+    $len = strlen($prefix);
+    if (strncmp($prefix, $class, $len) !== 0) {
+        // no, move to the next registered autoloader
+        return;
+    }
+
+    // get the relative class name
+    $relative_class = substr($class, $len);
+
+    // replace the namespace prefix with the base directory, replace namespace
+    // separators with directory separators in the relative class name, append
+    // with .php
+    $file = $base_dir . str_replace('\\', '/', $relative_class) . '.php';
+
+    // if the file exists, require it
+    if (file_exists($file)) {
+        require $file;
+    }
+});
diff --git a/modules/swagger-codegen/src/main/resources/php/composer.mustache b/modules/swagger-codegen/src/main/resources/php/composer.mustache
index fb47a865834..994b6f1ccc7 100644
--- a/modules/swagger-codegen/src/main/resources/php/composer.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/composer.mustache
@@ -1,32 +1,33 @@
 {
-  "name": "{{invokerPackage}}/{{invokerPackage}}-php",
-  "description": "{{description}}",
-  "keywords": [
-    "swagger",
-    "php",
-    "sdk",
-    "api"
-  ],
-  "homepage": "http://swagger.io",
-  "license": "Apache v2",
-  "authors": [
-    {
-      "name": "Swagger and contributors",
-      "homepage": "https://github.com/swagger-api/swagger-codegen"
+    "name": "{{composerVendorName}}/{{composerProjectName}}",{{#artifactVersion}}
+    "version": "{{artifactVersion}}",{{/artifactVersion}}
+    "description": "{{description}}",
+    "keywords": [
+        "swagger",
+        "php",
+        "sdk",
+        "api"
+    ],
+    "homepage": "http://swagger.io",
+    "license": "Apache v2",
+    "authors": [
+        {
+            "name": "Swagger and contributors",
+            "homepage": "https://github.com/swagger-api/swagger-codegen"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.3",
+        "ext-curl": "*",
+        "ext-json": "*",
+        "ext-mbstring": "*"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~4.0",
+        "satooshi/php-coveralls": "~0.6.1",
+        "squizlabs/php_codesniffer": "~2.0"
+    },
+    "autoload": {
+        "psr-4": { "{{escapedInvokerPackage}}\\" : "{{srcBasePath}}/" }
     }
-  ],
-  "require": {
-    "php": ">=5.3.3",
-    "ext-curl": "*",
-    "ext-json": "*",
-    "ext-mbstring": "*"
-  },
-  "require-dev": {
-    "phpunit/phpunit": "~4.0",
-    "satooshi/php-coveralls": "~0.6.1",
-    "squizlabs/php_codesniffer": "~2.0"
-  },
-  "autoload": {
-    "psr-4": { "{{invokerPackage}}\\" : "lib/" }
-  }
 }
diff --git a/modules/swagger-codegen/src/main/resources/php/configuration.mustache b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
index d48a02d10e8..981085c6378 100644
--- a/modules/swagger-codegen/src/main/resources/php/configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
@@ -1,4 +1,15 @@
 <?php
+/**
+ * Configuration
+ * 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 2015 SmartBear Software
  *
@@ -15,52 +26,439 @@
  *  limitations under the License.
  */
 
-namespace {{invokerPackage}};
-
-class Configuration {
-
-  /**
-   * Associate array to store API key(s)
-   */
-  public static $apiKey = array();
-
-  /**
-   * Associate array to store API prefix (e.g. Bearer)
-   */
-  public static $apiKeyPrefix = array();
-
-  /**
-   * Username for HTTP basic authentication
-   */
-  public static $username = '';
-
-  /**
-   * Password for HTTP basic authentication
-   */
-  public static $password = '';
+/**
+ * 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.
+ */
 
-  /**
-   * The default instance of ApiClient
-   */
-  public static $apiClient;
+namespace {{invokerPackage}};
 
-  /**
-   * Debug switch (default set to false)
-   */
-  public static $debug = false;
+/**
+ * Configuration Class Doc Comment
+ * 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
+ */
+class Configuration
+{
 
-  /**
-   * Debug file location (log to STDOUT by default)
-   */
-  public static $debug_file = 'php://output';
+    private static $_defaultConfiguration = null;
+  
+    /** 
+     * Associate array to store API key(s)
+     *
+     * @var string[]
+     */
+    protected $apiKeys = array();
+  
+    /**
+     * Associate array to store API prefix (e.g. Bearer)
+     *
+     * @var string[]
+     */
+    protected $apiKeyPrefixes = array();
+  
+    /** 
+     * Username for HTTP basic authentication
+     *
+     * @var string
+     */
+    protected $username = '';
+  
+    /**
+     * Password for HTTP basic authentication
+     *
+     * @var string
+     */
+    protected $password = '';
+  
+    /**
+     * The default instance of ApiClient
+     *
+     * @var \{{invokerPackage}}\ApiClient
+     */
+    protected $defaultHeaders = array();
+  
+    /**
+     * The host
+     *
+     * @var string
+     */
+    protected $host = '{{basePath}}';
+  
+    /**
+     * Timeout (second) of the HTTP request, by default set to 0, no timeout
+     *
+     * @var string 
+     */
+    protected $curlTimeout = 0;
+  
+    /**
+     * User agent of the HTTP request, set to "PHP-Swagger" by default
+     *
+     * @var string
+     */
+    protected $userAgent = "PHP-Swagger/{{artifactVersion}}";
+  
+    /**
+     * Debug switch (default set to false)
+     *
+     * @var bool
+     */
+    protected $debug = false;
+  
+    /**
+     * Debug file location (log to STDOUT by default)
+     *
+     * @var string
+     */
+    protected $debugFile = 'php://output';
 
-  /*
-   *  manually initalize  ApiClient
-   */
-  public static function init() {
-    if (self::$apiClient === null)
-      self::$apiClient = new ApiClient();
-  }
+    /**
+     * Debug file location (log to STDOUT by default)
+     *
+     * @var string
+     */
+    protected $tempFolderPath;
 
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        $this->tempFolderPath = sys_get_temp_dir();
+    }
+  
+    /**
+     * Sets API key
+     *
+     * @param string $apiKeyIdentifier API key identifier (authentication scheme)
+     * @param string $key              API key or token
+     *
+     * @return Configuration
+     */
+    public function setApiKey($apiKeyIdentifier, $key)
+    {
+        $this->apiKeys[$apiKeyIdentifier] = $key;
+        return $this;
+    }
+  
+    /**
+     * Gets API key
+     *
+     * @param string $apiKeyIdentifier API key identifier (authentication scheme)
+     *
+     * @return string API key or token
+     */
+    public function getApiKey($apiKeyIdentifier)
+    {
+        return isset($this->apiKeys[$apiKeyIdentifier]) ? $this->apiKeys[$apiKeyIdentifier] : null;
+    }
+  
+    /**
+     * Sets the prefix for API key (e.g. Bearer)
+     *
+     * @param string $apiKeyIdentifier API key identifier (authentication scheme)
+     * @param string $prefix           API key prefix, e.g. Bearer
+     *
+     * @return Configuration
+     */
+    public function setApiKeyPrefix($apiKeyIdentifier, $prefix)
+    {
+        $this->apiKeyPrefixes[$apiKeyIdentifier] = $prefix;
+        return $this;
+    }
+  
+    /**
+     * Gets API key prefix
+     *
+     * @param string $apiKeyIdentifier API key identifier (authentication scheme)
+     *
+     * @return string
+     */
+    public function getApiKeyPrefix($apiKeyIdentifier)
+    {
+        return isset($this->apiKeyPrefixes[$apiKeyIdentifier]) ? $this->apiKeyPrefixes[$apiKeyIdentifier] : null;
+    }
+  
+    /**
+     * Sets the username for HTTP basic authentication
+     *
+     * @param string $username Username for HTTP basic authentication
+     *
+     * @return Configuration
+     */
+    public function setUsername($username)
+    {
+        $this->username = $username;
+        return $this;
+    }
+  
+    /**
+     * Gets the username for HTTP basic authentication
+     *
+     * @return string Username for HTTP basic authentication
+     */
+    public function getUsername()
+    {
+        return $this->username;
+    }
+  
+    /**
+     * Sets the password for HTTP basic authentication
+     *
+     * @param string $password Password for HTTP basic authentication
+     *
+     * @return Configuration
+     */
+    public function setPassword($password)
+    {
+        $this->password = $password;
+        return $this;
+    }
+  
+    /**
+     * Gets the password for HTTP basic authentication
+     *
+     * @return string Password for HTTP basic authentication
+     */
+    public function getPassword()
+    {
+        return $this->password;
+    }
+  
+    /**
+     * Adds a default header
+     *
+     * @param string $headerName  header name (e.g. Token)
+     * @param string $headerValue header value (e.g. 1z8wp3)
+     *
+     * @return ApiClient
+     */
+    public function addDefaultHeader($headerName, $headerValue)
+    {
+        if (!is_string($headerName)) {
+            throw new \InvalidArgumentException('Header name must be a string.');
+        }
+  
+        $this->defaultHeaders[$headerName] =  $headerValue;
+        return $this;
+    }
+  
+    /**
+     * Gets the default header
+     *
+     * @return array An array of default header(s)
+     */
+    public function getDefaultHeaders()
+    {
+        return $this->defaultHeaders;
+    }
+  
+    /**
+     * Deletes a default header
+     *
+     * @param string $headerName the header to delete
+     *
+     * @return Configuration
+     */
+    public function deleteDefaultHeader($headerName)
+    {
+        unset($this->defaultHeaders[$headerName]);
+    }
+  
+    /**
+     * Sets the host
+     *
+     * @param string $host Host
+     *
+     * @return Configuration
+     */
+    public function setHost($host)
+    {
+        $this->host = $host;
+        return $this;
+    }
+  
+    /**
+     * Gets the host
+     *
+     * @return string Host
+     */
+    public function getHost()
+    {
+        return $this->host;
+    }
+  
+    /**
+     * Sets the user agent of the api client
+     *
+     * @param string $userAgent the user agent of the api client
+     *
+     * @return ApiClient
+     */
+    public function setUserAgent($userAgent)
+    {
+        if (!is_string($userAgent)) {
+            throw new \InvalidArgumentException('User-agent must be a string.');
+        }
+  
+        $this->userAgent = $userAgent;
+        return $this;
+    }
+  
+    /**
+     * Gets the user agent of the api client
+     *
+     * @return string user agent
+     */
+    public function getUserAgent()
+    {
+        return $this->userAgent;
+    }
+  
+    /**
+     * Sets the HTTP timeout value
+     *
+     * @param integer $seconds Number of seconds before timing out [set to 0 for no timeout]
+     *
+     * @return ApiClient
+     */
+    public function setCurlTimeout($seconds)
+    {
+        if (!is_numeric($seconds) || $seconds < 0) {
+            throw new \InvalidArgumentException('Timeout value must be numeric and a non-negative number.');
+        }
+  
+        $this->curlTimeout = $seconds;
+        return $this;
+    }
+  
+    /**
+     * Gets the HTTP timeout value
+     *
+     * @return string HTTP timeout value
+     */
+    public function getCurlTimeout()
+    {
+        return $this->curlTimeout;
+    }
+  
+    /**
+     * Sets debug flag
+     * 
+     * @param bool $debug Debug flag
+     *
+     * @return Configuration
+     */
+    public function setDebug($debug)
+    {
+        $this->debug = $debug;
+        return $this;
+    }
+  
+    /**
+     * Gets the debug flag
+     *
+     * @return bool
+     */
+    public function getDebug()
+    {
+        return $this->debug;
+    }
+  
+    /**
+     * Sets the debug file
+     *
+     * @param string $debugFile Debug file
+     *
+     * @return Configuration
+     */
+    public function setDebugFile($debugFile)
+    {
+        $this->debugFile = $debugFile;
+        return $this;
+    }
+  
+    /**
+     * Gets the debug file
+     *
+     * @return string
+     */
+    public function getDebugFile()
+    {
+        return $this->debugFile;
+    }
+ 
+    /**
+     * Sets the temp folder path
+     *
+     * @param string $tempFolderPath Temp folder path
+     *
+     * @return Configuration
+     */
+    public function setTempFolderPath($tempFolderPath)
+    {
+        $this->tempFolderPath = $tempFolderPath;
+        return $this;
+    }
+ 
+    /**
+     * Gets the temp folder path
+     *
+     * @return string Temp folder path
+     */
+    public function getTempFolderPath()
+    {
+        return $this->tempFolderPath;
+    }
+ 
+    /**
+     * Gets the default configuration instance
+     *
+     * @return Configuration
+     */
+    public static function getDefaultConfiguration()
+    {
+        if (self::$_defaultConfiguration == null) {
+            self::$_defaultConfiguration = new Configuration();
+        }
+  
+        return self::$_defaultConfiguration;
+    }
+  
+    /**
+     * Sets the detault configuration instance
+     *
+     * @param Configuration $config An instance of the Configuration Object
+     *
+     * @return void
+     */
+    public static function setDefaultConfiguration(Configuration $config)
+    {
+        self::$_defaultConfiguration = $config;
+    }
+  
+    /**
+     * Gets the essential information for debugging
+     *
+     * @return string The report for debugging
+     */
+    public static function toDebugReport()
+    {
+        $report  = "PHP SDK ({{invokerPackage}}) Debug Report:\n";
+        $report .= "    OS: ".php_uname()."\n";
+        $report .= "    PHP Version: ".phpversion()."\n";
+        $report .= "    Swagger Spec Version: {{version}}\n";
+        $report .= "    SDK Package Version: {{artifactVersion}}\n";
+        $report .= "    Temp Folder Path: ".self::getDefaultConfiguration()->getTempFolderPath()."\n";
+  
+        return $report;
+    }
+  
 }
-
diff --git a/modules/swagger-codegen/src/main/resources/php/model.mustache b/modules/swagger-codegen/src/main/resources/php/model.mustache
index 9ce348ad131..861673982f2 100644
--- a/modules/swagger-codegen/src/main/resources/php/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/model.mustache
@@ -1,4 +1,17 @@
 <?php
+{{#models}}
+{{#model}}
+/**
+ * {{classname}}
+ *
+ * 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 2015 SmartBear Software
  *
@@ -14,57 +27,160 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
-{{#models}}
-{{#model}}
 /**
- * {{description}}
- *
- * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
- *
+ * 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 {{invokerPackage}}\models;
+namespace {{modelPackage}};
 
 use \ArrayAccess;
+/**
+ * {{classname}} 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}} implements ArrayAccess
+{
+    /**
+      * Array of property to type mappings. Used for (de)serialization 
+      * @var string[]
+      */
+    static $swaggerTypes = array(
+        {{#vars}}'{{name}}' => '{{{datatype}}}'{{#hasMore}},
+        {{/hasMore}}{{/vars}}
+    );
+  
+    /** 
+      * Array of attributes where the key is the local name, and the value is the original name
+      * @var string[] 
+      */
+    static $attributeMap = array(
+        {{#vars}}'{{name}}' => '{{baseName}}'{{#hasMore}},
+        {{/hasMore}}{{/vars}}
+    );
+  
+    /**
+      * Array of attributes to setter functions (for deserialization of responses)
+      * @var string[]
+      */
+    static $setters = array(
+        {{#vars}}'{{name}}' => '{{setter}}'{{#hasMore}},
+        {{/hasMore}}{{/vars}}
+    );
+  
+    /**
+      * Array of attributes to getter functions (for serialization of requests)
+      * @var string[]
+      */
+    static $getters = array(
+        {{#vars}}'{{name}}' => '{{getter}}'{{#hasMore}},
+        {{/hasMore}}{{/vars}}
+    );
+  
+    {{#vars}}
+    /**
+      * ${{name}} {{#description}}{{{description}}}{{/description}}
+      * @var {{datatype}}
+      */
+    protected ${{name}};
+    {{/vars}}
 
-class {{classname}} implements ArrayAccess {
-  static $swaggerTypes = array(
-      {{#vars}}'{{name}}' => '{{{datatype}}}'{{#hasMore}},
-      {{/hasMore}}{{/vars}}
-  );
-
-  static $attributeMap = array(
-      {{#vars}}'{{name}}' => '{{baseName}}'{{#hasMore}},
-      {{/hasMore}}{{/vars}}
-  );
-
-  {{#vars}}{{#description}}
-  /**
-  * {{{description}}}
-  */{{/description}}
-  public ${{name}}; /* {{{datatype}}} */{{/vars}}
-
-  public function __construct(array $data = null) {
-    {{#vars}}$this->{{name}} = $data["{{name}}"];{{#hasMore}}
-    {{/hasMore}}{{/vars}}
-  }
-
-  public function offsetExists($offset) {
-    return isset($this->$offset);
-  }
-
-  public function offsetGet($offset) {
-    return $this->$offset;
-  }
-
-  public function offsetSet($offset, $value) {
-    $this->$offset = $value;
-  }
-
-  public function offsetUnset($offset) {
-    unset($this->$offset);
-  }
+    /**
+     * Constructor
+     * @param mixed[] $data Associated array of property value initalizing the model
+     */
+    public function __construct(array $data = null)
+    {
+        if ($data != null) {
+            {{#vars}}$this->{{name}} = $data["{{name}}"];{{#hasMore}}
+            {{/hasMore}}{{/vars}}
+        }
+    }
+    {{#vars}}
+    /**
+     * Gets {{name}}
+     * @return {{datatype}}
+     */
+    public function {{getter}}()
+    {
+        return $this->{{name}};
+    }
+  
+    /**
+     * Sets {{name}}
+     * @param {{datatype}} ${{name}} {{#description}}{{{description}}}{{/description}}
+     * @return $this
+     */
+    public function {{setter}}(${{name}})
+    {
+        {{#isEnum}}$allowed_values = array({{#allowableValues}}{{#values}}"{{{this}}}"{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}});
+        if (!in_array(${{{name}}}, $allowed_values)) {
+            throw new \InvalidArgumentException("Invalid value for '{{name}}', must be one of {{#allowableValues}}{{#values}}'{{{this}}}'{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}");
+        }{{/isEnum}}
+        $this->{{name}} = ${{name}};
+        return $this;
+    }
+    {{/vars}}
+    /**
+     * 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(get_object_vars($this), JSON_PRETTY_PRINT);
+        } else {
+            return json_encode(get_object_vars($this));
+        }
+    }
 }
 {{/model}}
 {{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/php/require.mustache b/modules/swagger-codegen/src/main/resources/php/require.mustache
deleted file mode 100644
index 3c02d861ef1..00000000000
--- a/modules/swagger-codegen/src/main/resources/php/require.mustache
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-// load models defined for endpoints
-foreach (glob(dirname(__FILE__)."/lib/models/*.php") as $filename)
-{
-      require_once $filename;
-}
-
-// load classes for accessing the endpoints
-foreach (glob(dirname(__FILE__)."/lib/*.php") as $filename)
-{
-      require_once $filename;
-}
-?>
diff --git a/modules/swagger-codegen/src/main/resources/python/README.mustache b/modules/swagger-codegen/src/main/resources/python/README.mustache
index 9c590a9a508..463bbb37a18 100644
--- a/modules/swagger-codegen/src/main/resources/python/README.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/README.mustache
@@ -11,13 +11,13 @@ python setup.py install
 Or you can install from Github via pip:
 
 ```sh
-pip install git+https://github.com/geekerzp/SwaggerPetstore-python.git
+pip install git+https://github.com/geekerzp/swagger_client.git
 ```
 
 To use the bindings, import the pacakge:
 
 ```python
-import SwaggerPetstore
+import swagger_client
 ```
 
 ## Manual Installation
@@ -25,7 +25,7 @@ If you do not wish to use setuptools, you can download the latest release.
 Then, to use the bindings, import the package:
 
 ```python
-import path.to.SwaggerPetstore-python.SwaggerPetstore
+import path.to.swagger_client
 ```
 
 ## Getting Started
@@ -38,9 +38,9 @@ TODO
 
 ## Tests
 
-(Make sure you are running it inside of a [virtualenv](http://docs.python-guide.org/en/latest/dev/virtualenvs/))
+(Please make sure you have [virtualenv](http://docs.python-guide.org/en/latest/dev/virtualenvs/) installed)
 
-You can run the tests in the current python platform:
+ Execute the following command to run the tests in the current Python (v2 or v3) environment:
 
 ```sh
 $ make test
@@ -71,4 +71,3 @@ $ make test-all
   py34: commands succeeded
   congratulations :)
 ```
-
diff --git a/modules/swagger-codegen/src/main/resources/python/__init__api.mustache b/modules/swagger-codegen/src/main/resources/python/__init__api.mustache
index b4442b736ff..989a5ea8382 100644
--- a/modules/swagger-codegen/src/main/resources/python/__init__api.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/__init__api.mustache
@@ -1,5 +1,8 @@
 from __future__ import absolute_import
 
 # import apis into api package
-{{#apiInfo}}{{#apis}}from .{{classVarName}} import {{classname}}
-{{/apis}}{{/apiInfo}}
+{{#apiInfo}}
+{{#apis}}
+from .{{classVarName}} import {{classname}}
+{{/apis}}
+{{/apiInfo}}
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 7a3f1866ea7..734e0692350 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}}
+{{#models}}{{#model}}from .{{classVarName}} 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 921f4dac0eb..76b4fcedd45 100644
--- a/modules/swagger-codegen/src/main/resources/python/__init__package.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/__init__package.mustache
@@ -8,3 +8,7 @@ from __future__ import absolute_import
 {{/apis}}{{/apiInfo}}
 # import ApiClient
 from .api_client import ApiClient
+
+from .configuration import Configuration
+
+configuration = Configuration()
diff --git a/modules/swagger-codegen/src/main/resources/python/api.mustache b/modules/swagger-codegen/src/main/resources/python/api.mustache
index 867014d5e12..b076fa5d3ea 100644
--- a/modules/swagger-codegen/src/main/resources/python/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/api.mustache
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # coding: utf-8
 
 """
@@ -16,9 +15,8 @@ Copyright 2015 SmartBear Software
    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.
 """
+
 from __future__ import absolute_import
 
 import sys
@@ -27,41 +25,68 @@ import os
 # python 2 and python 3 compatibility library
 from six import iteritems
 
-from .. import configuration
+from ..configuration import Configuration
 from ..api_client import ApiClient
 
+
 {{#operations}}
 class {{classname}}(object):
+    """
+    NOTE: This class is auto generated by the swagger code generator program.
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
 
     def __init__(self, api_client=None):
+        config = Configuration()
         if api_client:
             self.api_client = api_client
         else:
-            if not configuration.api_client:
-                configuration.api_client = ApiClient('{{basePath}}')
-            self.api_client = configuration.api_client
-    
-    {{#operation}}
+            if not config.api_client:
+                config.api_client = ApiClient()
+            self.api_client = config.api_client
+{{#operation}}
+
     def {{nickname}}(self, {{#allParams}}{{#required}}{{paramName}}, {{/required}}{{/allParams}}**kwargs):
         """
         {{{summary}}}
         {{{notes}}}
 
-        {{#allParams}}:param {{dataType}} {{paramName}}: {{{description}}} {{#required}}(required){{/required}}{{#optional}}(optional){{/optional}}
-        {{/allParams}}
+        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.{{nickname}}({{#allParams}}{{#required}}{{paramName}}, {{/required}}{{/allParams}}callback=callback_function)
+
+        :param callback function: The callback function
+            for asynchronous request. (optional)
+{{#allParams}}
+        :param {{dataType}} {{paramName}}: {{{description}}}{{#required}} (required){{/required}}{{#optional}}(optional){{/optional}}
+{{/allParams}}
         :return: {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}None{{/returnType}}
+                 If the method is called asynchronously,
+                 returns the request thread.
         """
-        {{#allParams}}{{#required}}
+{{#allParams}}
+{{#required}}
         # verify the required parameter '{{paramName}}' is set
         if {{paramName}} is None:
             raise ValueError("Missing the required parameter `{{paramName}}` when calling `{{nickname}}`")
-        {{/required}}{{/allParams}}
+{{/required}}
+{{/allParams}}
+
         all_params = [{{#allParams}}'{{paramName}}'{{#hasMore}}, {{/hasMore}}{{/allParams}}]
+        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 {{nickname}}" % key)
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method {{nickname}}" % key
+                )
             params[key] = val
         del params['kwargs']
 
@@ -69,55 +94,59 @@ class {{classname}}(object):
         method = '{{httpMethod}}'
 
         path_params = {}
-        {{#pathParams}}
+{{#pathParams}}
         if '{{paramName}}' in params:
-            path_params['{{baseName}}'] = params['{{paramName}}']  
-        {{/pathParams}}
+            path_params['{{baseName}}'] = params['{{paramName}}']
+{{/pathParams}}
+
         query_params = {}
-        {{#queryParams}}
+{{#queryParams}}
         if '{{paramName}}' in params:
             query_params['{{baseName}}'] = params['{{paramName}}']
-        {{/queryParams}}
+{{/queryParams}}
+
         header_params = {}
-        {{#headerParams}}
+{{#headerParams}}
         if '{{paramName}}' in params:
             header_params['{{baseName}}'] = params['{{paramName}}']
-        {{/headerParams}}
+{{/headerParams}}
+
         form_params = {}
         files = {}
-        {{#formParams}}
+{{#formParams}}
         if '{{paramName}}' in params:
             {{#notFile}}form_params['{{baseName}}'] = params['{{paramName}}']{{/notFile}}{{#isFile}}files['{{baseName}}'] = params['{{paramName}}']{{/isFile}}
-        {{/formParams}}
+{{/formParams}}
+
         body_params = None
-        {{#bodyParam}}
+{{#bodyParam}}
         if '{{paramName}}' in params:
             body_params = params['{{paramName}}']
-        {{/bodyParam}}
+{{/bodyParam}}
+
         # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept([{{#produces}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/produces}}])
+        header_params['Accept'] = self.api_client.\
+            select_header_accept([{{#produces}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/produces}}])
         if not header_params['Accept']:
             del header_params['Accept']
 
         # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.select_header_content_type([{{#consumes}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/consumes}}])
+        header_params['Content-Type'] = self.api_client.\
+            select_header_content_type([{{#consumes}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/consumes}}])
 
         # Authentication setting
         auth_settings = [{{#authMethods}}'{{name}}'{{#hasMore}}, {{/hasMore}}{{/authMethods}}]
 
-        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={{#returnType}}'{{returnType}}'{{/returnType}}{{^returnType}}None{{/returnType}}, auth_settings=auth_settings)
-        {{#returnType}}
+        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={{#returnType}}'{{returnType}}'{{/returnType}}{{^returnType}}None{{/returnType}},
+                                            auth_settings=auth_settings,
+                                            callback=params.get('callback'))
         return response
-        {{/returnType}}{{/operation}}
+{{/operation}}
 {{/operations}}
-
-
-
-
-
-
-
-
-
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 b8cc4cc2a84..1becd5547dd 100644
--- a/modules/swagger-codegen/src/main/resources/python/api_client.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/api_client.mustache
@@ -1,303 +1,563 @@
-#!/usr/bin/env python
 # coding: utf-8
 
-"""Swagger generic API client. This client handles the client-
-server communication, and is invariant across implementations. Specifics of
-the methods and models for each application are generated from the Swagger
-templates."""
+"""
+Copyright 2015 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 __future__ import absolute_import
 from . import models
-from .rest import RESTClient
+from .rest import RESTClientObject
+from .rest import ApiException
 
 import os
 import re
 import urllib
 import json
-import datetime
 import mimetypes
 import random
+import tempfile
+import threading
+
+from datetime import datetime
+from datetime import date
 
 # python 2 and python 3 compatibility library
 from six import iteritems
 
 try:
-  # for python3
-  from urllib.parse import quote
+    # for python3
+    from urllib.parse import quote
 except ImportError:
-  # for python2
-  from urllib import quote
-
-from . import configuration
-
-class ApiClient(object):
-  """
-  Generic API client for Swagger client library builds
-
-  :param host: The base path for the server to call
-  :param header_name: a header to pass when making calls to the API
-  :param header_value: a header value to pass when making calls to the API
-  """
-  def __init__(self, host=configuration.host, header_name=None, header_value=None):
-    self.default_headers = {}
-    if header_name is not None:
-      self.default_headers[header_name] = header_value
-    self.host = host
-    self.cookie = None
-    # Set default User-Agent.
-    self.user_agent = 'Python-Swagger'
-
-  @property
-  def user_agent(self):
-    return self.default_headers['User-Agent']
-
-  @user_agent.setter
-  def user_agent(self, value):
-    self.default_headers['User-Agent'] = value
-
-  def set_default_header(self, header_name, header_value):
-    self.default_headers[header_name] = header_value
-
-  def call_api(self, resource_path, method, path_params=None, query_params=None, header_params=None,
-               body=None, post_params=None, files=None, response=None, auth_settings=None):
-
-    # headers parameters
-    header_params = header_params or {}
-    header_params.update(self.default_headers)
-    if self.cookie:
-      header_params['Cookie'] = self.cookie
-    if header_params:
-      header_params = self.sanitize_for_serialization(header_params)
-
-    # path parameters
-    if path_params:
-      path_params = self.sanitize_for_serialization(path_params)
-      for k, v in iteritems(path_params):
-        replacement = quote(str(self.to_path_value(v)))
-        resource_path = resource_path.replace('{' + k + '}', replacement)
-
-    # query parameters
-    if query_params:
-      query_params = self.sanitize_for_serialization(query_params)
-      query_params = {k: self.to_path_value(v) for k, v in iteritems(query_params)}
-
-    # post parameters
-    if post_params:
-      post_params = self.prepare_post_parameters(post_params, files)
-      post_params = self.sanitize_for_serialization(post_params)
-
-    # auth setting
-    self.update_params_for_auth(header_params, query_params, auth_settings)
-
-    # body
-    if body:
-      body = self.sanitize_for_serialization(body)
-
-    # request url
-    url = self.host + resource_path
-
-    # perform request and return response
-    response_data = self.request(method, url, query_params=query_params, headers=header_params,
-                                 post_params=post_params, body=body)
-
-    # deserialize response data
-    if response:
-      return self.deserialize(response_data, response)
-    else:
-      return None
-
-  def to_path_value(self, obj):
-    """
-    Convert a string or object to a path-friendly value
+    # for python2
+    from urllib import quote
 
-    :param obj: object or string value
+from .configuration import Configuration
 
-    :return string: quoted value
-    """
-    if type(obj) == list:
-      return ','.join(obj)
-    else:
-      return str(obj)
 
-  def sanitize_for_serialization(self, obj):
-    """
-    Sanitize an object for Request.
-
-    If obj is None, return None.
-    If obj is str, int, float, bool, return directly.
-    If obj is datetime.datetime, datetime.date convert to string in iso8601 format.
-    If obj is list, santize each element in the list.
-    If obj is dict, return the dict.
-    If obj is swagger model, return the properties dict.
-    """
-    if isinstance(obj, type(None)):
-      return None
-    elif isinstance(obj, (str, int, float, bool, tuple)):
-      return obj
-    elif isinstance(obj, list):
-      return [self.sanitize_for_serialization(sub_obj) for sub_obj in obj]
-    elif isinstance(obj, (datetime.datetime, datetime.date)):
-      return obj.isoformat()
-    else:
-      if isinstance(obj, dict):
-        obj_dict = obj
-      else:
-        # Convert model obj to dict except attributes `swagger_types`, `attribute_map`
-        # and attributes which value is not None.
-        # Convert attribute name to json key in model definition for request.
-        obj_dict = {obj.attribute_map[key]: val
-                    for key, val in iteritems(obj.__dict__)
-                    if key != 'swagger_types' and key != 'attribute_map' and val is not None}
-      return {key: self.sanitize_for_serialization(val)
-              for key, val in iteritems(obj_dict)}
-
-  def deserialize(self, obj, obj_class):
+class ApiClient(object):
     """
-    Derialize a JSON string into an object.
+    Generic API client for Swagger client library builds.
 
-    :param obj: string or object to be deserialized
-    :param obj_class: class literal for deserialzied object, or string of class name
+    Swagger generic API client. This client handles the client-
+    server communication, and is invariant across implementations. Specifics of
+    the methods and models for each application are generated from the Swagger
+    templates.
 
-    :return object: deserialized object
-    """
-    # Have to accept obj_class as string or actual type. Type could be a
-    # native Python type, or one of the model classes.
-    if type(obj_class) == str:
-      if 'list[' in obj_class:
-        match = re.match('list\[(.*)\]', obj_class)
-        sub_class = match.group(1)
-        return [self.deserialize(sub_obj, sub_class) for sub_obj in obj]
-
-      if obj_class in ['int', 'float', 'dict', 'list', 'str', 'bool', 'datetime']:
-        obj_class = eval(obj_class)
-      else:  # not a native type, must be model class
-        obj_class = eval('models.' + obj_class)
-
-    if obj_class in [int, float, dict, list, str, bool]:
-      return obj_class(obj)
-    elif obj_class == datetime:
-      return self.__parse_string_to_datetime(obj)
-
-    instance = obj_class()
-
-    for attr, attr_type in iteritems(instance.swagger_types):
-        if obj is not None and instance.attribute_map[attr] in obj and type(obj) in [list, dict]:
-          value = obj[instance.attribute_map[attr]]
-          if attr_type in ['str', 'int', 'float', 'bool']:
-            attr_type = eval(attr_type)
-            try:
-              value = attr_type(value)
-            except UnicodeEncodeError:
-              value = unicode(value)
-            except TypeError:
-              value = value
-            setattr(instance, attr, value)
-          elif attr_type == 'datetime':
-            setattr(instance, attr, self.__parse_string_to_datetime(value))
-          elif 'list[' in attr_type:
-            match = re.match('list\[(.*)\]', attr_type)
-            sub_class = match.group(1)
-            sub_values = []
-            if not value:
-              setattr(instance, attr, None)
-            else:
-              for sub_value in value:
-                sub_values.append(self.deserialize(sub_value, sub_class))
-              setattr(instance, attr, sub_values)
-          else:
-            setattr(instance, attr, self.deserialize(value, attr_type))
-
-    return instance
+    NOTE: This class is auto generated by the swagger code generator program.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    Do not edit the class manually.
 
-  def __parse_string_to_datetime(self, string):
+    :param host: The base path for the server to call.
+    :param header_name: a header to pass when making calls to the API.
+    :param header_value: a header value to pass when making calls to the API.
     """
-    Parse datetime in string to datetime.
+    def __init__(self, host=Configuration().host,
+                 header_name=None, header_value=None, cookie=None):
+
+        """
+        Constructor of the class.
+        """
+        self.rest_client = RESTClientObject()
+        self.default_headers = {}
+        if header_name is not None:
+            self.default_headers[header_name] = header_value
+        self.host = host
+        self.cookie = cookie
+        # Set default User-Agent.
+        self.user_agent = 'Python-Swagger/{{packageVersion}}'
+
+    @property
+    def user_agent(self):
+        """
+        Gets user agent.
+        """
+        return self.default_headers['User-Agent']
+
+    @user_agent.setter
+    def user_agent(self, value):
+        """
+        Sets user agent.
+        """
+        self.default_headers['User-Agent'] = value
+
+    def set_default_header(self, header_name, header_value):
+        self.default_headers[header_name] = header_value
+
+    def __call_api(self, resource_path, method,
+                   path_params=None, query_params=None, header_params=None,
+                   body=None, post_params=None, files=None,
+                   response_type=None, auth_settings=None, callback=None):
+
+        # headers parameters
+        header_params = header_params or {}
+        header_params.update(self.default_headers)
+        if self.cookie:
+            header_params['Cookie'] = self.cookie
+        if header_params:
+            header_params = self.sanitize_for_serialization(header_params)
+
+        # path parameters
+        if path_params:
+            path_params = self.sanitize_for_serialization(path_params)
+            for k, v in iteritems(path_params):
+                replacement = quote(str(self.to_path_value(v)))
+                resource_path = resource_path.\
+                    replace('{' + k + '}', replacement)
+
+        # query parameters
+        if query_params:
+            query_params = self.sanitize_for_serialization(query_params)
+            query_params = {k: self.to_path_value(v)
+                            for k, v in iteritems(query_params)}
+
+        # post parameters
+        if post_params:
+            post_params = self.prepare_post_parameters(post_params, files)
+            post_params = self.sanitize_for_serialization(post_params)
+
+        # auth setting
+        self.update_params_for_auth(header_params, query_params, auth_settings)
+
+        # body
+        if body:
+            body = self.sanitize_for_serialization(body)
+
+        # request url
+        url = self.host + resource_path
+
+        # perform request and return response
+        response_data = self.request(method, url,
+                                     query_params=query_params,
+                                     headers=header_params,
+                                     post_params=post_params, body=body)
+
+        self.last_response = response_data
+
+        # deserialize response data
+        if response_type:
+            deserialized_data = self.deserialize(response_data, response_type)
+        else:
+            deserialized_data = None
 
-    The string should be in iso8601 datetime format.
-    """
-    try:
-        from dateutil.parser import parse
-        return parse(string)
-    except ImportError:
-        return string
+        if callback:
+            callback(deserialized_data)
+        else:
+            return deserialized_data
 
-  def request(self, method, url, query_params=None, headers=None, post_params=None, body=None):
-    """
-    Perform http request using RESTClient.
-    """
-    if method == "GET":
-      return RESTClient.GET(url, query_params=query_params, headers=headers)
-    elif method == "HEAD":
-      return RESTClient.HEAD(url, query_params=query_params, headers=headers)
-    elif method == "POST":
-      return RESTClient.POST(url, headers=headers, post_params=post_params, body=body)
-    elif method == "PUT":
-      return RESTClient.PUT(url, headers=headers, post_params=post_params, body=body)
-    elif method == "PATCH":
-      return RESTClient.PATCH(url, headers=headers, post_params=post_params, body=body)
-    elif method == "DELETE":
-      return RESTClient.DELETE(url, query_params=query_params, headers=headers)
-    else:
-      raise ValueError("http method must be `GET`, `HEAD`, `POST`, `PATCH`, `PUT` or `DELETE`")
-
-  def prepare_post_parameters(self, post_params=None, files=None):
-    params = {}
-
-    if post_params:
-      params.update(post_params)
-
-    if files:
-      for k, v in iteritems(files):
-        if v:
-          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])
-
-    return params
-
-  def select_header_accept(self, accepts):
-    """
-    Return `Accept` based on an array of accepts provided
-    """
-    if not accepts:
-      return
+    def to_path_value(self, obj):
+        """
+        Takes value and turn it into a string suitable for inclusion in
+        the path, by url-encoding.
 
-    accepts = list(map(lambda x: x.lower(), accepts))
+        :param obj: object or string value.
 
-    if 'application/json' in accepts:
-      return 'application/json'
-    else:
-      return ', '.join(accepts)
+        :return string: quoted value.
+        """
+        if type(obj) == list:
+            return ','.join(obj)
+        else:
+            return str(obj)
+
+    def sanitize_for_serialization(self, obj):
+        """
+        Builds a JSON POST object.
+
+        If obj is None, return None.
+        If obj is str, int, float, bool, return directly.
+        If obj is datetime.datetime, datetime.date
+            convert to string in iso8601 format.
+        If obj is list, santize each element in the list.
+        If obj is dict, return the dict.
+        If obj is swagger model, return the properties dict.
+
+        :param obj: The data to serialize.
+        :return: The serialized form of data.
+        """
+        if isinstance(obj, type(None)):
+            return None
+        elif isinstance(obj, (str, int, float, bool, tuple)):
+            return obj
+        elif isinstance(obj, list):
+            return [self.sanitize_for_serialization(sub_obj)
+                    for sub_obj in obj]
+        elif isinstance(obj, (datetime, date)):
+            return obj.isoformat()
+        else:
+            if isinstance(obj, dict):
+                obj_dict = obj
+            else:
+                # Convert model obj to dict except
+                # attributes `swagger_types`, `attribute_map`
+                # and attributes which value is not None.
+                # Convert attribute name to json key in
+                # model definition for request.
+                obj_dict = {obj.attribute_map[attr]: getattr(obj, attr)
+                            for attr, _ in iteritems(obj.swagger_types)
+                            if getattr(obj, attr) is not None}
+
+            return {key: self.sanitize_for_serialization(val)
+                    for key, val in iteritems(obj_dict)}
+
+    def deserialize(self, response, response_type):
+        """
+        Deserializes response into an object.
+
+        :param response: RESTResponse object to be deserialized.
+        :param response_type: class literal for
+            deserialzied object, or string of class name.
+
+        :return: deserialized object.
+        """
+        # handle file downloading
+        # save response body into a tmp file and return the instance
+        if "file" == response_type:
+            return self.__deserialize_file(response)
+
+        # fetch data from response object
+        try:
+            data = json.loads(response.data)
+        except ValueError:
+            data = response.data
+
+        return self.__deserialize(data, response_type)
+
+    def __deserialize(self, data, klass):
+        """
+        Deserializes dict, list, str into an object.
+
+        :param data: dict, list or str.
+        :param klass: class literal, or string of class name.
+
+        :return: object.
+        """
+        if data is None:
+            return None
+
+        if type(klass) == str:
+            if klass.startswith('list['):
+                sub_kls = re.match('list\[(.*)\]', klass).group(1)
+                return [self.__deserialize(sub_data, sub_kls)
+                        for sub_data in data]
+
+            if klass.startswith('dict('):
+                sub_kls = re.match('dict\(([^,]*), (.*)\)', klass).group(2)
+                return {k: self.__deserialize(v, sub_kls)
+                        for k, v in iteritems(data)}
+
+            # convert str to class
+            # for native types
+            if klass in ['int', 'float', 'str', 'bool',
+                         "date", 'datetime', "object"]:
+                klass = eval(klass)
+            # for model types
+            else:
+                klass = eval('models.' + klass)
+
+        if klass in [int, float, str, bool]:
+            return self.__deserialize_primitive(data, klass)
+        elif klass == object:
+            return self.__deserialize_object()
+        elif klass == date:
+            return self.__deserialize_date(data)
+        elif klass == datetime:
+            return self.__deserialize_datatime(data)
+        else:
+            return self.__deserialize_model(data, klass)
+
+    def call_api(self, resource_path, method,
+                 path_params=None, query_params=None, header_params=None,
+                 body=None, post_params=None, files=None,
+                 response_type=None, auth_settings=None, callback=None):
+        """
+        Makes the HTTP request (synchronous) and return the deserialized data.
+        To make an async request, define a function for callback.
+
+        :param resource_path: Path to method endpoint.
+        :param method: Method to call.
+        :param path_params: Path parameters in the url.
+        :param query_params: Query parameters in the url.
+        :param header_params: Header parameters to be
+            placed in the request header.
+        :param body: Request body.
+        :param post_params dict: Request post form parameters,
+            for `application/x-www-form-urlencoded`, `multipart/form-data`.
+        :param auth_settings list: Auth Settings names for the request.
+        :param response: Response data type.
+        :param files dict: key -> filename, value -> filepath,
+            for `multipart/form-data`.
+        :param callback function: Callback function for asynchronous request.
+            If provide this parameter,
+            the request will be called asynchronously.
+        :return:
+            If provide parameter callback,
+            the request will be called asynchronously.
+            The method will return the request thread.
+            If parameter callback is None,
+            then the method will return the response directly.
+        """
+        if callback is None:
+            return self.__call_api(resource_path, method,
+                                   path_params, query_params, header_params,
+                                   body, post_params, files,
+                                   response_type, auth_settings, callback)
+        else:
+            thread = threading.Thread(target=self.__call_api,
+                                      args=(resource_path, method,
+                                            path_params, query_params,
+                                            header_params, body,
+                                            post_params, files,
+                                            response_type, auth_settings,
+                                            callback))
+        thread.start()
+        return thread
+
+    def request(self, method, url, query_params=None, headers=None,
+                post_params=None, body=None):
+        """
+        Makes the HTTP request using RESTClient.
+        """
+        if method == "GET":
+            return self.rest_client.GET(url,
+                                        query_params=query_params,
+                                        headers=headers)
+        elif method == "HEAD":
+            return self.rest_client.HEAD(url,
+                                         query_params=query_params,
+                                         headers=headers)
+        elif method == "POST":
+            return self.rest_client.POST(url,
+                                         query_params=query_params,
+                                         headers=headers,
+                                         post_params=post_params,
+                                         body=body)
+        elif method == "PUT":
+            return self.rest_client.PUT(url,
+                                        query_params=query_params,
+                                        headers=headers,
+                                        post_params=post_params,
+                                        body=body)
+        elif method == "PATCH":
+            return self.rest_client.PATCH(url,
+                                          query_params=query_params,
+                                          headers=headers,
+                                          post_params=post_params,
+                                          body=body)
+        elif method == "DELETE":
+            return self.rest_client.DELETE(url,
+                                           query_params=query_params,
+                                           headers=headers)
+        else:
+            raise ValueError(
+                "http method must be `GET`, `HEAD`,"
+                " `POST`, `PATCH`, `PUT` or `DELETE`."
+            )
+
+    def prepare_post_parameters(self, post_params=None, files=None):
+        """
+        Builds form parameters.
+
+        :param post_params: Normal form parameters.
+        :param files: File parameters.
+        :return: Form parameters with files.
+        """
+        params = {}
+
+        if post_params:
+            params.update(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])
+
+        return params
+
+    def select_header_accept(self, accepts):
+        """
+        Returns `Accept` based on an array of accepts provided.
+
+        :param accepts: List of headers.
+        :return: Accept (e.g. application/json).
+        """
+        if not accepts:
+            return
+
+        accepts = list(map(lambda x: x.lower(), accepts))
+
+        if 'application/json' in accepts:
+            return 'application/json'
+        else:
+            return ', '.join(accepts)
 
-  def select_header_content_type(self, content_types):
-    """
-    Return `Content-Type` baseed on an array of content_types provided
-    """
-    if not content_types:
-      return 'application/json'
+    def select_header_content_type(self, content_types):
+        """
+        Returns `Content-Type` based on an array of content_types provided.
 
-    content_types = list(map(lambda x: x.lower(), content_types))
+        :param content_types: List of content-types.
+        :return: Content-Type (e.g. application/json).
+        """
+        if not content_types:
+            return 'application/json'
 
-    if 'application/json' in content_types:
-      return 'application/json'
-    else:
-      return content_types[0]
+        content_types = list(map(lambda x: x.lower(), content_types))
 
-  def update_params_for_auth(self, headers, querys, auth_settings):
-    """
-    Update header and query params based on authentication setting
-    """
-    if not auth_settings:
-      return
-    
-    for auth in auth_settings:
-      auth_setting = configuration.auth_settings().get(auth)
-      if auth_setting:
-        if auth_setting['in'] == 'header':
-          headers[auth_setting['key']] = auth_setting['value']
-        elif auth_setting['in'] == 'query':
-          querys[auth_setting['key']] = auth_setting['value']
+        if 'application/json' in content_types:
+            return 'application/json'
         else:
-          raise ValueError('Authentication token must be in `query` or `header`')
+            return content_types[0]
+
+    def update_params_for_auth(self, headers, querys, auth_settings):
+        """
+        Updates header and query params based on authentication setting.
+
+        :param headers: Header parameters dict to be updated.
+        :param querys: Query parameters dict to be updated.
+        :param auth_settings: Authentication setting identifiers list.
+        """
+        config = Configuration()
+
+        if not auth_settings:
+            return
+
+        for auth in auth_settings:
+            auth_setting = config.auth_settings().get(auth)
+            if auth_setting:
+                if auth_setting['in'] == 'header':
+                    headers[auth_setting['key']] = auth_setting['value']
+                elif auth_setting['in'] == 'query':
+                    querys[auth_setting['key']] = auth_setting['value']
+                else:
+                    raise ValueError(
+                        'Authentication token must be in `query` or `header`'
+                    )
+
+    def __deserialize_file(self, response):
+        """
+        Saves response body into a file in a temporary folder,
+        using the filename from the `Content-Disposition` header if provided.
+
+        :param response:  RESTResponse.
+        :return: file path.
+        """
+        config = Configuration()
+
+        fd, path = tempfile.mkstemp(dir=config.temp_folder_path)
+        os.close(fd)
+        os.remove(path)
+
+        content_disposition = response.getheader("Content-Disposition")
+        if content_disposition:
+            filename = re.\
+                search(r'filename=[\'"]?([^\'"\s]+)[\'"]?', content_disposition).\
+                group(1)
+            path = os.path.join(os.path.dirname(path), filename)
+
+        with open(path, "w") as f:
+            f.write(response.data)
+
+        return path
+
+    def __deserialize_primitive(self, data, klass):
+        """
+        Deserializes string to primitive type.
+
+        :param data: str.
+        :param klass: class literal.
+
+        :return: int, float, str, bool.
+        """
+        try:
+            value = klass(data)
+        except UnicodeEncodeError:
+            value = unicode(data)
+        except TypeError:
+            value = data
+        return value
+
+    def __deserialize_object(self):
+        """
+        Deserializes empty object.
+
+        :return: object.
+        """
+        return object()
+
+    def __deserialize_date(self, string):
+        """
+        Deserializes string to date.
+
+        :param string: str.
+        :return: date.
+        """
+        try:
+            from dateutil.parser import parse
+            return parse(string).date()
+        except ImportError:
+            return string
+        except ValueError:
+            raise ApiException(
+                status=0,
+                reason="Failed to parse `{0}` into a date object"
+                .format(string)
+            )
+
+    def __deserialize_datatime(self, string):
+        """
+        Deserializes string to datetime.
+
+        The string should be in iso8601 datetime format.
+
+        :param string: str.
+        :return: datetime.
+        """
+        try:
+            from dateutil.parser import parse
+            return parse(string)
+        except ImportError:
+            return string
+        except ValueError:
+            raise ApiException(
+                status=0,
+                reason="Failed to parse `{0}` into a datetime object".
+                format(string)
+            )
+
+    def __deserialize_model(self, data, klass):
+        """
+        Deserializes list or dict to model.
+
+        :param data: dict, list.
+        :param klass: class literal.
+        :return: model object.
+        """
+        instance = klass()
+
+        for attr, attr_type in iteritems(instance.swagger_types):
+            if data is not None \
+               and instance.attribute_map[attr] in data\
+               and isinstance(data, (list, dict)):
+                value = data[instance.attribute_map[attr]]
+                setattr(instance, attr, self.__deserialize(value, attr_type))
+
+        return instance
diff --git a/modules/swagger-codegen/src/main/resources/python/configuration.mustache b/modules/swagger-codegen/src/main/resources/python/configuration.mustache
index d3a7093a02a..07625c67e48 100644
--- a/modules/swagger-codegen/src/main/resources/python/configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/configuration.mustache
@@ -1,51 +1,197 @@
+# coding: utf-8
+
+"""
+Copyright 2015 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 __future__ import absolute_import
 import base64
 import urllib3
 
-def get_api_key_with_prefix(key):
-    global api_key
-    global api_key_prefix
-
-    if api_key.get(key) and api_key_prefix.get(key):
-      return api_key_prefix[key] + ' ' + api_key[key]
-    elif api_key.get(key):
-      return api_key[key]
-
-def get_basic_auth_token():
-    global username
-    global password
-
-    return urllib3.util.make_headers(basic_auth=username + ':' + password).get('authorization')
-
-def auth_settings():
-    return { {{#authMethods}}{{#isApiKey}}
-               '{{name}}': {
-                   'type': 'api_key',
-                   'in': {{#isKeyInHeader}}'header'{{/isKeyInHeader}}{{#isKeyInQuery}}'query'{{/isKeyInQuery}},
-                   'key': '{{keyParamName}}',
-                   'value': get_api_key_with_prefix('{{keyParamName}}')
-               },
-             {{/isApiKey}}{{#isBasic}}
-               '{{name}}': {
-                   'type': 'basic',
-                   'in': 'header',
-                   'key': 'Authorization',
-                   'value': get_basic_auth_token()
-               },
-             {{/isBasic}}{{/authMethods}}
-           }
-
-# Default Base url
-host = "{{basePath}}"
-
-# Default api client
-api_client = None
-             
-# Authentication settings
-
-api_key = {}
-api_key_prefix = {}
-username = ''
-password = ''
+try:
+    import httplib
+except ImportError:
+    # for python3
+    import http.client as httplib
+    
+import sys
+import logging
+
+
+def singleton(cls, *args, **kw):
+    instances = {}
+
+    def _singleton():
+        if cls not in instances:
+            instances[cls] = cls(*args, **kw)
+        return instances[cls]
+    return _singleton
+
+
+@singleton
+class Configuration(object):
+    """
+    NOTE: This class is auto generated by the swagger code generator program.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    Do not edit the class manually.
+    """
+
+    def __init__(self):
+        """
+        Constructor
+        """
+        # Default Base url
+        self.host = "{{basePath}}"
+        # Default api client
+        self.api_client = None
+        # Temp file folder for downloading files
+        self.temp_folder_path = None
+
+        # Authentication Settings
+        # dict to store API key(s)
+        self.api_key = {}
+        # dict to store API prefix (e.g. Bearer)
+        self.api_key_prefix = {}
+        # Username for HTTP basic authentication
+        self.username = ""
+        # Password for HTTP basic authentication
+        self.password = ""
+
+        # Logging Settings
+        self.logging_format = '%(asctime)s %(levelname)s %(message)s'
+        # Debug file location
+        self.__logging_file = None
+        # Debug switch
+        self.__debug = False
+        self.init_logger()
+
+        # SSL/TLS verification
+        # Set this to false to skip verifying SSL certificate when calling API from https server.
+        self.verify_ssl = True
+        # Set this to customize the certificate file to verify the peer.
+        self.ssl_ca_cert = None
+        
+    def init_logger(self):
+        """
+        Initializes logger settings.
+        """
+        self.logger = logging.getLogger()
+        formatter = logging.Formatter(self.logging_format)
+        stream_handler = logging.StreamHandler()
+        stream_handler.setFormatter(formatter)
+        self.logger.addHandler(stream_handler)
+        if self.__debug:
+            self.logger.setLevel(logging.DEBUG)
+        else:
+            self.logger.setLevel(logging.WARNING)
+        if self.__logging_file:
+            file_handler = logging.FileHandler(self.__logging_file)
+            file_handler.setFormatter(formatter)
+            self.logger.addFilter(file_handler)
+
+    @property
+    def logging_file(self):
+        return self.__logging_file
+
+    @logging_file.setter
+    def logging_file(self, value):
+        self.__logging_file = value
+        if self.__logging_file:
+            formater = logging.Formatter(self.logging_format)
+            file_handler = logging.FileHandler(self.__logging_file)
+            file_handler.setFormatter(formater)
+            self.logger.addHandler(file_handler)
+
+    @property
+    def debug(self):
+        return self.__debug
+
+    @debug.setter
+    def debug(self, value):
+        self.__debug = value
+        if self.__debug:
+            # if debug status is True, turn on debug logging
+            self.logger.setLevel(logging.DEBUG)
+            # turn on httplib debug
+            httplib.HTTPConnection.debuglevel = 1
+        else:
+            # if debug status is False, turn off debug logging,
+            # setting log level to default `logging.WARNING`
+            self.logger.setLevel(logging.WARNING)
+
+    def get_api_key_with_prefix(self, identifier):
+        """
+        Gets API key (with prefix if set).
+
+        :param identifier: The identifier of apiKey.
+        :return: The token for api key authentication.
+        """
+        if self.api_key.get(identifier) and self.api_key_prefix.get(identifier):
+            return self.api_key_prefix[identifier] + ' ' + self.api_key[identifier]
+        elif self.api_key.get(identifier):
+            return self.api_key[identifier]
+
+    def get_basic_auth_token(self):
+        """
+        Gets HTTP basic authentication header (string).
+
+        :return: The token for basic HTTP authentication.
+        """
+        return urllib3.util.make_headers(basic_auth=self.username + ':' + self.password)\
+                           .get('authorization')
+
+    def auth_settings(self):
+        """
+        Gets Auth Settings dict for api client.
+
+        :return: The Auth Settings information dict.
+        """
+        return {
+{{#authMethods}}
+{{#isApiKey}}
+            '{{name}}':
+                {
+                    'type': 'api_key',
+                    'in': {{#isKeyInHeader}}'header'{{/isKeyInHeader}}{{#isKeyInQuery}}'query'{{/isKeyInQuery}},
+                    'key': '{{keyParamName}}',
+                    'value': self.get_api_key_with_prefix('{{keyParamName}}')
+                },
+{{/isApiKey}}
+{{#isBasic}}
+            '{{name}}':
+                {
+                    'type': 'basic',
+                    'in': 'header',
+                    'key': 'Authorization',
+                    'value': self.get_basic_auth_token()
+                },
+{{/isBasic}}
+{{/authMethods}}
+        }
 
+    def to_debug_report(self):
+        """
+        Gets the essential information for debugging.
 
+        :return: The report for debugging.
+        """
+        return "Python SDK Debug Report:\n"\
+               "OS: {env}\n"\
+               "Python Version: {pyversion}\n"\
+               "Version of the API: {{version}}\n"\
+               "SDK Package Version: {{packageVersion}}".\
+               format(env=sys.platform, pyversion=sys.version)
diff --git a/modules/swagger-codegen/src/main/resources/python/model.mustache b/modules/swagger-codegen/src/main/resources/python/model.mustache
index 429eac33ec5..81e0b05849a 100644
--- a/modules/swagger-codegen/src/main/resources/python/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/model.mustache
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # coding: utf-8
 
 """
@@ -15,22 +14,29 @@ Copyright 2015 SmartBear Software
     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
 """
+
 {{#models}}
 {{#model}}
+from pprint import pformat
+from six import iteritems
+
 
 class {{classname}}(object):
     """
     NOTE: This class is auto generated by the swagger code generator program.
     Do not edit the class manually.
     """
-
     def __init__(self):
         """
-        Swagger model
+        {{classname}} - 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.
+        :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 = {
             {{#vars}}'{{name}}': '{{{datatype}}}'{{#hasMore}},
@@ -41,19 +47,71 @@ class {{classname}}(object):
             {{#vars}}'{{name}}': '{{baseName}}'{{#hasMore}},
             {{/hasMore}}{{/vars}}
         }
-        {{#vars}}
-        {{#description}}# {{description}}{{/description}}
-        self.{{name}} = None  # {{{datatype}}}
-        {{/vars}}
 
-    def __repr__(self):
-        properties = []
-        for p in self.__dict__:
-            if p != 'swaggerTypes' and p != 'attributeMap':
-                properties.append('{prop}={val!r}'.format(prop=p, val=self.__dict__[p]))
+{{#vars}}
+        self._{{name}} = None
+{{/vars}}
 
-        return '<{name} {props}>'.format(name=__name__, props=' '.join(properties))
-{{/model}}
-{{/models}}
+{{#vars}}
+    @property
+    def {{name}}(self):
+        """
+        Gets the {{name}} of this {{classname}}.
+{{#description}}        {{{description}}}{{/description}}
+
+        :return: The {{name}} of this {{classname}}.
+        :rtype: {{datatype}}
+        """
+        return self._{{name}}
+
+    @{{name}}.setter
+    def {{name}}(self, {{name}}):
+        """
+        Sets the {{name}} of this {{classname}}.
+{{#description}}        {{{description}}}{{/description}}
+
+        :param {{name}}: The {{name}} of this {{classname}}.
+        :type: {{datatype}}
+        """
+        {{#isEnum}}allowed_values = [{{#allowableValues}}{{#values}}"{{{this}}}"{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}]
+        if {{name}} not in allowed_values:
+            raise ValueError(
+                "Invalid value for `{{name}}`, must be one of {0}"
+                .format(allowed_values)
+            )
+        {{/isEnum}}self._{{name}} = {{name}}
+
+{{/vars}}
+    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()
+            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()
+{{/model}}
+{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/python/rest.mustache b/modules/swagger-codegen/src/main/resources/python/rest.mustache
index 508f3d6693a..1481cbff3d5 100644
--- a/modules/swagger-codegen/src/main/resources/python/rest.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/rest.mustache
@@ -1,19 +1,37 @@
 # coding: utf-8
 
 """
+Copyright 2015 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.
+
 Credit: this file (rest.py) is modified based on rest.py in Dropbox Python SDK:
 https://www.dropbox.com/developers/core/sdks/python
 """
+from __future__ import absolute_import
 
 import sys
 import io
 import json
 import ssl
 import certifi
+import logging
 
 # python 2 and python 3 compatibility library
 from six import iteritems
 
+from .configuration import Configuration
+
 try:
     import urllib3
 except ImportError:
@@ -27,6 +45,9 @@ except ImportError:
     from urllib import urlencode
 
 
+logger = logging.getLogger(__name__)
+
+
 class RESTResponse(io.IOBase):
 
     def __init__(self, resp):
@@ -47,33 +68,28 @@ class RESTResponse(io.IOBase):
         """
         return self.urllib3_response.getheader(name, default)
 
+
 class RESTClientObject(object):
 
     def __init__(self, pools_size=4):
-        # http pool manager
-        self.pool_manager = urllib3.PoolManager(
-            num_pools=pools_size
-        )
+        if Configuration().verify_ssl:
+            cert_reqs = ssl.CERT_REQUIRED
+        else:
+            cert_reqs = ssl.CERT_NONE
+
+        if Configuration().ssl_ca_cert:
+            ca_certs = Configuration().ssl_ca_cert
+        else:
+            # if not set certificate file, use Mozilla's root certificates.
+            ca_certs = certifi.where()
 
         # https pool manager
-        # certificates validated using Mozilla’s root certificates
-        self.ssl_pool_manager = urllib3.PoolManager(
+        self.pool_manager = urllib3.PoolManager(
             num_pools=pools_size,
-            cert_reqs=ssl.CERT_REQUIRED,
-            ca_certs=certifi.where()
+            cert_reqs=cert_reqs,
+            ca_certs=ca_certs
         )
 
-    def agent(self, url):
-        """
-        Return proper pool manager for the http\https schemes.
-        """
-        url = urllib3.util.url.parse_url(url)
-        scheme = url.scheme
-        if scheme == 'https':
-            return self.ssl_pool_manager
-        else:
-            return self.pool_manager
-
     def request(self, method, url, query_params=None, headers=None,
                 body=None, post_params=None):
         """
@@ -82,14 +98,17 @@ class RESTClientObject(object):
         :param query_params: query parameters in the url
         :param headers: http request headers
         :param body: request json body, for `application/json`
-        :param post_params: request post parameters, `application/x-www-form-urlencode`
+        :param post_params: request post parameters,
+                            `application/x-www-form-urlencode`
                             and `multipart/form-data`
         """
         method = method.upper()
         assert method in ['GET', 'HEAD', 'DELETE', 'POST', 'PUT', 'PATCH']
 
         if post_params and body:
-            raise ValueError("body parameter cannot be used with post_params parameter.")
+            raise ValueError(
+                "body parameter cannot be used with post_params parameter."
+            )
 
         post_params = post_params or {}
         headers = headers or {}
@@ -97,157 +116,132 @@ class RESTClientObject(object):
         if 'Content-Type' not in headers:
             headers['Content-Type'] = 'application/json'
 
-        # For `POST`, `PUT`, `PATCH`
-        if method in ['POST', 'PUT', 'PATCH']:
-            if query_params:
-                url += '?' + urlencode(query_params)
-            if headers['Content-Type'] == 'application/json':
-                r = self.agent(url).request(method, url,
-                                            body=json.dumps(body),
-                                            headers=headers)
-            if headers['Content-Type'] == 'application/x-www-form-urlencoded':
-                r = self.agent(url).request(method, url,
-                                            fields=post_params,
-                                            encode_multipart=False,
-                                            headers=headers)
-            if headers['Content-Type'] == 'multipart/form-data':
-                # must del headers['Content-Type'], or the correct Content-Type
-                # which generated by urllib3 will be overwritten.
-                del headers['Content-Type']
-                r = self.agent(url).request(method, url,
-                                            fields=post_params,
-                                            encode_multipart=True,
-                                            headers=headers)
-        # For `GET`, `HEAD`, `DELETE`
-        else:
-            r = self.agent(url).request(method, url,
-                                        fields=query_params,
-                                        headers=headers)
-        r = RESTResponse(r)
-
-        if r.status not in range(200, 206):
-            raise ApiException(r)
+        try:
+            # For `POST`, `PUT`, `PATCH`
+            if method in ['POST', 'PUT', 'PATCH']:
+                if query_params:
+                    url += '?' + urlencode(query_params)
+                if headers['Content-Type'] == 'application/json':
+                    r = self.pool_manager.request(method, url,
+                                                  body=json.dumps(body),
+                                                  headers=headers)
+                if headers['Content-Type'] == 'application/x-www-form-urlencoded':
+                    r = self.pool_manager.request(method, url,
+                                                  fields=post_params,
+                                                  encode_multipart=False,
+                                                  headers=headers)
+                if headers['Content-Type'] == 'multipart/form-data':
+                    # must del headers['Content-Type'], or the correct Content-Type
+                    # which generated by urllib3 will be overwritten.
+                    del headers['Content-Type']
+                    r = self.pool_manager.request(method, url,
+                                                  fields=post_params,
+                                                  encode_multipart=True,
+                                                  headers=headers)
+            # For `GET`, `HEAD`, `DELETE`
+            else:
+                r = self.pool_manager.request(method, url,
+                                              fields=query_params,
+                                              headers=headers)
+        except urllib3.exceptions.SSLError as e:
+            msg = "{0}\n{1}".format(type(e).__name__, str(e))
+            raise ApiException(status=0, reason=msg)
 
-        return self.process_response(r)
+        r = RESTResponse(r)
 
-    def process_response(self, response):
         # In the python 3, the response.data is bytes.
         # we need to decode it to string.
         if sys.version_info > (3,):
-            data = response.data.decode('utf8')
-        else:
-            data = response.data
-        try:
-            resp = json.loads(data)
-        except ValueError:
-            resp = data
+            r.data = r.data.decode('utf8')
 
-        return resp
+        # log response body
+        logger.debug("response body: %s" % r.data)
+
+        if r.status not in range(200, 206):
+            raise ApiException(http_resp=r)
+
+        return r
 
     def GET(self, url, headers=None, query_params=None):
-        return self.request("GET", url, headers=headers, query_params=query_params)
+        return self.request("GET", url,
+                            headers=headers,
+                            query_params=query_params)
 
     def HEAD(self, url, headers=None, query_params=None):
-        return self.request("HEAD", url, headers=headers, query_params=query_params)
+        return self.request("HEAD", url,
+                            headers=headers,
+                            query_params=query_params)
 
     def DELETE(self, url, headers=None, query_params=None):
-        return self.request("DELETE", url, headers=headers, query_params=query_params)
-
-    def POST(self, url, headers=None, post_params=None, body=None):
-        return self.request("POST", url, headers=headers, post_params=post_params, body=body)
-
-    def PUT(self, url, headers=None, post_params=None, body=None):
-        return self.request("PUT", url, headers=headers, post_params=post_params, body=body)
-
-    def PATCH(self, url, headers=None, post_params=None, body=None):
-        return self.request("PATCH", url, headers=headers, post_params=post_params, body=body)
+        return self.request("DELETE", url,
+                            headers=headers,
+                            query_params=query_params)
+
+    def POST(self, url, headers=None, query_params=None, post_params=None, body=None):
+        return self.request("POST", url,
+                            headers=headers,
+                            query_params=query_params,
+                            post_params=post_params,
+                            body=body)
+
+    def PUT(self, url, headers=None, query_params=None, post_params=None, body=None):
+        return self.request("PUT", url,
+                            headers=headers,
+                            query_params=query_params,
+                            post_params=post_params,
+                            body=body)
+
+    def PATCH(self, url, headers=None, query_params=None, post_params=None, body=None):
+        return self.request("PATCH", url,
+                            headers=headers,
+                            query_params=query_params,
+                            post_params=post_params,
+                            body=body)
 
 
 class ApiException(Exception):
-    """
-    Non-2xx HTTP response
-    """
-
-    def __init__(self, http_resp):
-        self.status = http_resp.status
-        self.reason = http_resp.reason
-        self.body = http_resp.data
-        self.headers = http_resp.getheaders()
 
-        # In the python 3, the self.body is bytes.
-        # we need to decode it to string.
-        if sys.version_info > (3,):
-            data = self.body.decode('utf8')
+    def __init__(self, status=None, reason=None, http_resp=None):
+        if http_resp:
+            self.status = http_resp.status
+            self.reason = http_resp.reason
+            self.body = http_resp.data
+            self.headers = http_resp.getheaders()
         else:
-            data = self.body
-            
-        try:
-            self.body = json.loads(data)
-        except ValueError:
-            self.body = data
+            self.status = status
+            self.reason = reason
+            self.body = None
+            self.headers = None
 
     def __str__(self):
         """
-        Custom error response messages
+        Custom error messages for exception
         """
-        return "({0})\n"\
-            "Reason: {1}\n"\
-            "HTTP response headers: {2}\n"\
-            "HTTP response body: {3}\n".\
-            format(self.status, self.reason, self.headers, self.body)
+        error_message = "({0})\n"\
+                        "Reason: {1}\n".format(self.status, self.reason)
+        if self.headers:
+            error_message += "HTTP response headers: {0}\n".format(self.headers)
+
+        if self.body:
+            error_message += "HTTP response body: {0}\n".format(self.body)
+
+        return error_message
+
+
+
+
+
+
+
+
+
+
 
-class RESTClient(object):
-    """
-    A class with all class methods to perform JSON requests.
-    """
 
-    IMPL = RESTClientObject()
 
-    @classmethod
-    def request(cls, *n, **kw):
-        """
-        Perform a REST request and parse the response.
-        """
-        return cls.IMPL.request(*n, **kw)
 
-    @classmethod
-    def GET(cls, *n, **kw):
-        """
-        Perform a GET request using `RESTClient.request()`.
-        """
-        return cls.IMPL.GET(*n, **kw)
 
-    @classmethod
-    def HEAD(cls, *n, **kw):
-        """
-        Perform a HEAD request using `RESTClient.request()`.
-        """
-        return cls.IMPL.GET(*n, **kw)
 
-    @classmethod
-    def POST(cls, *n, **kw):
-        """
-        Perform a POST request using `RESTClient.request()`
-        """
-        return cls.IMPL.POST(*n, **kw)
 
-    @classmethod
-    def PUT(cls, *n, **kw):
-        """
-        Perform a PUT request using `RESTClient.request()`
-        """
-        return cls.IMPL.PUT(*n, **kw)
 
-    @classmethod
-    def PATCH(cls, *n, **kw):
-        """
-        Perform a PATCH request using `RESTClient.request()`
-        """
-        return cls.IMPL.PATCH(*n, **kw)
 
-    @classmethod
-    def DELETE(cls, *n, **kw):
-        """
-        Perform a DELETE request using `RESTClient.request()`
-        """
-        return cls.IMPL.DELETE(*n, **kw)
diff --git a/modules/swagger-codegen/src/main/resources/python/setup.mustache b/modules/swagger-codegen/src/main/resources/python/setup.mustache
index f1ba52d2930..08e110e35cc 100644
--- a/modules/swagger-codegen/src/main/resources/python/setup.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/setup.mustache
@@ -1,22 +1,25 @@
+# coding: utf-8
+
 import sys
 from setuptools import setup, find_packages
 
+NAME = "{{packageName}}"
+VERSION = "{{packageVersion}}"
+
 {{#apiInfo}}{{#apis}}{{^hasMore}}
 
-# To install the library, open a Terminal shell, then run this
-# file by typing:
+# To install the library, run the following
 #
 # python setup.py install
 #
-# You need to have the setuptools module installed.
-# Try reading the setuptools documentation:
+# prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 
-REQUIRES = ["urllib3 >= 1.10", "six >= 1.9", "certifi"]
+REQUIRES = ["urllib3 >= 1.10", "six >= 1.9", "certifi", "python-dateutil"]
 
 setup(
-    name="{{module}}",
-    version="{{version}}",
+    name=NAME,
+    version=VERSION,
     description="{{appName}}",
     author_email="{{infoEmail}}",
     url="{{infoUrl}}",
@@ -30,11 +33,3 @@ setup(
 )
 
 {{/hasMore}}{{/apis}}{{/apiInfo}}
-
-
-
-
-
-
-
-
diff --git a/modules/swagger-codegen/src/main/resources/python3/api.mustache b/modules/swagger-codegen/src/main/resources/python3/api.mustache
index 015158bccec..2ff659b11b5 100644
--- a/modules/swagger-codegen/src/main/resources/python3/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/python3/api.mustache
@@ -36,7 +36,7 @@ class {{classname}}(object):
         {{{notes}}}
 
         Args:
-            {{#allParams}}{{paramName}}, {{dataType}}: {{{description}}} {{^optional}}(required){{/optional}}{{#optional}}(optional){{/optional}}
+            {{#allParams}}{{paramName}}, {{dataType}}: {{{description}}} {{#required}}(required){{/required}}{{^required}}(optional){{/required}}
             {{/allParams}}
 
         Returns: {{returnType}}
diff --git a/modules/swagger-codegen/src/main/resources/python3/swagger.mustache b/modules/swagger-codegen/src/main/resources/python3/swagger.mustache
index f99f0d4d250..57f959c380b 100644
--- a/modules/swagger-codegen/src/main/resources/python3/swagger.mustache
+++ b/modules/swagger-codegen/src/main/resources/python3/swagger.mustache
@@ -18,13 +18,13 @@ from .models import *
 class ApiClient:
     """Generic API client for Swagger client library builds"""
 
-    def __init__(self, apiKey=None, apiServer=None):
+    def __init__(self, apiKey=None, apiServer=None, cookie=None):
         if apiKey == None:
             raise Exception('You must pass an apiKey when instantiating the '
                             'APIClient')
         self.apiKey = apiKey
         self.apiServer = apiServer
-        self.cookie = None
+        self.cookie = cookie
 
     def callAPI(self, resourcePath, method, queryParams, postData,
                 headerParams=None):
diff --git a/modules/swagger-codegen/src/main/resources/retrofit/api.mustache b/modules/swagger-codegen/src/main/resources/retrofit/api.mustache
index a916f363ff5..1f49b4a7cba 100644
--- a/modules/swagger-codegen/src/main/resources/retrofit/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/retrofit/api.mustache
@@ -22,7 +22,7 @@ public interface {{classname}} {
   {{#isMultipart}}@Multipart{{/isMultipart}}{{^isMultipart}}@FormUrlEncoded{{/isMultipart}}{{/-first}}{{/formParams}}
   @{{httpMethod}}("{{path}}")  
   {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}} {{nickname}}({{^allParams}});{{/allParams}}
-    {{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{^hasMore}}
+    {{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}}, {{/hasMore}}{{^hasMore}}
   );{{/hasMore}}{{/allParams}}  
   {{/operation}}
 }
diff --git a/modules/swagger-codegen/src/main/resources/retrofit/formParams.mustache b/modules/swagger-codegen/src/main/resources/retrofit/formParams.mustache
index 9853bc0bf11..be9a3ca9b26 100644
--- a/modules/swagger-codegen/src/main/resources/retrofit/formParams.mustache
+++ b/modules/swagger-codegen/src/main/resources/retrofit/formParams.mustache
@@ -1 +1 @@
-{{#isFormParam}}{{#notFile}}{{#isMultipart}}@Part{{/isMultipart}}{{^isMultipart}}@Field{{/isMultipart}}("{{paramName}}") {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}{{#isMultipart}}@Part{{/isMultipart}}{{^isMultipart}}@Field{{/isMultipart}}("{{paramName}}") TypedFile {{paramName}}{{/isFile}}{{/isFormParam}}
\ No newline at end of file
+{{#isFormParam}}{{#notFile}}{{#isMultipart}}@Part{{/isMultipart}}{{^isMultipart}}@Field{{/isMultipart}}("{{baseName}}") {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}{{#isMultipart}}@Part{{/isMultipart}}{{^isMultipart}}@Field{{/isMultipart}}("{{baseName}}") TypedFile {{paramName}}{{/isFile}}{{/isFormParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/retrofit/service.mustache b/modules/swagger-codegen/src/main/resources/retrofit/service.mustache
index 218a9304071..df6d61b7ab8 100644
--- a/modules/swagger-codegen/src/main/resources/retrofit/service.mustache
+++ b/modules/swagger-codegen/src/main/resources/retrofit/service.mustache
@@ -2,8 +2,20 @@ package {{invokerPackage}};
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonParseException;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.IOException;
+import java.lang.reflect.Type;
+
 import retrofit.RestAdapter;
+import retrofit.converter.ConversionException;
+import retrofit.converter.Converter;
 import retrofit.converter.GsonConverter;
+import retrofit.mime.TypedByteArray;
+import retrofit.mime.TypedInput;
+import retrofit.mime.TypedOutput;
 
 public class ServiceGenerator {
   // No need to instantiate this class.
@@ -15,9 +27,63 @@ public class ServiceGenerator {
         .create();
     RestAdapter adapter = new RestAdapter.Builder()
         .setEndpoint("{{basePath}}")
-        .setConverter(new GsonConverter(gson))
+        .setConverter(new GsonConverterWrapper(gson))
         .build();
 
     return adapter.create(serviceClass);
   }
 }
+
+/**
+ * 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 GsonConverterWrapper implements Converter {
+    private GsonConverter converter;
+
+    public GsonConverterWrapper(Gson gson) {
+        converter = new GsonConverter(gson);
+    }
+
+    @Override public Object fromBody(TypedInput body, Type type) throws ConversionException {
+        byte[] bodyBytes = readInBytes(body);
+        TypedByteArray newBody = new TypedByteArray(body.mimeType(), bodyBytes);
+        try {
+            return converter.fromBody(newBody, type);
+        } catch (ConversionException e) {
+            if (e.getCause() instanceof JsonParseException && type.equals(String.class)) {
+                return new String(bodyBytes);
+            } else {
+                throw e;
+            }
+        }
+    }
+
+    @Override public TypedOutput toBody(Object object) {
+        return converter.toBody(object);
+    }
+
+    private byte[] readInBytes(TypedInput body) throws ConversionException {
+        InputStream in = null;
+        try {
+            in = body.in();
+            ByteArrayOutputStream os = new ByteArrayOutputStream();
+            byte[] buffer = new byte[0xFFFF];
+            for (int len; (len = in.read(buffer)) != -1;)
+                os.write(buffer, 0, len);
+            os.flush();
+            return os.toByteArray();
+        } catch (IOException e) {
+            throw new ConversionException(e);
+        } finally {
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException ignored) {
+                }
+            }
+        }
+
+    }
+}
diff --git a/modules/swagger-codegen/src/main/resources/ruby/api.mustache b/modules/swagger-codegen/src/main/resources/ruby/api.mustache
index 3e1ac14014e..612292b78ff 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/api.mustache
@@ -3,22 +3,29 @@ require "uri"
 module {{moduleName}}
 {{#operations}}
   class {{classname}}
-    basePath = "{{basePath}}"
-    # apiInvoker = APIInvoker
 {{#operation}}
 {{newline}}
     # {{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}}
 {{/required}}{{/allParams}}    # @return [{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}nil{{/returnType}}]
     def self.{{nickname}}({{#allParams}}{{#required}}{{paramName}}, {{/required}}{{/allParams}}opts = {})
+      if Swagger.configuration.debug
+        Swagger.logger.debug "Calling API: {{classname}}#{{nickname}} ..."
+      end
       {{#allParams}}{{#required}}
       # verify the required parameter '{{paramName}}' is set
-      raise "Missing the required parameter '{{paramName}}' when calling {{nickname}}" if {{{paramName}}}.nil?
-      {{/required}}{{/allParams}}
-
+      fail "Missing the required parameter '{{paramName}}' when calling {{nickname}}" if {{{paramName}}}.nil?{{#isEnum}}
+      unless [{{#allowableValues}}{{#values}}'{{{this}}}'{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}].include?({{{paramName}}})
+        fail "invalid value for '{{{paramName}}}', must be one of {{#allowableValues}}{{#values}}{{{this}}}{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}"
+      end{{/isEnum}}
+      {{/required}}{{^required}}{{#isEnum}}
+      if opts[:'{{{paramName}}}'] && ![{{#allowableValues}}{{#values}}'{{{this}}}'{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}].include?(opts[:'{{{paramName}}}'])
+        fail 'invalid value for "{{{paramName}}}", must be one of {{#allowableValues}}{{#values}}{{{this}}}{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}'
+      end
+      {{/isEnum}}{{/required}}{{/allParams}}
       # resource path
       path = "{{path}}".sub('{format}','json'){{#pathParams}}.sub('{' + '{{baseName}}' + '}', {{paramName}}.to_s){{/pathParams}}
 
@@ -51,8 +58,15 @@ module {{moduleName}}
       {{/bodyParam}}
 
       auth_names = [{{#authMethods}}'{{name}}'{{#hasMore}}, {{/hasMore}}{{/authMethods}}]
-      {{#returnType}}response = Swagger::Request.new(:{{httpMethod}}, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make.body
-      {{#returnContainer}}response.map {|response| {{/returnContainer}}obj = {{returnBaseType}}.new() and obj.build_from_hash(response){{#returnContainer}} }{{/returnContainer}}{{/returnType}}{{^returnType}}Swagger::Request.new(:{{httpMethod}}, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      {{#returnType}}response = Swagger::Request.new(:{{httpMethod}}, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      result = response.deserialize('{{{returnType}}}')
+      if Swagger.configuration.debug
+        Swagger.logger.debug "API called: {{classname}}#{{nickname}}. Result: #{result.inspect}"
+      end
+      result{{/returnType}}{{^returnType}}Swagger::Request.new(:{{httpMethod}}, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      if Swagger.configuration.debug
+        Swagger.logger.debug "API called: {{classname}}#{{nickname}}"
+      end
       nil{{/returnType}}
     end
 {{/operation}}
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 c0e563a0bb7..77b320d07f4 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/base_object.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/base_object.mustache
@@ -1,21 +1,14 @@
+require 'date'
+
 module {{moduleName}}
   # base class containing fundamental method such as to_hash, build_from_hash and more
   class BaseObject
 
-    # return the object in the form of hash
-    def to_body
-      body = {}
-      self.class.attribute_map.each_pair do |key, value|
-        body[value] = self.send(key) unless self.send(key).nil?
-      end
-      body
-    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 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
@@ -35,13 +28,15 @@ module {{moduleName}}
       case type.to_sym
       when :DateTime
         DateTime.parse(value)
-      when :string
+      when :Date
+        Date.parse(value)
+      when :String
         value.to_s
-      when :int
+      when :Integer
         value.to_i
-      when :double
+      when :Float
         value.to_f
-      when :boolean
+      when :BOOLEAN
         if value =~ /^(true|t|yes|y|1)$/i
           true
         else
@@ -53,7 +48,16 @@ module {{moduleName}}
       end
     end
 
-    # to_body is an alias to to_body (backward compatibility)
+    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 |key, value|
diff --git a/modules/swagger-codegen/src/main/resources/ruby/model.mustache b/modules/swagger-codegen/src/main/resources/ruby/model.mustache
index d0d4e787756..1091ab5174a 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/model.mustache
@@ -29,11 +29,20 @@ module {{moduleName}}
       {{#vars}}
       if attributes[:'{{{baseName}}}']
         {{#isContainer}}if (value = attributes[:'{{{baseName}}}']).is_a?(Array)
-          @{{{name}}} = value
-        end{{/isContainer}}{{^isContainer}}@{{{name}}} = attributes[:'{{{baseName}}}']{{/isContainer}}
+          self.{{{name}}} = value
+        end{{/isContainer}}{{^isContainer}}self.{{{name}}} = attributes[:'{{{baseName}}}']{{/isContainer}}
       end
       {{/vars}}
     end
+{{#vars}}{{#isEnum}}
+    def {{{name}}}=({{{name}}})
+      allowed_values = [{{#allowableValues}}{{#values}}"{{{this}}}"{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}]
+      if {{{name}}} && !allowed_values.include?({{{name}}})
+        fail "invalid value for '{{{name}}}', must be one of #{allowed_values}"
+      end
+      @{{{name}}} = {{{name}}}
+    end
+{{/isEnum}}{{/vars}}
   end
 {{/model}}
 {{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/ruby/monkey.mustache b/modules/swagger-codegen/src/main/resources/ruby/monkey.mustache
deleted file mode 100644
index 28932890af9..00000000000
--- a/modules/swagger-codegen/src/main/resources/ruby/monkey.mustache
+++ /dev/null
@@ -1,90 +0,0 @@
-# module Swagger
-  class Object 
-  
-    unless Object.method_defined? :blank?
-      def blank?
-        respond_to?(:empty?) ? empty? : !self
-      end
-    end
-  
-    unless Object.method_defined? :present?
-      def present?
-        !blank?
-      end
-    end
-
-  end
-
-  class String
-
-    unless String.method_defined? :underscore
-      def underscore
-        self.gsub(/::/, '/').
-        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-        gsub(/([a-z\d])([A-Z])/,'\1_\2').
-        tr("-", "_").
-        downcase
-      end
-    end
-  
-    unless String.method_defined? :camelize
-      def camelize(first_letter_in_uppercase = true)
-        if first_letter_in_uppercase != :lower
-          self.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
-        else
-          self.to_s[0].chr.downcase + camelize(self)[1..-1]
-        end
-      end
-    end
-
-  end
-
-  class Hash
-
-    unless Hash.method_defined? :stringify_keys    
-      def stringify_keys
-        inject({}) do |options, (key, value)|
-          options[key.to_s] = value
-          options
-        end
-      end
-    end
-    
-    unless Hash.method_defined? :stringify_keys!
-      def stringify_keys!
-        self.replace(self.stringify_keys)
-      end
-    end
-
-    unless Hash.method_defined? :symbolize_keys
-      def symbolize_keys
-        inject({}) do |options, (key, value)|
-          options[(key.to_sym rescue key) || key] = value
-          options
-        end
-      end
-    end
-  
-    unless Hash.method_defined? :symbolize_keys!
-      def symbolize_keys!
-        self.replace(self.symbolize_keys)
-      end
-    end
-
-    unless Hash.method_defined? :symbolize_and_underscore_keys
-      def symbolize_and_underscore_keys
-        inject({}) do |options, (key, value)|
-          options[(key.to_s.underscore.to_sym rescue key) || key] = value
-          options
-        end
-      end
-    end
-
-    unless Hash.method_defined? :symbolize_and_underscore_keys!
-      def symbolize_and_underscore_keys!
-        self.replace(self.symbolize_and_underscore_keys)
-      end
-    end
-  
-  end
-# end
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/ruby/swagger.mustache b/modules/swagger-codegen/src/main/resources/ruby/swagger.mustache
index dd2f630a8c9..9be82e015cd 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/swagger.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/swagger.mustache
@@ -1,6 +1,3 @@
-require 'logger'
-require 'json'
-
 module {{moduleName}}
   module Swagger
     class << self
@@ -25,8 +22,7 @@ module {{moduleName}}
       def configure
         yield(configuration) if block_given?
 
-        # Configure logger.  Default to use Rails
-        self.logger ||= configuration.logger || (defined?(Rails) ? Rails.logger : Logger.new(STDOUT))
+        self.logger = configuration.logger
 
         # remove :// from scheme
         configuration.scheme.sub!(/:\/\//, '')
@@ -41,7 +37,7 @@ module {{moduleName}}
       end
 
       def authenticated?
-        Swagger.configuration.auth_token.present?
+        !Swagger.configuration.auth_token.nil?
       end
 
       def de_authenticate
@@ -51,8 +47,8 @@ module {{moduleName}}
       def authenticate
         return if Swagger.authenticated?
 
-        if Swagger.configuration.username.blank? || Swagger.configuration.password.blank?
-          raise ClientError, "Username and password are required to authenticate."
+        if Swagger.configuration.username.nil? || Swagger.configuration.password.nil?
+          raise ApiError, "Username and password are required to authenticate."
         end
 
         request = Swagger::Request.new(
@@ -67,12 +63,14 @@ module {{moduleName}}
         response_body = request.response.body
         Swagger.configuration.auth_token = response_body['token']
       end
-    end
-  end
 
-  class ServerError < StandardError
-  end
+      def last_response
+        Thread.current[:swagger_last_response]
+      end
 
-  class ClientError < StandardError
+      def last_response=(response)
+        Thread.current[:swagger_last_response] = response
+      end
+    end
   end
 end
diff --git a/modules/swagger-codegen/src/main/resources/ruby/swagger/api_error.mustache b/modules/swagger-codegen/src/main/resources/ruby/swagger/api_error.mustache
new file mode 100644
index 00000000000..552161238a0
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/ruby/swagger/api_error.mustache
@@ -0,0 +1,26 @@
+module {{moduleName}}
+  module Swagger
+    class ApiError < StandardError
+      attr_reader :code, :response_headers, :response_body
+
+      # Usage examples:
+      #   ApiError.new
+      #   ApiError.new("message")
+      #   ApiError.new(:code => 500, :response_headers => {}, :response_body => "")
+      #   ApiError.new(:code => 404, :message => "Not Found")
+      def initialize(arg = nil)
+        if arg.is_a? Hash
+          arg.each do |k, v|
+            if k.to_s == 'message'
+              super v
+            else
+              instance_variable_set "@#{k}", v
+            end
+          end
+        else
+          super arg
+        end
+      end
+    end
+  end
+end
diff --git a/modules/swagger-codegen/src/main/resources/ruby/swagger/configuration.mustache b/modules/swagger-codegen/src/main/resources/ruby/swagger/configuration.mustache
index e9a8af9c162..1279a454e71 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/swagger/configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/swagger/configuration.mustache
@@ -1,7 +1,76 @@
+require 'logger'
+
 module {{moduleName}}
   module Swagger
     class Configuration
-      attr_accessor :format, :api_key, :api_key_prefix, :username, :password, :auth_token, :scheme, :host, :base_path, :user_agent, :logger, :inject_format, :force_ending_format, :camelize_params, :user_agent, :verify_ssl
+      attr_accessor :scheme, :host, :base_path, :user_agent, :format, :auth_token, :inject_format, :force_ending_format
+
+      # Defines the username used with HTTP basic authentication.
+      #
+      # @return [String]
+      attr_accessor :username
+
+      # Defines the password used with HTTP basic authentication.
+      #
+      # @return [String]
+      attr_accessor :password
+
+      # Defines API keys used with API Key authentications.
+      #
+      # @return [Hash] key: parameter name, value: parameter value (API key)
+      #
+      # @example parameter name is "api_key", API key is "xxx" (e.g. "api_key=xxx" in query string)
+      #   config.api_key['api_key'] = 'xxx'
+      attr_accessor :api_key
+
+      # Defines API key prefixes used with API Key authentications.
+      #
+      # @return [Hash] key: parameter name, value: API key prefix
+      #
+      # @example parameter name is "Authorization", API key prefix is "Token" (e.g. "Authorization: Token xxx" in headers)
+      #   config.api_key_prefix['api_key'] = 'Token'
+      attr_accessor :api_key_prefix
+
+      # Set this to false to skip verifying SSL certificate when calling API from https server.
+      # Default to true.
+      #
+      # @note Do NOT set it to false in production code, otherwise you would face multiple types of cryptographic attacks.
+      #
+      # @return [true, false]
+      attr_accessor :verify_ssl
+
+      # Set this to customize the certificate file to verify the peer.
+      #
+      # @return [String] the path to the certificate file
+      #
+      # @see The `cainfo` option of Typhoeus, `--cert` option of libcurl. Related source code:
+      # https://github.com/typhoeus/typhoeus/blob/master/lib/typhoeus/easy_factory.rb#L145
+      attr_accessor :ssl_ca_cert
+
+      # Set this to enable/disable debugging. When enabled (set to true), HTTP request/response
+      # details will be logged with `logger.debug` (see the `logger` attribute).
+      # Default to false.
+      #
+      # @return [true, false]
+      attr_accessor :debug
+
+      # Defines the logger used for debugging.
+      # Default to `Rails.logger` (when in Rails) or logging to STDOUT.
+      #
+      # @return [#debug]
+      attr_accessor :logger
+
+      # Defines the temporary folder to store downloaded files
+      # (for API endpoints that have file response).
+      # Default to use `Tempfile`.
+      #
+      # @return [String]
+      attr_accessor :temp_folder_path
+
+      # Defines the headers to be used in HTTP requests of all API calls by default.
+      #
+      # @return [Hash]
+      attr_accessor :default_headers
 
       # Defaults go in here..
       def initialize
@@ -12,17 +81,20 @@ module {{moduleName}}
         @user_agent = "ruby-swagger-#{Swagger::VERSION}"
         @inject_format = false
         @force_ending_format = false
-        @camelize_params = true
+
+        @default_headers = {
+          'Content-Type' => "application/#{@format.downcase}",
+          'User-Agent' => @user_agent
+        }
 
         # keys for API key authentication (param-name => api-key)
         @api_key = {}
-        # api-key prefix for API key authentication, e.g. "Bearer" (param-name => api-key-prefix)
         @api_key_prefix = {}
 
-        # whether to verify SSL certificate, default to true
-        # Note: do NOT set it to false in production code, otherwise you would
-        #   face multiple types of cryptographic attacks
         @verify_ssl = true
+
+        @debug = false
+        @logger = defined?(Rails) ? Rails.logger : Logger.new(STDOUT)
       end
     end
   end
diff --git a/modules/swagger-codegen/src/main/resources/ruby/swagger/request.mustache b/modules/swagger-codegen/src/main/resources/ruby/swagger/request.mustache
index 99b58d58be8..dd39449e1f3 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/swagger/request.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/swagger/request.mustache
@@ -1,41 +1,35 @@
+require 'uri'
+require 'typhoeus'
+
 module {{moduleName}}
   module Swagger
     class Request
-      require 'uri'
-      require 'addressable/uri'
-      require 'typhoeus'
-
-      attr_accessor :host, :path, :format, :params, :body, :http_method, :headers, :form_params, :auth_names
+      attr_accessor :host, :path, :format, :params, :body, :http_method, :headers, :form_params, :auth_names, :response
 
       # All requests must have an HTTP method and a path
       # Optionals parameters are :params, :headers, :body, :format, :host
-      def initialize(http_method, path, attributes={})
-        attributes[:format] ||= Swagger.configuration.format
-        attributes[:params] ||= {}
+      def initialize(http_method, path, attributes = {})
+        @http_method = http_method.to_sym.downcase
+        @path = path
 
-        # Set default headers
-        default_headers = {
-          'Content-Type' => "application/#{attributes[:format].downcase}",
-          'User-Agent' => Swagger.configuration.user_agent
-        }
+        attributes.each { |name, value| send "#{name}=", value }
 
-        # Merge argument headers into defaults
-        attributes[:headers] = default_headers.merge(attributes[:headers] || {})
+        @format ||= Swagger.configuration.format
+        @params ||= {}
+
+        # Apply default headers
+        @headers = Swagger.configuration.default_headers.merge(@headers || {})
 
         # Stick in the auth token if there is one
         if Swagger.authenticated?
-          attributes[:headers].merge!({:auth_token => Swagger.configuration.auth_token})
-        end
-
-        self.http_method = http_method.to_sym
-        self.path = path
-        attributes.each do |name, value|
-          send("#{name.to_s.underscore.to_sym}=", value)
+          @headers.merge!({:auth_token => Swagger.configuration.auth_token})
         end
-
+        {{#hasAuthMethods}}
         update_params_for_auth!
+        {{/hasAuthMethods}}
       end
 
+      {{#hasAuthMethods}}
       # Update hearder and query params based on authentication settings.
       def update_params_for_auth!
         (@auth_names || []).each do |auth_name|
@@ -50,30 +44,23 @@ module {{moduleName}}
           end
         end
       end
+      {{/hasAuthMethods}}
 
       # Get API key (with prefix if set).
       # @param [String] param_name the parameter name of API key auth
       def get_api_key_with_prefix(param_name)
-        if Swagger.configuration.api_key_prefix[param_name].present?
+        if Swagger.configuration.api_key_prefix[param_name]
           "#{Swagger.configuration.api_key_prefix[param_name]} #{Swagger.configuration.api_key[param_name]}"
         else
           Swagger.configuration.api_key[param_name]
         end
       end
 
-      # Construct a base URL
+      # Construct the request URL.
       def url(options = {})
-        u = Addressable::URI.new(
-          :scheme => Swagger.configuration.scheme,
-          :host => Swagger.configuration.host,
-          :path => self.interpreted_path,
-          :query => self.query_string.sub(/\?/, '')
-        ).to_s
-
-        # Drop trailing question mark, if present
-        u.sub! /\?$/, ''
-
-        u
+        _path = self.interpreted_path
+        _path = "/#{_path}" unless _path.start_with?('/')
+        "#{Swagger.configuration.scheme}://#{Swagger.configuration.host}#{_path}"
       end
 
       # Iterate over the params hash, injecting any path values into the path string
@@ -104,18 +91,6 @@ module {{moduleName}}
         URI.encode [Swagger.configuration.base_path, p].join("/").gsub(/\/+/, '/')
       end
 
-      # Massage the request body into a state of readiness
-      # If body is a hash, camelize all keys then convert to a json string
-      def body=(value)
-        if value.is_a?(Hash)
-          value = value.inject({}) do |memo, (k,v)|
-            memo[k.to_s.camelize(:lower).to_sym] = v
-            memo
-          end
-        end
-        @body = value
-      end
-
       # If body is an object, JSONify it before making the actual request.
       # For form parameters, remove empty value
       def outgoing_body
@@ -125,93 +100,60 @@ module {{moduleName}}
           data.each do |key, value|
             data[key] = value.to_s if value && !value.is_a?(File) # remove emtpy form parameter
           end
-          data
         elsif @body # http body is JSON
-          @body.is_a?(String) ? @body : @body.to_json
+          data = @body.is_a?(String) ? @body : @body.to_json
         else
-          nil
+          data = nil
         end
-      end
 
-      # Construct a query string from the query-string-type params
-      def query_string
-        # Iterate over all params,
-        # .. removing the ones that are part of the path itself.
-        # .. stringifying values so Addressable doesn't blow up.
-        query_values = {}
-        self.params.each_pair do |key, value|
-          next if self.path.include? "{#{key}}"                                   # skip path params
-          next if value.blank? && value.class != FalseClass                       # skip empties
-          if Swagger.configuration.camelize_params
-            key = key.to_s.camelize(:lower).to_sym
-          end
-          query_values[key] = value.to_s
+        if Swagger.configuration.debug
+          Swagger.logger.debug "HTTP request body param ~BEGIN~\n#{data}\n~END~\n"
         end
 
-        # We don't want to end up with '?' as our query string
-        # if there aren't really any params
-        return "" if query_values.blank?
-
-        # Addressable requires query_values to be set after initialization..
-        qs = Addressable::URI.new
-        qs.query_values = query_values
-        qs.to_s
+        data
       end
 
       def make
-        #TODO use configuration setting to determine if debugging
-        #logger = Logger.new STDOUT
-        #logger.debug self.url
-
         request_options = {
+          :method => self.http_method,
+          :headers => self.headers,
+          :params => self.params,
           :ssl_verifypeer => Swagger.configuration.verify_ssl,
-          :headers => self.headers.stringify_keys
+          :cainfo => Swagger.configuration.ssl_ca_cert,
+          :verbose => Swagger.configuration.debug
         }
-        response = case self.http_method.to_sym
-        when :get,:GET
-          Typhoeus::Request.get(
-            self.url,
-            request_options
-          )
 
-        when :post,:POST
-          Typhoeus::Request.post(
-            self.url,
-            request_options.merge(:body => self.outgoing_body)
-          )
+        if [:post, :patch, :put, :delete].include?(self.http_method)
+          request_options.update :body => self.outgoing_body
+        end
 
-        when :patch,:PATCH
-          Typhoeus::Request.patch(
-            self.url,
-            request_options.merge(:body => self.outgoing_body)
-          )
+        raw = Typhoeus::Request.new(self.url, request_options).run
+        @response = Response.new(raw)
 
-        when :put,:PUT
-          Typhoeus::Request.put(
-            self.url,
-            request_options.merge(:body => self.outgoing_body)
-          )
+        if Swagger.configuration.debug
+          Swagger.logger.debug "HTTP response body ~BEGIN~\n#{@response.body}\n~END~\n"
+        end
 
-        when :delete,:DELETE
-          Typhoeus::Request.delete(
-            self.url,
-            request_options.merge(:body => self.outgoing_body)
-          )
+        # record as last response
+        Swagger.last_response = @response
+
+        unless @response.success?
+          fail ApiError.new(:code => @response.code,
+                            :response_headers => @response.headers,
+                            :response_body => @response.body),
+               @response.status_message
         end
-        Response.new(response)
-      end
 
-      def response
-        self.make
+        @response
       end
 
       def response_code_pretty
-        return unless @response.present?
+        return unless @response
         @response.code.to_s
       end
 
       def response_headers_pretty
-        return unless @response.present?
+        return unless @response
         # JSON.pretty_generate(@response.headers).gsub(/\n/, '<br/>') # <- This was for RestClient
         @response.headers.gsub(/\n/, '<br/>') # <- This is for Typhoeus
       end
diff --git a/modules/swagger-codegen/src/main/resources/ruby/swagger/response.mustache b/modules/swagger-codegen/src/main/resources/ruby/swagger/response.mustache
index e7bb482fb66..5f55fd68690 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/swagger/response.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/swagger/response.mustache
@@ -2,37 +2,121 @@ module {{moduleName}}
   module Swagger
     class Response
       require 'json'
+      require 'date'
+      require 'tempfile'
 
       attr_accessor :raw
 
       def initialize(raw)
         self.raw = raw
-
-        case self.code
-        when 500..510 then raise(ServerError, self.error_message)
-        when 299..426 then raise(ClientError, self.error_message)
-        end
       end
 
       def code
         raw.code
       end
 
-      # Account for error messages that take different forms...
-      def error_message
-        body['message']
-      rescue
-        body
+      def status_message
+        raw.status_message
       end
 
-      # If body is JSON, parse it
-      # Otherwise return raw string
       def body
-        JSON.parse(raw.body, :symbolize_names => true)
-      rescue
         raw.body
       end
 
+      def success?
+        raw.success?
+      end
+
+      # Deserialize the raw response body to the given return type.
+      #
+      # @param [String] return_type some examples: "User", "Array[User]", "Hash[String,Integer]"
+      def deserialize(return_type)
+        return nil if body.nil? || body.empty?
+
+        # handle file downloading - save response body into a tmp file and return the File instance
+        return download_file if return_type == 'File'
+
+        # ensuring a default content type
+        content_type = raw.headers['Content-Type'] || 'application/json'
+
+        unless content_type.start_with?('application/json')
+          fail "Content-Type is not supported: #{content_type}"
+        end
+
+        begin
+          data = JSON.parse("[#{body}]", :symbolize_names => true)[0]
+        rescue JSON::ParserError => e
+          if %w(String Date DateTime).include?(return_type)
+            data = body
+          else
+            raise e
+          end
+        end
+
+        convert_to_type data, return_type
+      end
+
+      # Convert data to the given return type.
+      def convert_to_type(data, return_type)
+        return nil if data.nil?
+        case return_type
+        when 'String'
+          data.to_s
+        when 'Integer'
+          data.to_i
+        when 'Float'
+          data.to_f
+        when 'BOOLEAN'
+          data == true
+        when 'DateTime'
+          # parse date time (expecting ISO 8601 format)
+          DateTime.parse data
+        when 'Date'
+          # parse date time (expecting ISO 8601 format)
+          Date.parse data
+        when 'Object'
+          # generic object, return directly
+          data
+        when /\AArray<(.+)>\z/
+          # e.g. Array<Pet>
+          sub_type = $1
+          data.map {|item| convert_to_type(item, sub_type) }
+        when /\AHash\<String, (.+)\>\z/
+          # e.g. Hash<String, Integer>
+          sub_type = $1
+          {}.tap do |hash|
+            data.each {|k, v| hash[k] = convert_to_type(v, sub_type) }
+          end
+        else
+          # models, e.g. Pet
+          {{moduleName}}.const_get(return_type).new.tap do |model|
+            model.build_from_hash data
+          end
+        end
+      end
+
+      # Save response body into a file in (the defined) temporary folder, using the filename
+      # from the "Content-Disposition" header if provided, otherwise a random filename.
+      #
+      # @see Configuration#temp_folder_path
+      # @return [File] the file downloaded
+      def download_file
+        tmp_file = Tempfile.new '', Swagger.configuration.temp_folder_path
+        content_disposition = raw.headers['Content-Disposition']
+        if content_disposition
+          filename = content_disposition[/filename=['"]?([^'"\s]+)['"]?/, 1]
+          path = File.join File.dirname(tmp_file), filename
+        else
+          path = tmp_file.path
+        end
+        # close and delete temp file
+        tmp_file.close!
+
+        File.open(path, 'w') { |file| file.write(raw.body) }
+        Swagger.logger.info "File written to #{path}. Please move the file to a proper folder for further processing and delete the temp afterwards"
+        return File.new(path)
+      end
+
       # `headers_hash` is a Typhoeus-specific extension of Hash,
       # so simplify it back into a regular old Hash.
       def headers
@@ -56,9 +140,11 @@ module {{moduleName}}
       end
 
       def pretty_body
-        return unless body.present?
-        case format
-        when 'json' then JSON.pretty_generate(body).gsub(/\n/, '<br/>')
+        return unless body
+        if format == 'json'
+          JSON.pretty_generate(JSON.parse(body)).gsub(/\n/, '<br/>')
+        else
+          body
         end
       end
 
diff --git a/modules/swagger-codegen/src/main/resources/ruby/swagger/version.mustache b/modules/swagger-codegen/src/main/resources/ruby/swagger/version.mustache
index 332a5e66f45..5e93268298d 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/swagger/version.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/swagger/version.mustache
@@ -1,5 +1,5 @@
 module {{moduleName}}
   module Swagger
-    VERSION = "{{appVersion}}"
+    VERSION = "{{gemVersion}}"
   end
 end
diff --git a/modules/swagger-codegen/src/main/resources/ruby/swagger_client.gemspec.mustache b/modules/swagger-codegen/src/main/resources/ruby/swagger_client.gemspec.mustache
index 8ae4bfa1a49..38d70c07dd5 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/swagger_client.gemspec.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/swagger_client.gemspec.mustache
@@ -14,7 +14,6 @@ Gem::Specification.new do |s|
   s.license     = "Apache-2.0"
 
   s.add_runtime_dependency 'typhoeus', '~> 0.2', '>= 0.2.1'
-  s.add_runtime_dependency 'addressable', '~> 2.2', '>= 2.2.4'
   s.add_runtime_dependency 'json', '~> 1.4', '>= 1.4.6'
 
   s.add_development_dependency 'rspec', '~> 3.2', '>= 3.2.0'
diff --git a/modules/swagger-codegen/src/main/resources/ruby/swagger_client.mustache b/modules/swagger-codegen/src/main/resources/ruby/swagger_client.mustache
index df675ddf26e..a43c8a9f6ea 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/swagger_client.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/swagger_client.mustache
@@ -1,13 +1,13 @@
 # Swagger common files
-require '{{gemName}}/monkey'
 require '{{gemName}}/swagger'
 require '{{gemName}}/swagger/configuration'
+require '{{gemName}}/swagger/api_error'
 require '{{gemName}}/swagger/request'
 require '{{gemName}}/swagger/response'
 require '{{gemName}}/swagger/version'
 
 # Models
-require '{{modelPackage}}/base_object'
+require '{{gemName}}/{{modelPackage}}/base_object'
 {{#models}}
 require '{{importPath}}'
 {{/models}}
@@ -21,5 +21,6 @@ require '{{importPath}}'
 
 module {{moduleName}}
   # Initialize the default configuration
-  Swagger.configuration ||= Swagger::Configuration.new
+  Swagger.configuration = Swagger::Configuration.new
+  Swagger.configure { |config| }
 end
diff --git a/modules/swagger-codegen/src/main/resources/scala/apiInvoker.mustache b/modules/swagger-codegen/src/main/resources/scala/apiInvoker.mustache
index f432c2dc59e..2300341d6d9 100644
--- a/modules/swagger-codegen/src/main/resources/scala/apiInvoker.mustache
+++ b/modules/swagger-codegen/src/main/resources/scala/apiInvoker.mustache
@@ -59,7 +59,7 @@ class ApiInvoker(val mapper: ObjectMapper = ScalaJsonUtil.getJsonMapper,
     if (cls == classOf[String]) {
       json match {
         case s: String => {
-          if (s.startsWith("\"") && s.endsWith("\"") && s.length > 1) s.substring(1, s.length - 2)
+          if (s.startsWith("\"") && s.endsWith("\"") && s.length > 1) s.substring(1, s.length - 1)
           else s
         }
         case _ => null
@@ -141,7 +141,7 @@ class ApiInvoker(val mapper: ObjectMapper = ScalaJsonUtil.getJsonMapper,
       }
       case _ => null
     }
-    response.getClientResponseStatus().getStatusCode() match {
+    response.getStatusInfo().getStatusCode() match {
       case 204 => ""
       case code: Int if (Range(200, 299).contains(code)) => {
         response.hasEntity() match {
@@ -155,7 +155,7 @@ class ApiInvoker(val mapper: ObjectMapper = ScalaJsonUtil.getJsonMapper,
           case false => "no data"
         }
         throw new ApiException(
-          response.getClientResponseStatus().getStatusCode(),
+          response.getStatusInfo().getStatusCode(),
           entity)
       }
     }
@@ -172,7 +172,7 @@ class ApiInvoker(val mapper: ObjectMapper = ScalaJsonUtil.getJsonMapper,
       }
     }
   }
-  
+
   def newClient(host: String): Client = asyncHttpClient match {
     case true => {
       import org.sonatype.spice.jersey.client.ahc.config.DefaultAhcConfig
@@ -200,4 +200,3 @@ object ApiInvoker extends ApiInvoker(mapper = ScalaJsonUtil.getJsonMapper,
   authPreemptive = {{authPreemptive}})
 
 class ApiException(val code: Int, msg: String) extends RuntimeException(msg)
-
diff --git a/modules/swagger-codegen/src/main/resources/scala/pom.mustache b/modules/swagger-codegen/src/main/resources/scala/pom.mustache
index 2d8a1257eb4..5fc849ea87d 100644
--- a/modules/swagger-codegen/src/main/resources/scala/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/scala/pom.mustache
@@ -72,6 +72,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.9.1</version>
         <executions>
           <execution>
             <id>add_sources</id>
@@ -208,14 +209,16 @@
     <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</swagger-core-version>
+    <jersey-version>1.19</jersey-version>
+    <swagger-core-version>1.5.3</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>
+    <scala-test-version>2.2.4</scala-test-version>
+
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>
diff --git a/modules/swagger-codegen/src/main/resources/silex/.htaccess b/modules/swagger-codegen/src/main/resources/silex/.htaccess
new file mode 100644
index 00000000000..e47b5fb8a0c
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/silex/.htaccess
@@ -0,0 +1,5 @@
+<IfModule mod_rewrite.c>
+    RewriteEngine On
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteRule ^(.*)$ index.php?_url=/$1 [QSA,L]
+</IfModule>
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/silex/README.mustache b/modules/swagger-codegen/src/main/resources/silex/README.mustache
new file mode 100644
index 00000000000..9f35636b3f8
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/silex/README.mustache
@@ -0,0 +1,10 @@
+# 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/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:
+
+[TEMPLATES](https://github.com/swagger-api/swagger-codegen/tree/master/modules/swagger-codegen/src/main/resources/silex/)
diff --git a/modules/swagger-codegen/src/main/resources/silex/composer.json b/modules/swagger-codegen/src/main/resources/silex/composer.json
new file mode 100644
index 00000000000..466cd3fbc77
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/silex/composer.json
@@ -0,0 +1,5 @@
+{
+  "require": {
+    "silex/silex": "~1.2"
+  }
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/silex/index.mustache b/modules/swagger-codegen/src/main/resources/silex/index.mustache
new file mode 100644
index 00000000000..9fbfca6049e
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/silex/index.mustache
@@ -0,0 +1,26 @@
+<?php
+require_once __DIR__ . '/vendor/autoload.php';
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Silex\Application;
+
+$app = new Silex\Application();
+
+{{#apiInfo}}
+    {{#apis}}
+        {{#operations}}
+            {{#operation}}
+
+$app->{{httpMethod}}('{{path}}', function(Application $app, Request $request{{#pathParams}}, ${{paramName}}{{/pathParams}}) {
+            {{#queryParams}}${{paramName}} = $request->get('{{paramName}}');{{newline}}    {{/queryParams}}
+            {{#formParams}}${{paramName}} = $request->get('{{paramName}}');{{newline}}    {{/formParams}}
+            return new Response('How about implementing {{nickname}} as a {{httpMethod}} method ?');
+            });
+
+            {{/operation}}
+        {{/operations}}
+    {{/apis}}
+{{/apiInfo}}
+
+$app->run();
diff --git a/modules/swagger-codegen/src/main/resources/sinatra/Gemfile b/modules/swagger-codegen/src/main/resources/sinatra/Gemfile
new file mode 100644
index 00000000000..be9c3168ea6
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/sinatra/Gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem "sinatra"
+gem "sinatra-cross_origin"
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/sinatra/README.md b/modules/swagger-codegen/src/main/resources/sinatra/README.md
new file mode 100644
index 00000000000..c5b8cfffe77
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/sinatra/README.md
@@ -0,0 +1,29 @@
+# Swagger for Sinatra
+
+## Overview
+This is a project to provide Swagger support inside the [Sinatra](http://www.sinatrarb.com/) framework.  You can find
+out more about both the spec and the framework at http://swagger.io.  For more information about 
+Wordnik's APIs, please visit http://developer.wordnik.com.
+
+## Prerequisites
+You need to install ruby 1.9.3 and the following gems:
+
+```
+sinatra
+sinatra-cross_origin
+```
+
+## Getting started
+This sample was generated with the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project.
+
+```
+rackup -p 4567 config.ru
+```
+
+In your [swagger ui](https://github.com/swagger-api/swagger-ui), put in the following URL:
+
+```
+http://localhost:4567/resources.json
+```
+
+Voila!
diff --git a/modules/swagger-codegen/src/main/resources/sinatra/Swaggering.rb b/modules/swagger-codegen/src/main/resources/sinatra/Swaggering.rb
new file mode 100644
index 00000000000..79aca1da2c9
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/sinatra/Swaggering.rb
@@ -0,0 +1,154 @@
+require 'json'
+require 'sinatra/base'
+require 'sinatra/cross_origin'
+
+class Configuration
+  attr_accessor :base_path, :api_version, :swagger_version, :format_specifier
+
+  def initialize
+    @api_version = '1.0'
+    @base_path = 'http://localhost:4567'
+    @swagger_version = '1.1'
+    @format_specifier = ".json"
+  end
+end
+
+class Swaggering < Sinatra::Base
+  register Sinatra::CrossOrigin
+
+  @@routes = {}
+  @@configuration = Configuration.new
+
+  attr_accessor :configuration
+
+  def self.configure
+    get("/resources" + @@configuration.format_specifier) {
+      cross_origin
+      Swaggering.to_resource_listing
+    }
+    @@configuration ||= Configuration.new
+    yield(@@configuration) if block_given?
+  end
+  
+  def self.add_route(method, path, swag={}, opts={}, &block)
+    fullPath = swag["resourcePath"].to_s + @@configuration.format_specifier + path
+    
+    accepted = case method
+      when 'get'
+        get(fullPath, opts, &block)
+        true
+      when 'post'
+        post(fullPath, opts, &block)
+        true
+      when 'delete'
+        delete(fullPath, opts, &block)
+        true
+      when 'put' 
+        put(fullPath, opts, &block)
+        true
+      else
+        false
+    end
+
+    if accepted then
+      resourcePath = swag["resourcePath"].to_s
+      ops = @@routes[resourcePath]
+      if ops.nil?
+        ops = Array.new
+        @@routes.merge!(resourcePath => ops)
+
+        get(resourcePath + @@configuration.format_specifier) do
+          cross_origin
+          Swaggering.to_api(resourcePath)
+        end
+      end
+
+      swag.merge!("httpMethod" => method.to_s.upcase)
+      ops.push(swag)
+    end
+  end
+  
+  def self.to_resource_listing
+    apis = Array.new
+    (@@routes.keys).each do |key|
+      api = {
+        "path" => (key + ".{format}"),
+        "description" => "no description"
+      }
+      apis.push api
+    end
+  
+    resource = {
+      "apiVersion" => @@configuration.api_version,
+      "swaggerVersion" => @@configuration.swagger_version,
+      "apis" => apis
+    }
+
+    resource.to_json
+  end
+  
+  def self.to_api(resourcePath)
+    apis = {}
+    models = []
+
+    @@routes[resourcePath].each do |route|
+      endpoint = route["endpoint"].gsub(/:(\w+)(\/?)/,'{\1}\2')
+      path = (resourcePath + ".{format}" + endpoint)
+      api = apis[path]
+      if api.nil?
+        api = {"path" => path, "description" => "description", "operations" => []}
+        apis.merge!(path => api)
+      end
+      
+      parameters = route["parameters"]
+
+      unless parameters.nil? then
+        parameters.each do |param|
+          av_string = param["allowableValues"]
+          unless av_string.nil?
+            if av_string.count('[') > 0
+              pattern = /^([A-Z]*)\[(.*)\]/
+              match = pattern.match av_string
+              case match.to_a[1]
+                when "LIST"
+                  allowables = match.to_a[2].split(',')
+                  param["allowableValues"] = {
+                    "valueType" => "LIST",
+                    "values" => allowables
+                  }
+                when "RANGE"
+                  allowables = match.to_a[2].split(',')
+                  param["allowableValues"] = {
+                    "valueType" => "RANGE",
+                    "min" => allowables[0],
+                    "max" => allowables[1]
+                  }
+              end                
+            end
+          end
+        end
+      end
+      
+      op = {
+        "httpMethod" => route["httpMethod"],
+        "description" => route["summary"],
+        "responseClass" => route["responseClass"],
+        "notes" => route["notes"],
+        "nickname" => route["nickname"],
+        "summary" => route["summary"],
+        "parameters" => route["parameters"]
+      }
+      api["operations"].push(op)
+    end
+
+    api_listing = {
+      "apiVersion" => @@configuration.api_version,
+      "swaggerVersion" => @@configuration.swagger_version,
+      "basePath" => @@configuration.base_path,
+      "resourcePath" => resourcePath,
+      "apis" => apis.values,
+      "models" => models
+    }
+    api_listing.to_json
+  end
+end
diff --git a/modules/swagger-codegen/src/main/resources/sinatra/api.mustache b/modules/swagger-codegen/src/main/resources/sinatra/api.mustache
new file mode 100644
index 00000000000..7dffb94cdf0
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/sinatra/api.mustache
@@ -0,0 +1,57 @@
+require 'json'
+
+{{#operations}}
+{{#operation}}
+
+MyApp.add_route('{{httpMethod}}', '{{path}}', {
+  "resourcePath" => "/{{baseName}}",
+  "summary" => "{{{summary}}}",
+  "nickname" => "{{nickname}}", 
+  "responseClass" => "{{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}void{{/returnType}}", 
+  "endpoint" => "{{path}}", 
+  "notes" => "{{{notes}}}",
+  "parameters" => [
+    {{#queryParams}}
+    {
+      "name" => "{{paramName}}",
+      "description" => "{{description}}",
+      "dataType" => "{{dataType}}",
+      "paramType" => "query",
+      {{#collectionFormat}}"collectionFormat" => "{{collectionFormat}}",{{/collectionFormat}}
+      "allowableValues" => "{{allowableValues}}",
+      {{#defaultValue}}"defaultValue" => "{{{defaultValue}}}"{{/defaultValue}}
+    },
+    {{/queryParams}}
+    {{#pathParams}}
+    {
+      "name" => "{{paramName}}",
+      "description" => "{{description}}",
+      "dataType" => "{{dataType}}",
+      "paramType" => "path",
+    },
+    {{/pathParams}}
+    {{#headerParams}}
+    {
+      "name" => "{{paramName}}",
+      "description" => "{{description}}",
+      "dataType" => "{{dataType}}",
+      "paramType" => "header",
+    },
+    {{/headerParams}}
+    {{#bodyParams}}
+    {
+      "name" => "body",
+      "description" => "{{description}}",
+      "dataType" => "{{dataType}}",
+      "paramType" => "body",
+    }
+    {{/bodyParams}}
+    ]}) do
+  cross_origin
+  # the guts live here
+
+  {"message" => "yes, it worked"}.to_json
+end
+
+{{/operation}}
+{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/sinatra/config.ru b/modules/swagger-codegen/src/main/resources/sinatra/config.ru
new file mode 100644
index 00000000000..395d0587123
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/sinatra/config.ru
@@ -0,0 +1,2 @@
+require './my_app'
+run MyApp
diff --git a/modules/swagger-codegen/src/main/resources/sinatra/my_app.mustache b/modules/swagger-codegen/src/main/resources/sinatra/my_app.mustache
new file mode 100644
index 00000000000..8c4a16d7ff5
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/sinatra/my_app.mustache
@@ -0,0 +1,12 @@
+require './lib/swaggering'
+
+# only need to extend if you want special configuration!
+class MyApp < Swaggering
+  self.configure do |config|
+    config.api_version = '{{version}}' 
+  end
+end
+
+{{#apis}}
+require './lib/{{className}}.rb'
+{{/apis}}
diff --git a/modules/swagger-codegen/src/main/resources/swift/APIs.mustache b/modules/swagger-codegen/src/main/resources/swift/APIs.mustache
index aa39ccfcbdd..25d063fd543 100644
--- a/modules/swagger-codegen/src/main/resources/swift/APIs.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift/APIs.mustache
@@ -5,17 +5,16 @@
 //
 
 import Foundation
-import PromiseKit
 
-class {{projectName}}API {
-    static let basePath = "{{^basePathOverride}}{{basePath}}{{/basePathOverride}}{{basePathOverride}}"
+public class {{projectName}}API {
+    static let basePath = "{{basePath}}"
     static var credential: NSURLCredential?
     static var requestBuilderFactory: RequestBuilderFactory = AlamofireRequestBuilderFactory()
 }
 
-class APIBase {
+public class APIBase {
     func toParameters(encodable: JSONEncodable?) -> [String: AnyObject]? {
-        let encoded: AnyObject? = encodable?.encode()
+        let encoded: AnyObject? = encodable?.encodeToJSON()
 
         if encoded! is [AnyObject] {
             var dictionary = [String:AnyObject]()
@@ -29,7 +28,7 @@ class APIBase {
     }
 }
 
-class RequestBuilder<T> {
+public class RequestBuilder<T> {
     var credential: NSURLCredential?
     var headers: [String:String] = [:]
     let parameters: [String:AnyObject]?
@@ -37,23 +36,23 @@ class RequestBuilder<T> {
     let method: String
     let URLString: String
     
-    required init(method: String, URLString: String, parameters: [String:AnyObject]?, isBody: Bool) {
+    required public init(method: String, URLString: String, parameters: [String:AnyObject]?, isBody: Bool) {
         self.method = method
         self.URLString = URLString
         self.parameters = parameters
         self.isBody = isBody
     }
     
-    func execute() -> Promise<Response<T>>  { fatalError("Not implemented") }
+    public func execute(completion: (response: Response<T>?, erorr: NSError?) -> Void) { }
 
-    func addHeader(#name: String, value: String) -> Self {
+    public func addHeader(#name: String, value: String) -> Self {
         if !value.isEmpty {
             headers[name] = value
         }
         return self
     }
     
-    func addCredential() -> Self {
+    public func addCredential() -> Self {
         self.credential = {{projectName}}API.credential
         return self
     }
@@ -63,4 +62,3 @@ protocol RequestBuilderFactory {
     func getBuilder<T>() -> RequestBuilder<T>.Type
 }
 
-
diff --git a/modules/swagger-codegen/src/main/resources/swift/AlamofireImplementations.mustache b/modules/swagger-codegen/src/main/resources/swift/AlamofireImplementations.mustache
index 244d816332c..c1718cb6780 100644
--- a/modules/swagger-codegen/src/main/resources/swift/AlamofireImplementations.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift/AlamofireImplementations.mustache
@@ -5,7 +5,6 @@
 //
 
 import Alamofire
-import PromiseKit
 
 class AlamofireRequestBuilderFactory: RequestBuilderFactory {
     func getBuilder<T>() -> RequestBuilder<T>.Type {
@@ -21,7 +20,7 @@ class AlamofireRequestBuilder<T>: RequestBuilder<T> {
         super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody)
     }
 
-    override func execute() -> Promise<Response<T>> {
+    override func execute(completion: (response: Response<T>?, erorr: NSError?) -> Void) {
         let managerId = NSUUID().UUIDString
         // Create a new manager for each request to customize its request header
         let configuration = NSURLSessionConfiguration.defaultSessionConfiguration()
@@ -30,41 +29,86 @@ class AlamofireRequestBuilder<T>: RequestBuilder<T> {
         managerStore[managerId] = manager
 
         let encoding = isBody ? Alamofire.ParameterEncoding.JSON : Alamofire.ParameterEncoding.URL
-        let request = manager.request(Alamofire.Method(rawValue: method)!, URLString, parameters: parameters, encoding: encoding)
+        let xMethod = Alamofire.Method(rawValue: method)
+        let fileKeys = parameters == nil ? [] : map(filter(parameters!) { $1.isKindOfClass(NSURL) }) { $0.0 }
+
+        if fileKeys.count > 0 {
+            manager.upload(
+                xMethod!, URLString, headers: nil,
+                multipartFormData: { mpForm in
+                    for (k, v) in self.parameters! {
+                        switch v {
+                        case let fileURL as NSURL:
+                            mpForm.appendBodyPart(fileURL: fileURL, name: k)
+                            break
+                        case let string as NSString:
+                            mpForm.appendBodyPart(data: string.dataUsingEncoding(NSUTF8StringEncoding)!, name: k)
+                            break
+                        case let number as NSNumber:
+                            mpForm.appendBodyPart(data: number.stringValue.dataUsingEncoding(NSUTF8StringEncoding)!, name: k)
+                            break
+                        default:
+                            fatalError("Unprocessable value \(v) with key \(k)")
+                            break
+                        }
+                    }
+                },
+                encodingMemoryThreshold: Manager.MultipartFormDataEncodingMemoryThreshold,
+                encodingCompletion: { encodingResult in
+                    switch encodingResult {
+                    case .Success(let upload, _, _):
+                        self.processRequest(upload, managerId, completion)
+                    case .Failure(let encodingError):
+                        completion(response: nil, erorr: encodingError)
+                    }
+                }
+            )
+        } else {
+            processRequest(manager.request(xMethod!, URLString, parameters: parameters, encoding: encoding), managerId, completion)
+        }
+
+    }
+
+    private func processRequest(request: Request, _ managerId: String, _ completion: (response: Response<T>?, erorr: NSError?) -> Void) {
         if let credential = self.credential {
             request.authenticate(usingCredential: credential)
         }
 
-        let defer = Promise<Response<T>>.defer()
         request.responseJSON(options: .AllowFragments) { (req, res, json, error) in
             managerStore.removeValueForKey(managerId)
 
             if let error = error {
-                defer.reject(error)
+                completion(response: nil, erorr: error)
                 return
             }
             if res!.statusCode >= 400 {
                 //TODO: Add error entity
-                let error = NSError(domain: res!.URL!.URLString, code: res!.statusCode, userInfo: [:])
-                defer.reject(error)
+                let userInfo: [NSObject : AnyObject] = (json != nil) ? ["data": json!] : [:]
+                let error = NSError(domain: res!.URL!.URLString, code: res!.statusCode, userInfo: userInfo)
+                completion(response: nil, erorr: error)
                 return
             }
 
             if () is T {
                 let response = Response(response: res!, body: () as! T)
-                defer.fulfill(response)
+                completion(response: response, erorr: nil)
                 return
             }
             if let json: AnyObject = json {
                 let body = Decoders.decode(clazz: T.self, source: json)
                 let response = Response(response: res!, body: body)
-                defer.fulfill(response)
+                completion(response: response, erorr: nil)
+                return
+            } else if "" is T {
+                // swagger-parser currently doesn't support void, which will be fixed in future swagger-parser release
+                // https://github.com/swagger-api/swagger-parser/pull/34
+                let response = Response(response: res!, body: "" as! T)
+                completion(response: response, erorr: nil)
                 return
             }
-            
-            defer.reject(NSError(domain: "localhost", code: 500, userInfo: ["reason": "unreacheable code"]))
+
+            completion(response: nil, erorr: NSError(domain: "localhost", code: 500, userInfo: ["reason": "unreacheable code"]))
         }
-        return defer.promise
     }
 
     private func buildHeaders() -> [String: AnyObject] {
@@ -76,4 +120,3 @@ class AlamofireRequestBuilder<T>: RequestBuilder<T> {
     }
 }
 
-
diff --git a/modules/swagger-codegen/src/main/resources/swift/Cartfile.mustache b/modules/swagger-codegen/src/main/resources/swift/Cartfile.mustache
index af74617bcf2..f7838edf7ca 100644
--- a/modules/swagger-codegen/src/main/resources/swift/Cartfile.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift/Cartfile.mustache
@@ -1,2 +1,2 @@
-github "Alamofire/Alamofire" >= 1.2
+github "Alamofire/Alamofire" >= 1.3
 github "mxcl/PromiseKit" >=1.5.3
diff --git a/modules/swagger-codegen/src/main/resources/swift/Extensions.mustache b/modules/swagger-codegen/src/main/resources/swift/Extensions.mustache
index c937db23fe3..0d367cb8be3 100644
--- a/modules/swagger-codegen/src/main/resources/swift/Extensions.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift/Extensions.mustache
@@ -4,45 +4,45 @@
 // https://github.com/swagger-api/swagger-codegen
 //
 
-import Alamofire
-import PromiseKit
+import Alamofire{{#usePromiseKit}}
+import PromiseKit{{/usePromiseKit}}
 
 extension Bool: JSONEncodable {
-    func encode() -> AnyObject { return self }
+    func encodeToJSON() -> AnyObject { return self }
 }
 
 extension Float: JSONEncodable {
-    func encode() -> AnyObject { return self }
+    func encodeToJSON() -> AnyObject { return self }
 }
 
 extension Int: JSONEncodable {
-    func encode() -> AnyObject { return self }
+    func encodeToJSON() -> AnyObject { return self }
 }
 
 extension Double: JSONEncodable {
-    func encode() -> AnyObject { return self }
+    func encodeToJSON() -> AnyObject { return self }
 }
 
 extension String: JSONEncodable {
-    func encode() -> AnyObject { return self }
+    func encodeToJSON() -> AnyObject { return self }
 }
 
 private func encodeIfPossible<T>(object: T) -> AnyObject {
     if object is JSONEncodable {
-        return (object as! JSONEncodable).encode()
+        return (object as! JSONEncodable).encodeToJSON()
     } else {
         return object as! AnyObject
     }
 }
 
 extension Array: JSONEncodable {
-    func encode() -> AnyObject {
+    func encodeToJSON() -> AnyObject {
         return self.map(encodeIfPossible)
     }
 }
 
 extension Dictionary: JSONEncodable {
-    func encode() -> AnyObject {
+    func encodeToJSON() -> AnyObject {
         var dictionary = [NSObject:AnyObject]()
         for (key, value) in self {
             dictionary[key as! NSObject] = encodeIfPossible(value)
@@ -50,3 +50,30 @@ extension Dictionary: JSONEncodable {
         return dictionary
     }
 }
+
+
+private let dateFormatter: NSDateFormatter = {
+    let dateFormatter = NSDateFormatter()
+    dateFormatter.dateFormat = "yyyy-MM-dd"
+    return dateFormatter
+}()
+
+extension NSDate: JSONEncodable {
+    func encodeToJSON() -> AnyObject {
+        return dateFormatter.stringFromDate(self)
+    }
+}
+
+{{#usePromiseKit}}extension RequestBuilder {
+    public func execute() -> Promise<Response<T>>  {
+        let deferred = Promise<Response<T>>.defer()
+        self.execute { (response: Response<T>?, error: NSError?) in
+            if let response = response {
+                deferred.fulfill(response)
+            } else {
+                deferred.reject(error!)
+            }
+        }
+        return deferred.promise
+    }
+}{{/usePromiseKit}}
diff --git a/modules/swagger-codegen/src/main/resources/swift/Models.mustache b/modules/swagger-codegen/src/main/resources/swift/Models.mustache
index 37c497ddcb9..5cc3f3eb774 100644
--- a/modules/swagger-codegen/src/main/resources/swift/Models.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift/Models.mustache
@@ -7,21 +7,21 @@
 import Foundation
 
 protocol JSONEncodable {
-    func encode() -> AnyObject
+    func encodeToJSON() -> AnyObject
 }
 
-class Response<T> {
-    let statusCode: Int
-    let header: [String: String]
-    let body: T
+public class Response<T> {
+    public let statusCode: Int
+    public let header: [String: String]
+    public let body: T
 
-    init(statusCode: Int, header: [String: String], body: T) {
+    public init(statusCode: Int, header: [String: String], body: T) {
         self.statusCode = statusCode
         self.header = header
         self.body = body
     }
 
-    convenience init(response: NSHTTPURLResponse, body: T) {
+    public convenience init(response: NSHTTPURLResponse, body: T) {
         let rawHeader = response.allHeaderFields
         var header = [String:String]()
         for (key, value) in rawHeader {
@@ -97,25 +97,32 @@ class Decoders {
 	
     static private func initialize() {
         dispatch_once(&once) {
-            let dateTimeFormatter = NSDateFormatter()
-            dateTimeFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'"
-            let dateFormatter = NSDateFormatter()
-            dateFormatter.dateFormat = "yyyy-MM-dd"
+            let formatters = [
+                "yyyy-MM-dd",
+                "yyyy-MM-dd'T'HH:mm:ssZZZZZ",
+                "yyyy-MM-dd'T'HH:mm:ss'Z'"
+            ].map { (format: String) -> NSDateFormatter in
+                let formatter = NSDateFormatter()
+                formatter.dateFormat = format
+                return formatter
+            }
             // Decoder for NSDate
             Decoders.addDecoder(clazz: NSDate.self) { (source: AnyObject) -> NSDate in
                 let sourceString = source as! String
-                if count(sourceString) == 10 {
-                    return dateFormatter.dateFromString(sourceString)!
+                for formatter in formatters {
+                    if let date = formatter.dateFromString(sourceString) {
+                        return date
+                    }
                 }
-                return dateTimeFormatter.dateFromString(sourceString)!
+                fatalError("formatter failed to parse \(sourceString)")
             } {{#models}}{{#model}}
 
 			// Decoder for {{{classname}}}
             Decoders.addDecoder(clazz: {{{classname}}}.self) { (source: AnyObject) -> {{{classname}}} in
                 let sourceDictionary = source as! [NSObject:AnyObject]
                 var instance = {{classname}}(){{#vars}}{{#isEnum}}
-                instance.{{name}} = (sourceDictionary["{{name}}"] as? String).map { {{classname}}.{{datatypeWithEnum}}(rawValue: $0)! }{{#required}}!{{/required}} {{/isEnum}}{{^isEnum}}
-                instance.{{name}} = Decoders.decode{{^required}}Optional{{/required}}(clazz: {{{baseType}}}.self, source: sourceDictionary["{{name}}"]{{#required}}!{{/required}}){{/isEnum}}{{/vars}}
+                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}}
                 return instance
             }{{/model}}
 			{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/swift/Podspec.mustache b/modules/swagger-codegen/src/main/resources/swift/Podspec.mustache
new file mode 100644
index 00000000000..7b1ed59de8b
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/swift/Podspec.mustache
@@ -0,0 +1,20 @@
+Pod::Spec.new do |s|
+  s.name = '{{projectName}}'{{#projectDescription}}
+  s.summary = '{{projectDescription}}'{{/projectDescription}}
+  s.ios.deployment_target = '8.0'
+  s.osx.deployment_target = '10.9'
+  s.version = '{{#podVersion}}{{podVersion}}{{/podVersion}}{{^podVersion}}0.0.1{{/podVersion}}'
+  s.source = {{#podSource}}{{& podSource}}{{/podSource}}{{^podSource}}{ :git => 'git@github.com:swagger-api/swagger-mustache.git', :tag => 'v1.0.0' }{{/podSource}}{{#podAuthors}}
+  s.authors = {{& podAuthors}}{{/podAuthors}}{{#podSocialMediaURL}}
+  s.social_media_url = '{{podSocialMediaURL}}'{{/podSocialMediaURL}}{{#podDocsetURL}}
+  s.docset_url = '{{podDocsetURL}}'{{/podDocsetURL}}
+  s.license = {{#podLicense}}{{& podLicense}}{{/podLicense}}{{^podLicense}}'Apache License, Version 2.0'{{/podLicense}}{{#podHomepage}}
+  s.homepage = '{{podHomepage}}'{{/podHomepage}}{{#podSummary}}
+  s.summary = '{{podSummary}}'{{/podSummary}}{{#podDescription}}
+  s.description = '{{podDescription}}'{{/podDescription}}{{#podScreenshots}}
+  s.screenshots = {{& podScreenshots}}{{/podScreenshots}}{{#podDocumentationURL}}
+  s.documentation_url = '{{podDocumentationURL}}'{{/podDocumentationURL}}
+  s.source_files = '{{projectName}}/Classes/Swaggers/**/*.swift'
+  s.dependency 'PromiseKit', '~> 2.1'
+  s.dependency 'Alamofire', '~> 1.3'
+end
diff --git a/modules/swagger-codegen/src/main/resources/swift/api.mustache b/modules/swagger-codegen/src/main/resources/swift/api.mustache
index e24bdae6773..7595a1fa81d 100644
--- a/modules/swagger-codegen/src/main/resources/swift/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift/api.mustache
@@ -11,7 +11,7 @@ import PromiseKit
 extension {{projectName}}API {
     {{#description}}
     /** {{description}} */{{/description}}
-    class {{classname}}: APIBase {
+    public class {{classname}}: APIBase {
     {{#operation}}
         /**
          {{#summary}}
@@ -21,7 +21,9 @@ extension {{projectName}}API {
          - {{{notes}}}{{/notes}}{{#subresourceOperation}}
          - subresourceOperation: {{subresourceOperation}}{{/subresourceOperation}}{{#defaultResponse}}
          - defaultResponse: {{defaultResponse}}{{/defaultResponse}}{{#authMethods}}
-         - authMethods: {{authMethods}}{{/authMethods}}{{#responseHeaders}}
+         - {{#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}}
@@ -30,20 +32,22 @@ extension {{projectName}}API {
 
          :returns: Promise<Response<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}>> {{description}}
          */
-        func {{operationId}}({{#allParams}}{{^secondaryParam}}#{{/secondaryParam}}{{paramName}}: {{{dataType}}}{{^required}}?{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> RequestBuilder<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {
+        public class func {{operationId}}({{#allParams}}{{^secondaryParam}}#{{/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 url = {{projectName}}API.basePath + path
+            let URLString = {{projectName}}API.basePath + path
             {{#bodyParam}}
-            let parameters = {{paramName}}{{^required}}?{{/required}}.encode() as? [String:AnyObject]{{/bodyParam}}{{^bodyParam}}
-            let nillableParameters: [String:AnyObject?] = {{^queryParams}}[:]{{/queryParams}}{{#queryParams}}{{^secondaryParam}}[{{/secondaryParam}}
+            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(method: "{{httpMethod}}", URLString: url, parameters: parameters, isBody: {{^queryParams}}true{{/queryParams}}{{#queryParams}}{{^secondaryParam}}false{{/secondaryParam}}{{/queryParams}})
+            return requestBuilder(method: "{{httpMethod}}", URLString: URLString, parameters: parameters, isBody: {{^queryParams}}{{^formParams}}true{{/formParams}}{{/queryParams}}{{#queryParams}}{{^secondaryParam}}false{{/secondaryParam}}{{/queryParams}}{{#formParams}}{{^secondaryParam}}false{{/secondaryParam}}{{/formParams}})
         }
     {{/operation}}
     }
diff --git a/modules/swagger-codegen/src/main/resources/swift/model.mustache b/modules/swagger-codegen/src/main/resources/swift/model.mustache
index a964882c97c..a2510a26dd0 100644
--- a/modules/swagger-codegen/src/main/resources/swift/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift/model.mustache
@@ -10,24 +10,24 @@ import Foundation
 {{#description}}
 
 /** {{description}} */{{/description}}
-class {{classname}}: JSONEncodable {
+public class {{classname}}: JSONEncodable {
 {{#vars}}{{#isEnum}}
-    enum {{datatypeWithEnum}}: String { {{#allowableValues}}{{#values}}
+    public enum {{datatypeWithEnum}}: String { {{#allowableValues}}{{#values}}
         case {{enum}} = "{{raw}}"{{/values}}{{/allowableValues}}
     }
     {{/isEnum}}{{/vars}}
     {{#vars}}{{#isEnum}}{{#description}}/** {{description}} */
-    {{/description}}var {{name}}: {{{datatypeWithEnum}}}{{^required}}?{{/required}}{{#required}}!{{/required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{/isEnum}}{{^isEnum}}{{#description}}/** {{description}} */
-    {{/description}}var {{name}}: {{{datatype}}}{{^required}}?{{/required}}{{#required}}!{{/required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{/isEnum}}
+    {{/description}}public var {{name}}: {{{datatypeWithEnum}}}{{^unwrapRequired}}?{{/unwrapRequired}}{{#unwrapRequired}}{{^required}}?{{/required}}{{#required}}!{{/required}}{{/unwrapRequired}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{/isEnum}}{{^isEnum}}{{#description}}/** {{description}} */
+    {{/description}}public var {{name}}: {{{datatype}}}{{^unwrapRequired}}?{{/unwrapRequired}}{{#unwrapRequired}}{{^required}}?{{/required}}{{#required}}!{{/required}}{{/unwrapRequired}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{/isEnum}}
     {{/vars}}
 
     // MARK: JSONEncodable
-    func encode() -> AnyObject {
+    func encodeToJSON() -> AnyObject {
         var nillableDictionary = [String:AnyObject?](){{#vars}}{{#isNotContainer}}{{#isPrimitiveType}}{{^isEnum}}
         nillableDictionary["{{name}}"] = self.{{name}}{{/isEnum}}{{/isPrimitiveType}}{{#isEnum}}
-        nillableDictionary["{{name}}"] = self.{{name}}{{^required}}?{{/required}}.rawValue{{/isEnum}}{{^isPrimitiveType}}
-        nillableDictionary["{{name}}"] = self.{{name}}{{^required}}?{{/required}}.encode(){{/isPrimitiveType}}{{/isNotContainer}}{{#isContainer}}
-        nillableDictionary["{{name}}"] = self.{{name}}{{^required}}?{{/required}}.encode(){{/isContainer}}{{/vars}}
+        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}}
         let dictionary: [String:AnyObject] = APIHelper.rejectNil(nillableDictionary) ?? [:]
         return dictionary
     }
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
new file mode 100644
index 00000000000..b91e506a4f9
--- /dev/null
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/CodegenConfigLoaderTest.java
@@ -0,0 +1,57 @@
+package io.swagger.codegen;
+
+import org.reflections.Reflections;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import static org.testng.Assert.assertEquals;
+
+public class CodegenConfigLoaderTest {
+
+    @DataProvider(name = "codegenConfig")
+    public Object[][] createCodegenConfigDataSet() throws Exception {
+
+        Reflections reflections = new Reflections("io.swagger.codegen.languages");
+        final Set<Class<? extends DefaultCodegen>> subTypesOf = reflections.getSubTypesOf(DefaultCodegen.class);
+
+        List<CodegenConfig> codegenConfigList = new ArrayList<CodegenConfig>();
+
+        for (Class<? extends DefaultCodegen> aClass : subTypesOf) {
+            if (!Modifier.isAbstract(aClass.getModifiers())) {
+                final DefaultCodegen defaultCodegen = aClass.newInstance();
+                codegenConfigList.add((CodegenConfig) defaultCodegen);
+            }
+        }
+
+        Object[][] result = new Object[codegenConfigList.size()][1];
+
+        for (int i = 0; i < codegenConfigList.size(); i++) {
+            result[i]= new Object[]{codegenConfigList.get(i)};
+        }
+
+        return result;
+    }
+
+    @Test(dataProvider = "codegenConfig")
+    public void testLoadByName(CodegenConfig codegenConfig) throws Exception {
+        final CodegenConfig loadedConfig = CodegenConfigLoader.forName(codegenConfig.getName());
+
+        assertEquals(loadedConfig.getClass(), codegenConfig.getClass());
+        assertEquals(loadedConfig.getName(), codegenConfig.getName());
+    }
+
+    @Test(dataProvider = "codegenConfig")
+    public void testLoadByFullQualifiedName(CodegenConfig codegenConfig) throws Exception {
+        final CodegenConfig loadedConfig = CodegenConfigLoader.forName(codegenConfig.getClass().getName());
+
+        assertEquals(loadedConfig.getClass(), codegenConfig.getClass());
+        assertEquals(loadedConfig.getName(), codegenConfig.getName());
+
+
+    }
+}
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
new file mode 100644
index 00000000000..5da6a01763c
--- /dev/null
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/DefaultGeneratorTest.java
@@ -0,0 +1,92 @@
+package io.swagger.codegen;
+
+import io.swagger.codegen.languages.JavaClientCodegen;
+import io.swagger.models.Swagger;
+import io.swagger.parser.SwaggerParser;
+import org.apache.commons.io.FileUtils;
+import org.junit.rules.TemporaryFolder;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.Assert.fail;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+/**
+ * Tests for DefaultGenerator logic
+ */
+public class DefaultGeneratorTest {
+
+    private static final String TEST_SKIP_OVERWRITE = "testSkipOverwrite";
+    private static final String POM_FILE = "pom.xml";
+    private static final String MODEL_ORDER_FILE = "/src/main/java/io/swagger/client/model/Order.java";
+
+    public TemporaryFolder folder = new TemporaryFolder();
+
+    @BeforeMethod
+    public void setUp() throws Exception {
+        folder.create();
+    }
+
+    @AfterMethod
+    public void tearDown() throws Exception {
+        folder.delete();
+    }
+
+    @Test
+    public void testSkipOverwrite() throws Exception {
+        final File output = folder.getRoot();
+
+        final Swagger swagger = new SwaggerParser().read("src/test/resources/petstore.json");
+        CodegenConfig codegenConfig = new JavaClientCodegen();
+        codegenConfig.setOutputDir(output.getAbsolutePath());
+
+        ClientOptInput clientOptInput = new ClientOptInput().opts(new ClientOpts()).swagger(swagger).config(codegenConfig);
+
+        //generate content first time without skipOverwrite flag, so all generated files should be recorded
+        new DefaultGenerator().opts(clientOptInput).generate();
+        final File order = new File(output, MODEL_ORDER_FILE);
+        assertTrue(order.exists());
+
+        //change content of one file
+        changeContent(order);
+
+        //generate content second time without skipOverwrite flag, so changed file should be rewritten
+        new DefaultGenerator().opts(clientOptInput).generate();
+
+        assertTrue(!TEST_SKIP_OVERWRITE.equals(FileUtils.readFileToString(order, StandardCharsets.UTF_8)));
+
+        //change content again
+        changeContent(order);
+        //delete file
+        final File pom = new File(output, POM_FILE);
+        if (!pom.delete()) {
+            fail();
+        }
+
+        //generate content third time with skipOverwrite flag, so changed file should not be rewritten
+        //and deleted file should be recorded
+        codegenConfig.setSkipOverwrite(true);
+        new DefaultGenerator().opts(clientOptInput).generate();
+        assertEquals(FileUtils.readFileToString(order, StandardCharsets.UTF_8), TEST_SKIP_OVERWRITE);
+        assertTrue(pom.exists());
+    }
+
+    private void changeContent(File file) throws IOException {
+        Writer out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), UTF_8));
+        out.write(TEST_SKIP_OVERWRITE);
+        out.close();
+    }
+
+}
diff --git a/modules/swagger-codegen/src/test/resources/2_0/binaryDataTest.json b/modules/swagger-codegen/src/test/resources/2_0/binaryDataTest.json
new file mode 100644
index 00000000000..5ae05f9ae83
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/2_0/binaryDataTest.json
@@ -0,0 +1,51 @@
+{
+  "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",
+    "version": "1.0.0",
+    "title": "Swagger Petstore",
+    "termsOfService": "http://helloreverb.com/terms/",
+    "license": {
+      "name": "Apache 2.0",
+      "url": "http://www.apache.org/licenses/LICENSE-2.0.html"
+    }
+  },
+  "basePath": "/v2",
+  "schemes": [
+    "http"
+  ],
+  "paths": {
+    "/tests/binaryResponse": {
+      "post": {
+        "summary": "Echo test",
+        "operationId": "echotest",
+        "consumes": [
+          "application/octet-stream"
+        ],
+        "produces": [
+          "application/octet-stream"
+        ],
+        "parameters": [
+          {
+            "name": "InputBinaryData",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "binary"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OutputBinaryData",
+            "schema": {
+              "type": "string",
+              "format": "binary"
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/modules/swagger-codegen/src/test/resources/petstore.json b/modules/swagger-codegen/src/test/resources/petstore.json
new file mode 100644
index 00000000000..66762d74b2b
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/petstore.json
@@ -0,0 +1,977 @@
+{
+  "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",
+    "version": "1.0.0",
+    "title": "Swagger Petstore",
+    "termsOfService": "http://swagger.io/terms/",
+    "contact": {
+      "email": "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": {
+    "/pet": {
+      "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"
+            ]
+          }
+        ]
+      }
+    },
+    "/pet/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": [
+          {
+            "name": "status",
+            "in": "query",
+            "description": "Status values that need to be considered for filter",
+            "required": false,
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "collectionFormat": "multi",
+            "default": "available"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/Pet"
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid status value"
+          }
+        },
+        "security": [
+          {
+            "petstore_auth": [
+              "write:pets",
+              "read:pets"
+            ]
+          }
+        ]
+      }
+    },
+    "/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.",
+        "operationId": "findPetsByTags",
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "name": "tags",
+            "in": "query",
+            "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"
+            ]
+          }
+        ]
+      }
+    },
+    "/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",
+        "operationId": "getPetById",
+        "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": {
+              "$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": [
+          {
+            "name": "petId",
+            "in": "path",
+            "description": "ID of pet that needs to be updated",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "formData",
+            "description": "Updated name of the pet",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "status",
+            "in": "formData",
+            "description": "Updated status of the pet",
+            "required": false,
+            "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": [
+          {
+            "name": "api_key",
+            "in": "header",
+            "description": "",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "petId",
+            "in": "path",
+            "description": "Pet id to delete",
+            "required": true,
+            "type": "integer",
+            "format": "int64"
+          }
+        ],
+        "responses": {
+          "400": {
+            "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"
+        ],
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "schema": {
+              "type": "object",
+              "additionalProperties": {
+                "type": "integer",
+                "format": "int32"
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "api_key": []
+          }
+        ]
+      }
+    },
+    "/store/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"
+          }
+        }
+      }
+    },
+    "/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",
+        "operationId": "getOrderById",
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "name": "orderId",
+            "in": "path",
+            "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": [
+          {
+            "name": "orderId",
+            "in": "path",
+            "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"
+          }
+        }
+      }
+    },
+    "/user": {
+      "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"
+          }
+        }
+      }
+    },
+    "/user/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"
+          }
+        }
+      }
+    },
+    "/user/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"
+          }
+        }
+      }
+    },
+    "/user/login": {
+      "get": {
+        "tags": [
+          "user"
+        ],
+        "summary": "Logs user into the system",
+        "description": "",
+        "operationId": "loginUser",
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "name": "username",
+            "in": "query",
+            "description": "The user name for login",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "password",
+            "in": "query",
+            "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"
+          }
+        }
+      }
+    },
+    "/user/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"
+          }
+        }
+      }
+    },
+    "/user/{username}": {
+      "get": {
+        "tags": [
+          "user"
+        ],
+        "summary": "Get user by user name",
+        "description": "",
+        "operationId": "getUserByName",
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "name": "username",
+            "in": "path",
+            "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"
+            },
+            "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"
+          }
+        }
+      },
+      "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": [
+          {
+            "name": "username",
+            "in": "path",
+            "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": [
+          {
+            "name": "username",
+            "in": "path",
+            "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": {
+      "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"
+        }
+      },
+      "xml": {
+        "name": "User"
+      }
+    },
+    "Category": {
+      "properties": {
+        "id": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "name": {
+          "type": "string"
+        }
+      },
+      "xml": {
+        "name": "Category"
+      }
+    },
+    "Pet": {
+      "required": [
+        "name",
+        "photoUrls"
+      ],
+      "properties": {
+        "id": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "category": {
+          "$ref": "#/definitions/Category"
+        },
+        "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"
+          ]
+        }
+      },
+      "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"
+      }
+    }
+  }
+}
diff --git a/modules/swagger-codegen/src/test/scala/CodegenTest.scala b/modules/swagger-codegen/src/test/scala/CodegenTest.scala
index 0e76f5088df..015932948de 100644
--- a/modules/swagger-codegen/src/test/scala/CodegenTest.scala
+++ b/modules/swagger-codegen/src/test/scala/CodegenTest.scala
@@ -139,4 +139,19 @@ class CodegenTest extends FlatSpec with Matchers {
     val op = codegen.fromOperation(path, "get", p, model.getDefinitions())
     op.returnType should be("String")
   }
+
+  it should "return byte array when response format is byte" in {
+      val model = new SwaggerParser()
+        .read("src/test/resources/2_0/binaryDataTest.json")
+      System.err.println("model is " + model);
+      val codegen = new DefaultCodegen()
+
+      val path = "/tests/binaryResponse"
+      val p = model.getPaths().get(path).getPost()
+      val op = codegen.fromOperation(path, "post", p, model.getDefinitions())
+      op.returnType should be("byte[]")
+      op.bodyParam.dataType should be ("byte[]")
+      op.bodyParam.isBinary should equal (true);
+      op.responses.get(0).isBinary should equal(true);
+    }
 }
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/test/scala/Java/JavaModelEnumTest.scala b/modules/swagger-codegen/src/test/scala/Java/JavaModelEnumTest.scala
index e5191e1ae23..30a70ca6dfb 100644
--- a/modules/swagger-codegen/src/test/scala/Java/JavaModelEnumTest.scala
+++ b/modules/swagger-codegen/src/test/scala/Java/JavaModelEnumTest.scala
@@ -31,4 +31,55 @@ class JavaModelEnumTest extends FlatSpec with Matchers {
     enumVar.baseType should be("String")
     enumVar.isEnum should equal(true)
   }
+  
+  it should "not override identical parent enums" in {
+    
+    val identicalEnumProperty = new StringProperty()
+    identicalEnumProperty.setEnum(List("VALUE1", "VALUE2", "VALUE3").asJava)
+    
+    val subEnumProperty = new StringProperty()
+    subEnumProperty.setEnum(List("SUB1", "SUB2", "SUB3").asJava)
+    
+    // Add one enum ptoperty to the parent
+    val parentProperties = new java.util.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
+    val subProperties = new java.util.HashMap[String, Property]()
+    subProperties.put("sharedThing", identicalEnumProperty)
+    subProperties.put("unsharedThing", identicalEnumProperty)
+
+    val parentModel = new ModelImpl();
+    parentModel.setProperties(parentProperties);
+    parentModel.name("parentModel");
+        
+    val subModel = new ModelImpl();
+    subModel.setProperties(subProperties);
+    subModel.name("subModel");
+    
+    val model = new ComposedModel()
+      .parent(new RefModel(parentModel.getName()))
+      .child(subModel)
+      .interfaces(new java.util.ArrayList[RefModel]())
+      
+    val codegen = new JavaClientCodegen()
+    val allModels = new java.util.HashMap[String, Model]()
+    allModels.put(codegen.toModelName(parentModel.getName()), parentModel)
+    allModels.put(codegen.toModelName(subModel.getName()), subModel)
+    
+    val cm = codegen.fromModel("sample", model, allModels)
+
+    cm.name should be("sample")
+    cm.classname should be("Sample")
+    cm.parent should be("ParentModel")
+    cm.imports.asScala should be(Set("ParentModel"))
+    
+    // Assert that only the unshared/uninherited enum remains
+    cm.vars.size should be (1)
+    val enumVar = cm.vars.get(0)
+    enumVar.baseName should be("unsharedThing")
+    enumVar.datatype should be("String")
+    enumVar.datatypeWithEnum should be("UnsharedThingEnum")
+    enumVar.isEnum should equal(true)
+  }
 }
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/test/scala/Java/JavaModelTest.scala b/modules/swagger-codegen/src/test/scala/Java/JavaModelTest.scala
index fc819f1f195..1d044fbfdbe 100644
--- a/modules/swagger-codegen/src/test/scala/Java/JavaModelTest.scala
+++ b/modules/swagger-codegen/src/test/scala/Java/JavaModelTest.scala
@@ -2,7 +2,9 @@ package Java
 
 import io.swagger.codegen.languages.JavaClientCodegen
 import io.swagger.models._
+import io.swagger.models.parameters._
 import io.swagger.models.properties._
+import io.swagger.util.Json
 import org.junit.runner.RunWith
 import org.scalatest.{FlatSpec, Matchers}
 import org.scalatest.junit.JUnitRunner
@@ -85,7 +87,7 @@ class JavaModelTest extends FlatSpec with Matchers {
     vars.get(1).setter should be("setUrls")
     vars.get(1).datatype should be("List<String>")
     vars.get(1).name should be("urls")
-    vars.get(1).defaultValue should be("new ArrayList<String>() ")
+    vars.get(1).defaultValue should be("new ArrayList<String>()")
     vars.get(1).baseType should be("List")
     vars.get(1).containerType should be("array")
     vars.get(1).required should equal(null)
@@ -113,7 +115,7 @@ class JavaModelTest extends FlatSpec with Matchers {
     vars.get(0).setter should be("setTranslations")
     vars.get(0).datatype should be("Map<String, String>")
     vars.get(0).name should be("translations")
-    vars.get(0).defaultValue should be("new HashMap<String, String>() ")
+    vars.get(0).defaultValue should be("new HashMap<String, String>()")
     vars.get(0).baseType should be("Map")
     vars.get(0).containerType should be("map")
     vars.get(0).required should equal(null)
@@ -121,7 +123,7 @@ class JavaModelTest extends FlatSpec with Matchers {
   }
 
 
-  ignore should "convert a model with a map with complex list property" in {
+  it should "convert a model with a map with complex list property" in {
     val model = new ModelImpl()
       .description("a sample model")
       .property("translations", new MapProperty()
@@ -144,13 +146,33 @@ class JavaModelTest extends FlatSpec with Matchers {
     vars.get(0).setter should be("setTranslations")
     vars.get(0).datatype should be("Map<String, List<Pet>>")
     vars.get(0).name should be("translations")
-    vars.get(0).defaultValue should be("new HashMap<String, List<Pet>>() ")
+    vars.get(0).defaultValue should be("new HashMap<String, List<Pet>>()")
     vars.get(0).baseType should be("Map")
     vars.get(0).containerType should be("map")
     vars.get(0).required should equal(null)
     vars.get(0).isContainer should equal(true)
   }
 
+  it should "convert a model with a 2D list property" in {
+    val model = new ModelImpl().name("sample").property("list2D", new ArrayProperty().items(
+        new ArrayProperty().items(new RefProperty("Pet"))))
+    val codegen = new JavaClientCodegen()
+    val cm = codegen.fromModel("sample", model)
+    val vars = cm.vars
+    vars.size should be (1)
+    val list = vars.get(0)
+    list.baseName should be("list2D")
+    list.getter should be("getList2D")
+    list.setter should be("setList2D")
+    list.datatype should be("List<List<Pet>>")
+    list.name should be("list2D")
+    list.defaultValue should be ("new ArrayList<List<Pet>>()")
+    list.baseType should be("List")
+    list.containerType should be("array")
+    list.required should equal(null)
+    list.isContainer should equal(true)
+  }
+
   it should "convert a model with complex properties" in {
     val model = new ModelImpl()
       .description("a sample model")
@@ -197,7 +219,7 @@ class JavaModelTest extends FlatSpec with Matchers {
     vars.get(0).setter should be("setChildren")
     vars.get(0).datatype should be("List<Children>")
     vars.get(0).name should be("children")
-    vars.get(0).defaultValue should be("new ArrayList<Children>() ")
+    vars.get(0).defaultValue should be("new ArrayList<Children>()")
     vars.get(0).baseType should be("List")
     vars.get(0).containerType should be("array")
     vars.get(0).required should equal(null)
@@ -226,7 +248,7 @@ class JavaModelTest extends FlatSpec with Matchers {
     vars.get(0).setter should be("setChildren")
     vars.get(0).datatype should be("Map<String, Children>")
     vars.get(0).name should be("children")
-    vars.get(0).defaultValue should be("new HashMap<String, Children>() ")
+    vars.get(0).defaultValue should be("new HashMap<String, Children>()")
     vars.get(0).baseType should be("Map")
     vars.get(0).containerType should be("map")
     vars.get(0).required should equal(null)
@@ -333,6 +355,20 @@ class JavaModelTest extends FlatSpec with Matchers {
     vars.get(0).name should be("createdAt")
   }
 
+  it should "convert query[password] to queryPassword" in {
+    val model = new ModelImpl()
+      .description("a sample model")
+      .property("query[password]", new StringProperty())
+
+    val codegen = new JavaClientCodegen()
+    val cm = codegen.fromModel("sample", model)
+    val vars = cm.vars
+    vars.get(0).baseName should be("query[password]")
+    vars.get(0).getter should be("getQueryPassword")
+    vars.get(0).setter should be("setQueryPassword")
+    vars.get(0).name should be("queryPassword")
+  }
+
   it should "properly escape names per 567" in {
     val model = new ModelImpl()
       .description("a sample model")
@@ -343,4 +379,67 @@ class JavaModelTest extends FlatSpec with Matchers {
     val vars = cm.vars
     cm.classname should be("WithDots")
   }
+
+  it should "convert a modelwith binary data" in {
+      val model = new ModelImpl()
+        .description("model with binary")
+        .property("inputBinaryData", new ByteArrayProperty());
+
+      val codegen = new JavaClientCodegen()
+      val cm = codegen.fromModel("sample", model)
+      val vars = cm.vars
+
+      vars.get(0).baseName should be ("inputBinaryData")
+      vars.get(0).getter should be ("getInputBinaryData")
+      vars.get(0).setter should be ("setInputBinaryData")
+      vars.get(0).datatype should be ("byte[]")
+      vars.get(0).name should be ("inputBinaryData")
+      vars.get(0).defaultValue should be ("null")
+      vars.get(0).baseType should be ("byte[]")
+      vars.get(0).hasMore should equal (null)
+      vars.get(0).required should equal (null)
+      vars.get(0).isNotContainer should equal (true)
+
+    }
+}
+
+
+@RunWith(classOf[JUnitRunner])
+class JavaModelTest2 extends FlatSpec with Matchers {
+  it should "translate an invalid param name" in {
+    val model = new ModelImpl()
+      .description("a model with a 2nd char upper-case property names")
+      .property("_", new StringProperty())
+
+    val codegen = new JavaClientCodegen()
+    val cm = codegen.fromModel("sample", model)
+
+    cm.name should be("sample")
+    cm.classname should be("Sample")
+    cm.vars.size should be(1)
+
+    val vars = cm.vars
+    vars.get(0).baseName should be("_")
+    vars.get(0).getter should be("getU")
+    vars.get(0).setter should be("setU")
+    vars.get(0).datatype should be("String")
+    vars.get(0).name should be("u")
+    vars.get(0).defaultValue should be("null")
+    vars.get(0).baseType should be("String")
+    vars.get(0).hasMore should equal(null)
+    vars.get(0).isNotContainer should equal(true)
+  }
+
+  it should "convert a parameter" in {
+    val parameter = new QueryParameter()
+      .property(
+        new IntegerProperty())
+      .name("limit")
+      .required(true)
+
+    val codegen = new JavaClientCodegen()
+    val cp = codegen.fromParameter(parameter, null)
+
+    cp.allowableValues should be (null)
+  }
 }
diff --git a/modules/swagger-codegen/src/test/scala/Objc/ObjcModelTest.scala b/modules/swagger-codegen/src/test/scala/Objc/ObjcModelTest.scala
index 6cfac9a0eff..3d509ca1a2d 100644
--- a/modules/swagger-codegen/src/test/scala/Objc/ObjcModelTest.scala
+++ b/modules/swagger-codegen/src/test/scala/Objc/ObjcModelTest.scala
@@ -90,7 +90,7 @@ class ObjcModelTest extends FlatSpec with Matchers {
     vars.get(0).isNotContainer should equal(true)
 
     vars.get(1).baseName should be("urls")
-    vars.get(1).datatype should be("NSArray*")
+    vars.get(1).datatype should be("NSArray* /* NSString */")
     vars.get(1).name should be("urls")
     // vars.get(1).defaultValue should be ("null")
     vars.get(1).baseType should be("NSArray")
@@ -118,7 +118,7 @@ class ObjcModelTest extends FlatSpec with Matchers {
 
     val vars = cm.vars
     vars.get(0).baseName should be("translations")
-    vars.get(0).datatype should be("NSDictionary*")
+    vars.get(0).datatype should be("NSDictionary* /* NSString, NSString */")
     vars.get(0).name should be("translations")
     vars.get(0).baseType should be("NSDictionary")
     vars.get(0).containerType should be("map")
@@ -192,7 +192,7 @@ class ObjcModelTest extends FlatSpec with Matchers {
     val vars = cm.vars
     vars.get(0).baseName should be("children")
     vars.get(0).complexType should be("SWGChildren")
-    vars.get(0).datatype should be("NSDictionary*")
+    vars.get(0).datatype should be("NSDictionary* /* NSString, SWGChildren */")
     vars.get(0).name should be("children")
     vars.get(0).baseType should be("NSDictionary")
     vars.get(0).containerType should be("map")
diff --git a/modules/swagger-codegen/src/test/scala/php/PhpModelTest.scala b/modules/swagger-codegen/src/test/scala/php/PhpModelTest.scala
index ade8a09e80d..ffb9c8683db 100644
--- a/modules/swagger-codegen/src/test/scala/php/PhpModelTest.scala
+++ b/modules/swagger-codegen/src/test/scala/php/PhpModelTest.scala
@@ -51,16 +51,16 @@ class PhpModelTest extends FlatSpec with Matchers {
     vars.get(1).isNotContainer should equal(true)
 
     vars.get(2).baseName should be("createdAt")
-    vars.get(2).complexType should be(null)
-    vars.get(2).datatype should be("DateTime")
+    vars.get(2).complexType should be("\\DateTime")
+    vars.get(2).datatype should be("\\DateTime")
     vars.get(2).name should be("created_at")
     vars.get(2).defaultValue should be("null")
-    vars.get(2).baseType should be("DateTime")
+    vars.get(2).baseType should be("\\DateTime")
     vars.get(2).hasMore should equal(null)
     vars.get(2).required should equal(null)
     vars.get(2).isNotContainer should equal(true)
 
-    cm.imports.size() should be(0)
+    cm.imports.size() should be(1)
   }
 
   it should "convert a model with list property" in {
@@ -91,7 +91,7 @@ class PhpModelTest extends FlatSpec with Matchers {
     vars.get(0).isNotContainer should equal(true)
 
     vars.get(1).baseName should be("urls")
-    vars.get(1).datatype should be("array[string]")
+    vars.get(1).datatype should be("string[]")
     vars.get(1).name should be("urls")
     vars.get(1).baseType should be("array")
     vars.get(1).hasMore should be(null)
@@ -142,7 +142,7 @@ class PhpModelTest extends FlatSpec with Matchers {
 
     val vars = cm.vars
     vars.get(0).baseName should be("children")
-    vars.get(0).datatype should be("Children")
+    vars.get(0).datatype should be("\\Swagger\\Client\\Model\\Children")
     vars.get(0).name should be("children")
     vars.get(0).baseType should be("Children")
     vars.get(0).required should equal(null)
@@ -166,7 +166,7 @@ class PhpModelTest extends FlatSpec with Matchers {
     val vars = cm.vars
     vars.get(0).baseName should be("children")
     vars.get(0).complexType should be("Children")
-    vars.get(0).datatype should be("array[Children]")
+    vars.get(0).datatype should be("\\Swagger\\Client\\Model\\Children[]")
     vars.get(0).name should be("children")
     vars.get(0).baseType should be("array")
     vars.get(0).containerType should be("array")
@@ -192,7 +192,7 @@ class PhpModelTest extends FlatSpec with Matchers {
     val vars = cm.vars
     vars.get(0).baseName should be("children")
     vars.get(0).complexType should be("Children")
-    vars.get(0).datatype should be("map[string,Children]")
+    vars.get(0).datatype should be("map[string,\\Swagger\\Client\\Model\\Children]")
     vars.get(0).name should be("children")
     vars.get(0).baseType should be("map")
     vars.get(0).containerType should be("map")
diff --git a/modules/swagger-codegen/src/test/scala/typescriptangular/TypeScriptAngularModelTest.scala b/modules/swagger-codegen/src/test/scala/typescriptangular/TypeScriptAngularModelTest.scala
new file mode 100644
index 00000000000..f8221525338
--- /dev/null
+++ b/modules/swagger-codegen/src/test/scala/typescriptangular/TypeScriptAngularModelTest.scala
@@ -0,0 +1,170 @@
+package typescriptangular
+
+import io.swagger.codegen.languages.TypeScriptAngularClientCodegen
+import io.swagger.models._
+import io.swagger.models.properties._
+import org.junit.runner.RunWith
+import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.junit.JUnitRunner
+
+import scala.collection.JavaConverters._
+
+@RunWith(classOf[JUnitRunner])
+class TypeScriptAngularModelTest extends FlatSpec with Matchers {
+
+  it should "convert a simple TypeScript Angular model" in {
+    val model = new ModelImpl()
+      .description("a sample model")
+      .property("id", new LongProperty())
+      .property("name", new StringProperty())
+      .property("createdAt", new DateTimeProperty())
+      .required("id")
+      .required("name")
+
+    val codegen = new TypeScriptAngularClientCodegen()
+    val cm = codegen.fromModel("sample", model)
+
+    cm.name should be("sample")
+    cm.classname should be("Sample")
+    cm.description should be("a sample model")
+    cm.vars.size should be(3)
+
+    val vars = cm.vars
+    vars.get(0).baseName should be("id")
+    vars.get(0).datatype should be("number")
+    vars.get(0).name should be("id")
+    vars.get(0).defaultValue should be("null")
+    vars.get(0).baseType should be("number")
+    vars.get(0).hasMore should equal(true)
+    vars.get(0).required should equal(true)
+    vars.get(0).isNotContainer should equal(true)
+
+    vars.get(1).baseName should be("name")
+    vars.get(1).datatype should be("string")
+    vars.get(1).name should be("name")
+    vars.get(1).defaultValue should be("null")
+    vars.get(1).baseType should be("string")
+    vars.get(1).hasMore should equal(true)
+    vars.get(1).required should equal(true)
+    vars.get(1).isNotContainer should equal(true)
+
+    vars.get(2).baseName should be("createdAt")
+    vars.get(2).complexType should be("Date")
+    vars.get(2).datatype should be("Date")
+    vars.get(2).name should be("createdAt")
+    vars.get(2).defaultValue should be("null")
+    vars.get(2).hasMore should equal(null)
+    vars.get(2).required should equal(null)
+    vars.get(2).isNotContainer should equal(true)
+  }
+
+  it should "convert a model with list property" in {
+    val model = new ModelImpl()
+      .description("a sample model")
+      .property("id", new LongProperty())
+      .property("urls", new ArrayProperty()
+      .items(new StringProperty()))
+      .required("id")
+
+    val codegen = new TypeScriptAngularClientCodegen()
+    val cm = codegen.fromModel("sample", model)
+
+    cm.name should be("sample")
+    cm.classname should be("Sample")
+    cm.description should be("a sample model")
+    cm.vars.size should be(2)
+
+    val vars = cm.vars
+    vars.get(0).baseName should be("id")
+    vars.get(0).datatype should be("number")
+    vars.get(0).name should be("id")
+    vars.get(0).defaultValue should be("null")
+    vars.get(0).baseType should be("number")
+    vars.get(0).hasMore should equal(true)
+    vars.get(0).required should equal(true)
+    vars.get(0).isNotContainer should equal(true)
+
+    vars.get(1).baseName should be("urls")
+    vars.get(1).datatype should be("Array<string>")
+    vars.get(1).name should be("urls")
+    vars.get(1).baseType should be("Array")
+    vars.get(1).hasMore should be(null)
+    vars.get(1).required should equal(null)
+    vars.get(1).isContainer should equal(true)
+  }
+
+  it should "convert a model with complex property" in {
+    val model = new ModelImpl()
+      .description("a sample model")
+      .property("children", new RefProperty("#/definitions/Children"))
+
+    val codegen = new TypeScriptAngularClientCodegen()
+    val cm = codegen.fromModel("sample", model)
+
+    cm.name should be("sample")
+    cm.classname should be("Sample")
+    cm.description should be("a sample model")
+    cm.vars.size should be(1)
+
+    val vars = cm.vars
+    vars.get(0).baseName should be("children")
+    vars.get(0).datatype should be("Children")
+    vars.get(0).name should be("children")
+    vars.get(0).baseType should be("Children")
+    vars.get(0).required should equal(null)
+    vars.get(0).isNotContainer should equal(true)
+  }
+
+  it should "convert a model with complex list property" in {
+    val model = new ModelImpl()
+      .description("a sample model")
+      .property("children", new ArrayProperty()
+      .items(new RefProperty("#/definitions/Children")))
+
+    val codegen = new TypeScriptAngularClientCodegen()
+    val cm = codegen.fromModel("sample", model)
+
+    cm.name should be("sample")
+    cm.classname should be("Sample")
+    cm.description should be("a sample model")
+    cm.vars.size should be(1)
+
+    val vars = cm.vars
+    vars.get(0).baseName should be("children")
+    vars.get(0).complexType should be("Children")
+    vars.get(0).datatype should be("Array<Children>")
+    vars.get(0).name should be("children")
+    vars.get(0).baseType should be("Array")
+    vars.get(0).required should equal(null)
+    vars.get(0).isContainer should equal(true)
+  }
+
+  it should "convert an array model" in {
+    val model = new ArrayModel()
+      .description("an array model")
+      .items(new RefProperty("#/definitions/Children"))
+    val codegen = new TypeScriptAngularClientCodegen()
+    val cm = codegen.fromModel("sample", model)
+
+    cm.name should be("sample")
+    cm.classname should be("Sample")
+    cm.description should be("an array model")
+    cm.vars.size should be(0)
+  }
+
+  it should "convert an map model" in {
+    val model = new ModelImpl()
+      .description("an map model")
+      .additionalProperties(new RefProperty("#/definitions/Children"))
+
+    val codegen = new TypeScriptAngularClientCodegen()
+    val cm = codegen.fromModel("sample", model)
+
+    cm.name should be("sample")
+    cm.classname should be("Sample")
+    cm.description should be("an map model")
+    cm.vars.size should be(0)
+    cm.imports.size should be(1)
+    (cm.imports.asScala.toSet & Set("Children")).size should be(1)
+  }
+}
diff --git a/modules/swagger-codegen/src/test/scala/typescriptnode/TypeScriptNodeModelTest.scala b/modules/swagger-codegen/src/test/scala/typescriptnode/TypeScriptNodeModelTest.scala
new file mode 100644
index 00000000000..3ab26be651b
--- /dev/null
+++ b/modules/swagger-codegen/src/test/scala/typescriptnode/TypeScriptNodeModelTest.scala
@@ -0,0 +1,170 @@
+package typescriptnode
+
+import io.swagger.codegen.languages.TypeScriptNodeClientCodegen
+import io.swagger.models._
+import io.swagger.models.properties._
+import org.junit.runner.RunWith
+import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.junit.JUnitRunner
+
+import scala.collection.JavaConverters._
+
+@RunWith(classOf[JUnitRunner])
+class TypeScriptNodeModelTest extends FlatSpec with Matchers {
+
+  it should "convert a simple TypeScript Node model" in {
+    val model = new ModelImpl()
+      .description("a sample model")
+      .property("id", new LongProperty())
+      .property("name", new StringProperty())
+      .property("createdAt", new DateTimeProperty())
+      .required("id")
+      .required("name")
+
+    val codegen = new TypeScriptNodeClientCodegen()
+    val cm = codegen.fromModel("sample", model)
+
+    cm.name should be("sample")
+    cm.classname should be("Sample")
+    cm.description should be("a sample model")
+    cm.vars.size should be(3)
+
+    val vars = cm.vars
+    vars.get(0).baseName should be("id")
+    vars.get(0).datatype should be("number")
+    vars.get(0).name should be("id")
+    vars.get(0).defaultValue should be("null")
+    vars.get(0).baseType should be("number")
+    vars.get(0).hasMore should equal(true)
+    vars.get(0).required should equal(true)
+    vars.get(0).isNotContainer should equal(true)
+
+    vars.get(1).baseName should be("name")
+    vars.get(1).datatype should be("string")
+    vars.get(1).name should be("name")
+    vars.get(1).defaultValue should be("null")
+    vars.get(1).baseType should be("string")
+    vars.get(1).hasMore should equal(true)
+    vars.get(1).required should equal(true)
+    vars.get(1).isNotContainer should equal(true)
+
+    vars.get(2).baseName should be("createdAt")
+    vars.get(2).complexType should be("Date")
+    vars.get(2).datatype should be("Date")
+    vars.get(2).name should be("createdAt")
+    vars.get(2).defaultValue should be("null")
+    vars.get(2).hasMore should equal(null)
+    vars.get(2).required should equal(null)
+    vars.get(2).isNotContainer should equal(true)
+  }
+
+  it should "convert a model with list property" in {
+    val model = new ModelImpl()
+      .description("a sample model")
+      .property("id", new LongProperty())
+      .property("urls", new ArrayProperty()
+      .items(new StringProperty()))
+      .required("id")
+
+    val codegen = new TypeScriptNodeClientCodegen()
+    val cm = codegen.fromModel("sample", model)
+
+    cm.name should be("sample")
+    cm.classname should be("Sample")
+    cm.description should be("a sample model")
+    cm.vars.size should be(2)
+
+    val vars = cm.vars
+    vars.get(0).baseName should be("id")
+    vars.get(0).datatype should be("number")
+    vars.get(0).name should be("id")
+    vars.get(0).defaultValue should be("null")
+    vars.get(0).baseType should be("number")
+    vars.get(0).hasMore should equal(true)
+    vars.get(0).required should equal(true)
+    vars.get(0).isNotContainer should equal(true)
+
+    vars.get(1).baseName should be("urls")
+    vars.get(1).datatype should be("Array<string>")
+    vars.get(1).name should be("urls")
+    vars.get(1).baseType should be("Array")
+    vars.get(1).hasMore should be(null)
+    vars.get(1).required should equal(null)
+    vars.get(1).isContainer should equal(true)
+  }
+
+  it should "convert a model with complex property" in {
+    val model = new ModelImpl()
+      .description("a sample model")
+      .property("children", new RefProperty("#/definitions/Children"))
+
+    val codegen = new TypeScriptNodeClientCodegen()
+    val cm = codegen.fromModel("sample", model)
+
+    cm.name should be("sample")
+    cm.classname should be("Sample")
+    cm.description should be("a sample model")
+    cm.vars.size should be(1)
+
+    val vars = cm.vars
+    vars.get(0).baseName should be("children")
+    vars.get(0).datatype should be("Children")
+    vars.get(0).name should be("children")
+    vars.get(0).baseType should be("Children")
+    vars.get(0).required should equal(null)
+    vars.get(0).isNotContainer should equal(true)
+  }
+
+  it should "convert a model with complex list property" in {
+    val model = new ModelImpl()
+      .description("a sample model")
+      .property("children", new ArrayProperty()
+      .items(new RefProperty("#/definitions/Children")))
+
+    val codegen = new TypeScriptNodeClientCodegen()
+    val cm = codegen.fromModel("sample", model)
+
+    cm.name should be("sample")
+    cm.classname should be("Sample")
+    cm.description should be("a sample model")
+    cm.vars.size should be(1)
+
+    val vars = cm.vars
+    vars.get(0).baseName should be("children")
+    vars.get(0).complexType should be("Children")
+    vars.get(0).datatype should be("Array<Children>")
+    vars.get(0).name should be("children")
+    vars.get(0).baseType should be("Array")
+    vars.get(0).required should equal(null)
+    vars.get(0).isContainer should equal(true)
+  }
+
+  it should "convert an array model" in {
+    val model = new ArrayModel()
+      .description("an array model")
+      .items(new RefProperty("#/definitions/Children"))
+    val codegen = new TypeScriptNodeClientCodegen()
+    val cm = codegen.fromModel("sample", model)
+
+    cm.name should be("sample")
+    cm.classname should be("Sample")
+    cm.description should be("an array model")
+    cm.vars.size should be(0)
+  }
+
+  it should "convert an map model" in {
+    val model = new ModelImpl()
+      .description("an map model")
+      .additionalProperties(new RefProperty("#/definitions/Children"))
+
+    val codegen = new TypeScriptNodeClientCodegen()
+    val cm = codegen.fromModel("sample", model)
+
+    cm.name should be("sample")
+    cm.classname should be("Sample")
+    cm.description should be("an map model")
+    cm.vars.size should be(0)
+    cm.imports.size should be(1)
+    (cm.imports.asScala.toSet & Set("Children")).size should be(1)
+  }
+}
diff --git a/modules/swagger-generator/pom.xml b/modules/swagger-generator/pom.xml
index a7c3caf45dc..dbb092e9816 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.2</version>
+        <version>2.1.4-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <artifactId>swagger-generator</artifactId>
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 f6d924c00ad..0e71119e67a 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,12 +1,12 @@
 /**
  * Copyright 2015 SmartBear Software
- * <p/>
+ * <p>
  * 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
- * <p/>
+ * <p>
  * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ * <p>
  * 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.
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 ac28d1cc5f4..50019486ec3 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,12 +1,12 @@
 /**
  * Copyright 2015 SmartBear Software
- * <p/>
+ * <p>
  * 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
- * <p/>
+ * <p>
  * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ * <p>
  * 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.
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 7a15e82073a..b90c6ee319d 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,12 +1,12 @@
 /**
  * Copyright 2015 SmartBear Software
- * <p/>
+ * <p>
  * 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
- * <p/>
+ * <p>
  * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ * <p>
  * 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.
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 dbd6a1463ee..339cac259c1 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,12 +1,12 @@
 /**
  * Copyright 2015 SmartBear Software
- * <p/>
+ * <p>
  * 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
- * <p/>
+ * <p>
  * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ * <p>
  * 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.
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 0f3ce2e8cc9..8fe9d41fb7e 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,12 +1,12 @@
 /**
  * Copyright 2015 SmartBear Software
- * <p/>
+ * <p>
  * 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
- * <p/>
+ * <p>
  * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ * <p>
  * 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.
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 501cd2ddd82..614adcc61bc 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,12 +1,12 @@
 /**
  * Copyright 2015 SmartBear Software
- * <p/>
+ * <p>
  * 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
- * <p/>
+ * <p>
  * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ * <p>
  * 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.
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 dc55ad00582..45b3b7b7bbf 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,12 +1,12 @@
 /**
  * Copyright 2015 SmartBear Software
- * <p/>
+ * <p>
  * 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
- * <p/>
+ * <p>
  * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ * <p>
  * 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.
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 d59060f39ef..2faef30744b 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
@@ -37,7 +37,7 @@ public static String generateClient(String language, GeneratorInput opts) throws
                 throw new BadRequestException(400, "No swagger specification was supplied");
             }
         } else {
-            swagger = new SwaggerParser().read(node);
+            swagger = new SwaggerParser().read(node, true);
         }
         if (swagger == null) {
             throw new BadRequestException(400, "The swagger specification supplied was not valid");
@@ -97,7 +97,7 @@ public static String generateServer(String language, GeneratorInput opts) throws
                 throw new BadRequestException(400, "No swagger specification was supplied");
             }
         } else {
-            swagger = new SwaggerParser().read(node);
+            swagger = new SwaggerParser().read(node, true);
         }
         if (swagger == null) {
             throw new BadRequestException(400, "The swagger specification supplied was not valid");
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 6daf764a45d..07ee795f588 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,12 +1,12 @@
 /**
  * Copyright 2015 SmartBear Software
- * <p/>
+ * <p>
  * 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
- * <p/>
+ * <p>
  * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ * <p>
  * 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.
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 11e63d5cbcb..ca0a0e62018 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,12 +1,12 @@
 /**
  * Copyright 2015 SmartBear Software
- * <p/>
+ * <p>
  * 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
- * <p/>
+ * <p>
  * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ * <p>
  * 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.
diff --git a/pom.xml b/pom.xml
index 40a709fc1b8..ada6e427bad 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.2</version>
+    <version>2.1.4-SNAPSHOT</version>
     <url>https://github.com/swagger-api/swagger-codegen</url>
     <scm>
         <connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>
@@ -68,6 +68,27 @@
         <directory>target</directory>
         <finalName>${project.artifactId}-${project.version}</finalName>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${surefire-version}</version>
+                <configuration>
+                    <testNGArtifactName>none:none</testNGArtifactName>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>test-testng</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <junitArtifactName>none:none</junitArtifactName>
+                            <testNGArtifactName>org.testng:testng</testNGArtifactName>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
@@ -161,14 +182,6 @@
                     <artifactId>scala-maven-plugin</artifactId>
                     <version>${scala-maven-plugin-version}</version>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-gpg-plugin</artifactId>
-                    <configuration>
-                        <releaseProfiles>release</releaseProfiles>
-                        <goals>sign</goals>
-                    </configuration>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
@@ -300,7 +313,31 @@
                 </property>
             </activation>
             <modules>
-                <module>samples/client/petstore/java</module>
+                <module>samples/client/petstore/java/default</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>java-client-jersey2</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>java</value>
+                </property>
+            </activation>
+            <modules>
+                <module>samples/client/petstore/java/jersey2</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>java-client-okhttp-gson</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>java</value>
+                </property>
+            </activation>
+            <modules>
+                <module>samples/client/petstore/java/okhttp-gson</module>
             </modules>
         </profile>
         <profile>
@@ -385,18 +422,21 @@
             </activation>
             <modules>
                 <module>samples/client/petstore/android-java</module>
-                <module>samples/client/petstore/java</module>
+                <module>samples/client/petstore/java/default</module>
+                <module>samples/client/petstore/java/jersey2</module>
+                <module>samples/client/petstore/java/okhttp-gson</module>
                 <module>samples/client/petstore/scala</module>
-                <module>samples/server/petstore/jaxrs</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>
             </modules>
         </profile>
     </profiles>
     <modules>
         <module>modules/swagger-codegen</module>
         <module>modules/swagger-codegen-cli</module>
+        <module>modules/swagger-codegen-maven-plugin</module>
         <module>modules/swagger-generator</module>
     </modules>
     <reporting>
@@ -451,6 +491,18 @@
                 <version>${junit-version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.testng</groupId>
+                <artifactId>testng</artifactId>
+                <version>${testng-version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.jmockit</groupId>
+                <artifactId>jmockit</artifactId>
+                <version>${jmockit-version}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <repositories>
@@ -463,10 +515,10 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-parser-version>1.0.8</swagger-parser-version>
+        <swagger-parser-version>1.0.11-SNAPSHOT</swagger-parser-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>2.3.4</felix-version>
-        <swagger-core-version>1.5.0</swagger-core-version>
+        <swagger-core-version>1.5.4-SNAPSHOT</swagger-core-version>
         <scala-test-version>2.1.4</scala-test-version>
         <commons-io-version>2.3</commons-io-version>
         <commons-cli-version>1.2</commons-cli-version>
@@ -474,7 +526,11 @@
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <commons-lang-version>2.4</commons-lang-version>
         <slf4j-version>1.6.3</slf4j-version>
-        <scala-maven-plugin-version>3.1.5</scala-maven-plugin-version>
+        <scala-maven-plugin-version>3.2.1</scala-maven-plugin-version>
         <jmustache-version>1.9</jmustache-version>
+        <testng-version>6.9.6</testng-version>
+        <surefire-version>2.18.1</surefire-version>
+        <jmockit-version>1.19</jmockit-version>
+        <reflections-version>0.9.10</reflections-version>
     </properties>
 </project>
diff --git a/run-in-docker.sh b/run-in-docker.sh
new file mode 100755
index 00000000000..39a7601dd03
--- /dev/null
+++ b/run-in-docker.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+set -e
+cd "$(dirname $BASH_SOURCE)"
+
+maven_cache_repo="$HOME/.m2/repository"
+myname="$(basename $BASH_SOURCE)"
+
+if [ "$1" = "mvn" ]; then
+        cmd="$1"
+        shift
+        args="$@"
+else
+        jar="modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+        
+        # Check if project is built
+        if [ ! -f "$jar" ]; then
+                echo "ERROR File not found: $jar"
+                echo "ERROR Did you forget to './$myname mvn package'?"
+                exit 1
+        fi
+        
+        cmd="java -jar /gen/$jar"
+        args="$@"
+fi
+
+mkdir -p "$maven_cache_repo"
+
+set -x
+
+docker run -it \
+        -w /gen \
+        -v "${PWD}:/gen" \
+        -v "${maven_cache_repo}:/root/.m2/repository" \
+        maven:3-jdk-7 $cmd $args
diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/PetApi.scala b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/PetApi.scala
index d5ae6fd65f0..591d055dad6 100644
--- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/PetApi.scala
+++ b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/PetApi.scala
@@ -108,10 +108,10 @@ object PetApi {
    * Expected answers:
    *   code 400 :  (Invalid pet value)
    * 
-   * @param apiKey 
    * @param petId Pet id to delete
+   * @param apiKey 
    */
-  def deletePet(apiKey: Option[String] = None, petId: Long): ApiRequest[Unit] =
+  def deletePet(petId: Long, apiKey: Option[String] = None): ApiRequest[Unit] =
     ApiRequest[Unit](ApiMethods.DELETE, "http://petstore.swagger.io/v2", "/pet/{petId}", "application/json")
       .withPathParam("petId", petId)
       .withHeaderParam("api_key", apiKey)
diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java
index ec6218e602c..eabb47e818d 100644
--- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java
@@ -23,6 +23,7 @@
 import java.util.Map;
 import java.util.HashMap;
 import java.util.List;
+import java.util.ArrayList;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 
@@ -132,6 +133,62 @@ public static String parameterToString(Object param) {
     }
   }
 
+  /*
+    Format to {@code Pair} objects.
+  */
+  public static List<Pair> parameterToPairs(String collectionFormat, String name, Object value){
+    List<Pair> params = new ArrayList<Pair>();
+
+    // preconditions
+    if (name == null || name.isEmpty() || value == null) return params;
+
+    Collection valueCollection = null;
+    if (value instanceof Collection) {
+      valueCollection = (Collection) value;
+    } else {
+      params.add(new Pair(name, parameterToString(value)));
+      return params;
+    }
+
+    if (valueCollection.isEmpty()){
+      return params;
+    }
+
+    // get the collection format
+    collectionFormat = (collectionFormat == null || collectionFormat.isEmpty() ? "csv" : collectionFormat); // default: csv
+
+    // create the params based on the collection format
+    if (collectionFormat.equals("multi")) {
+      for (Object item : valueCollection) {
+        params.add(new Pair(name, parameterToString(item)));
+      }
+
+      return params;
+    }
+
+    String delimiter = ",";
+
+    if (collectionFormat.equals("csv")) {
+      delimiter = ",";
+    } else if (collectionFormat.equals("ssv")) {
+      delimiter = " ";
+    } else if (collectionFormat.equals("tsv")) {
+      delimiter = "\t";
+    } else if (collectionFormat.equals("pipes")) {
+      delimiter = "|";
+    }
+
+    StringBuilder sb = new StringBuilder() ;
+    for (Object item : valueCollection) {
+      sb.append(delimiter);
+      sb.append(parameterToString(item));
+    }
+
+    params.add(new Pair(name, sb.substring(1)));
+
+    return params;
+  }
+
   public ApiInvoker() {
     initConnectionManager();
   }
@@ -159,7 +216,7 @@ public static Object deserialize(String json, String containerType, Class cls) t
       }
       else if(String.class.equals(cls)) {
         if(json != null && json.startsWith("\"") && json.endsWith("\"") && json.length() > 1)
-          return json.substring(1, json.length() - 2);
+          return json.substring(1, json.length() - 1);
         else
           return json;
       }
@@ -184,21 +241,24 @@ public static String serialize(Object obj) throws ApiException {
     }
   }
 
-  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 {
+  public String invokeAPI(String host, String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, String> formParams, 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("?");
+    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("&");
-        b.append(escapeString(key)).append("=").append(escapeString(value));
+        }
       }
     }
-    String url = host + path + b.toString();
+
+    String querystring = b.substring(0, b.length() - 1);
+    String url = host + path + querystring;
 
     HashMap<String, String> headers = new HashMap<String, String>();
 
diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/Pair.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/Pair.java
new file mode 100644
index 00000000000..2710fb5a99b
--- /dev/null
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/Pair.java
@@ -0,0 +1,38 @@
+package io.swagger.client;
+
+public class Pair {
+    private String name = "";
+    private String value = "";
+
+    public Pair(String name, String value) {
+        setName(name);
+        setValue(value);
+    }
+
+    private void setName(String name) {
+        if (!isValidString(name)) return;
+
+        this.name = name;
+    }
+
+    private void setValue(String value) {
+        if (!isValidString(value)) return;
+
+        this.value = value;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    private boolean isValidString(String arg) {
+        if (arg == null) return false;
+        if (arg.trim().isEmpty()) return false;
+
+        return true;
+    }
+}
diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/PetApi.java
index ebf600d787e..f6b6403a342 100644
--- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/PetApi.java
@@ -2,6 +2,7 @@
 
 import io.swagger.client.ApiException;
 import io.swagger.client.ApiInvoker;
+import io.swagger.client.Pair;
 
 import io.swagger.client.model.*;
 
@@ -52,7 +53,7 @@ public void  updatePet (Pet body) throws ApiException {
     String path = "/pet".replaceAll("\\{format\\}","json");
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     // header params
     Map<String, String> headerParams = new HashMap<String, String>();
     // form params
@@ -106,7 +107,7 @@ public void  addPet (Pet body) throws ApiException {
     String path = "/pet".replaceAll("\\{format\\}","json");
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     // header params
     Map<String, String> headerParams = new HashMap<String, String>();
     // form params
@@ -160,14 +161,14 @@ public List<Pet>  findPetsByStatus (List<String> status) throws ApiException {
     String path = "/pet/findByStatus".replaceAll("\\{format\\}","json");
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    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>();
 
-    if (status != null)
-      queryParams.put("status", ApiInvoker.parameterToString(status));
+    
+    queryParams.addAll(ApiInvoker.parameterToPairs("multi", "status", status));
     
 
     
@@ -216,14 +217,14 @@ public List<Pet>  findPetsByTags (List<String> tags) throws ApiException {
     String path = "/pet/findByTags".replaceAll("\\{format\\}","json");
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    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>();
 
-    if (tags != null)
-      queryParams.put("tags", ApiInvoker.parameterToString(tags));
+    
+    queryParams.addAll(ApiInvoker.parameterToPairs("multi", "tags", tags));
     
 
     
@@ -277,7 +278,7 @@ public Pet  getPetById (Long petId) throws ApiException {
     String path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     // header params
     Map<String, String> headerParams = new HashMap<String, String>();
     // form params
@@ -338,7 +339,7 @@ public void  updatePetWithForm (String petId, String name, String status) throws
     String path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     // header params
     Map<String, String> headerParams = new HashMap<String, String>();
     // form params
@@ -391,11 +392,11 @@ public void  updatePetWithForm (String petId, String name, String status) throws
   /**
    * Deletes a pet
    * 
-   * @param apiKey 
    * @param petId Pet id to delete
+   * @param apiKey 
    * @return void
    */
-  public void  deletePet (String apiKey, Long petId) throws ApiException {
+  public void  deletePet (Long petId, String apiKey) throws ApiException {
     Object postBody = null;
     
     // verify the required parameter 'petId' is set
@@ -408,7 +409,7 @@ public void  deletePet (String apiKey, Long petId) throws ApiException {
     String path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     // header params
     Map<String, String> headerParams = new HashMap<String, String>();
     // form params
@@ -416,6 +417,7 @@ public void  deletePet (String apiKey, Long petId) throws ApiException {
 
     
 
+    
     headerParams.put("api_key", ApiInvoker.parameterToString(apiKey));
     
 
@@ -470,7 +472,7 @@ public void  uploadFile (Long petId, String additionalMetadata, File file) throw
     String path = "/pet/{petId}/uploadImage".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     // header params
     Map<String, String> headerParams = new HashMap<String, String>();
     // form params
diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/StoreApi.java
index ecd8e833049..49a3ac4aa9a 100644
--- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/StoreApi.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/StoreApi.java
@@ -2,6 +2,7 @@
 
 import io.swagger.client.ApiException;
 import io.swagger.client.ApiInvoker;
+import io.swagger.client.Pair;
 
 import io.swagger.client.model.*;
 
@@ -51,7 +52,7 @@ public Map<String, Integer>  getInventory () throws ApiException {
     String path = "/store/inventory".replaceAll("\\{format\\}","json");
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     // header params
     Map<String, String> headerParams = new HashMap<String, String>();
     // form params
@@ -105,7 +106,7 @@ public Order  placeOrder (Order body) throws ApiException {
     String path = "/store/order".replaceAll("\\{format\\}","json");
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     // header params
     Map<String, String> headerParams = new HashMap<String, String>();
     // form params
@@ -164,7 +165,7 @@ public Order  getOrderById (String orderId) throws ApiException {
     String path = "/store/order/{orderId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "orderId" + "\\}", apiInvoker.escapeString(orderId.toString()));
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     // header params
     Map<String, String> headerParams = new HashMap<String, String>();
     // form params
@@ -223,7 +224,7 @@ public void  deleteOrder (String orderId) throws ApiException {
     String path = "/store/order/{orderId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "orderId" + "\\}", apiInvoker.escapeString(orderId.toString()));
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     // header params
     Map<String, String> headerParams = new HashMap<String, String>();
     // form params
diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/UserApi.java
index e1df3fd4f12..a16a745c7f8 100644
--- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/UserApi.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/UserApi.java
@@ -2,6 +2,7 @@
 
 import io.swagger.client.ApiException;
 import io.swagger.client.ApiInvoker;
+import io.swagger.client.Pair;
 
 import io.swagger.client.model.*;
 
@@ -52,7 +53,7 @@ public void  createUser (User body) throws ApiException {
     String path = "/user".replaceAll("\\{format\\}","json");
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     // header params
     Map<String, String> headerParams = new HashMap<String, String>();
     // form params
@@ -106,7 +107,7 @@ public void  createUsersWithArrayInput (List<User> body) throws ApiException {
     String path = "/user/createWithArray".replaceAll("\\{format\\}","json");
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     // header params
     Map<String, String> headerParams = new HashMap<String, String>();
     // form params
@@ -160,7 +161,7 @@ public void  createUsersWithListInput (List<User> body) throws ApiException {
     String path = "/user/createWithList".replaceAll("\\{format\\}","json");
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     // header params
     Map<String, String> headerParams = new HashMap<String, String>();
     // form params
@@ -215,16 +216,16 @@ public String  loginUser (String username, String password) throws ApiException
     String path = "/user/login".replaceAll("\\{format\\}","json");
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    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>();
 
-    if (username != null)
-      queryParams.put("username", ApiInvoker.parameterToString(username));
-    if (password != null)
-      queryParams.put("password", ApiInvoker.parameterToString(password));
+    
+    queryParams.addAll(ApiInvoker.parameterToPairs("", "username", username));
+    
+    queryParams.addAll(ApiInvoker.parameterToPairs("", "password", password));
     
 
     
@@ -272,7 +273,7 @@ public void  logoutUser () throws ApiException {
     String path = "/user/logout".replaceAll("\\{format\\}","json");
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     // header params
     Map<String, String> headerParams = new HashMap<String, String>();
     // form params
@@ -331,7 +332,7 @@ public User  getUserByName (String username) throws ApiException {
     String path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     // header params
     Map<String, String> headerParams = new HashMap<String, String>();
     // form params
@@ -391,7 +392,7 @@ public void  updateUser (String username, User body) throws ApiException {
     String path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     // header params
     Map<String, String> headerParams = new HashMap<String, String>();
     // form params
@@ -450,7 +451,7 @@ public void  deleteUser (String username) throws ApiException {
     String path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     // header params
     Map<String, String> headerParams = new HashMap<String, String>();
     // form params
diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java
index 26219b16a45..90a840e6e42 100644
--- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java
@@ -1,8 +1,8 @@
 package io.swagger.client.model;
 
 import io.swagger.client.model.Category;
-import java.util.*;
 import io.swagger.client.model.Tag;
+import java.util.*;
 
 import io.swagger.annotations.*;
 import com.google.gson.annotations.SerializedName;
diff --git a/samples/client/petstore/android-java/src/test/java/io/swagger/client/ApiInvokerTest.java b/samples/client/petstore/android-java/src/test/java/io/swagger/client/ApiInvokerTest.java
new file mode 100644
index 00000000000..3e4b114012c
--- /dev/null
+++ b/samples/client/petstore/android-java/src/test/java/io/swagger/client/ApiInvokerTest.java
@@ -0,0 +1,91 @@
+package io.swagger.client;
+
+import org.junit.*;
+import static org.junit.Assert.*;
+
+import java.util.*;
+
+
+public class ApiInvokerTest {
+
+    @Test
+    public void testParameterToPairsWhenNameIsInvalid() throws Exception {
+        List<Pair> pairs_a = ApiInvoker.parameterToPairs("csv", null, new Integer(1));
+        List<Pair> pairs_b = ApiInvoker.parameterToPairs("csv", "", new Integer(1));
+
+        assertTrue(pairs_a.isEmpty());
+        assertTrue(pairs_b.isEmpty());
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsNull() throws Exception {
+        List<Pair> pairs = ApiInvoker.parameterToPairs("csv", "param-a", null);
+
+        assertTrue(pairs.isEmpty());
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsEmptyStrings() throws Exception {
+
+        // single empty string
+        List<Pair> pairs = ApiInvoker.parameterToPairs("csv", "param-a", " ");
+        assertEquals(1, pairs.size());
+
+        // list of empty strings
+        List<String> strs = new ArrayList<String>();
+        strs.add(" ");
+        strs.add(" ");
+        strs.add(" ");
+
+        List<Pair> concatStrings = ApiInvoker.parameterToPairs("csv", "param-a", strs);
+
+        assertEquals(1, concatStrings.size());
+        assertFalse(concatStrings.get(0).getValue().isEmpty()); // should contain some delimiters
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsNotCollection() throws Exception {
+        String name = "param-a";
+        Integer value = 1;
+
+        List<Pair> pairs = ApiInvoker.parameterToPairs("csv", name, value);
+
+        assertEquals(1, pairs.size());
+        assertEquals(value, Integer.valueOf(pairs.get(0).getValue()));
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsCollection() throws Exception {
+        Map<String, String> collectionFormatMap = new HashMap<String, String>();
+        collectionFormatMap.put("csv", ",");
+        collectionFormatMap.put("tsv", "\t");
+        collectionFormatMap.put("ssv", " ");
+        collectionFormatMap.put("pipes", "\\|");
+        collectionFormatMap.put("", ","); // no format, must default to csv
+        collectionFormatMap.put("unknown", ","); // all other formats, must default to csv
+
+        String name = "param-a";
+
+        List<Object> values = new ArrayList<Object>();
+        values.add("value-a");
+        values.add(123);
+        values.add(new Date());
+
+        // check for multi separately
+        List<Pair> multiPairs = ApiInvoker.parameterToPairs("multi", name, values);
+        assertEquals(values.size(), multiPairs.size());
+
+        // all other formats
+        for (String collectionFormat : collectionFormatMap.keySet()) {
+            List<Pair> pairs = ApiInvoker.parameterToPairs(collectionFormat, name, values);
+
+            assertEquals(1, pairs.size());
+
+            String delimiter = collectionFormatMap.get(collectionFormat);
+            String[] pairValueSplit = pairs.get(0).getValue().split(delimiter);
+
+            // must equal input values
+            assertEquals(values.size(), pairValueSplit.length);
+        }
+    }
+}
diff --git a/samples/client/petstore/android-java/src/test/java/io/swagger/petstore/test/PetApiTest.java b/samples/client/petstore/android-java/src/test/java/io/swagger/petstore/test/PetApiTest.java
index a4900a92b9b..ca868d2ea22 100644
--- a/samples/client/petstore/android-java/src/test/java/io/swagger/petstore/test/PetApiTest.java
+++ b/samples/client/petstore/android-java/src/test/java/io/swagger/petstore/test/PetApiTest.java
@@ -118,7 +118,7 @@ public void testDeletePet() throws Exception {
         api.addPet(pet);
 
         Pet fetched = api.getPetById(pet.getId());
-        api.deletePet(null, fetched.getId());
+        api.deletePet(fetched.getId(), null);
 
         try {
             fetched = api.getPetById(fetched.getId());
diff --git a/samples/client/petstore/async-scala/build.sbt b/samples/client/petstore/async-scala/build.sbt
index 1d7306d541d..b02498c74e8 100644
--- a/samples/client/petstore/async-scala/build.sbt
+++ b/samples/client/petstore/async-scala/build.sbt
@@ -3,10 +3,10 @@ organization := ""
 name := "-client"
 
 libraryDependencies ++= Seq(
-"com.wordnik" %% "swagger-async-httpclient" % "0.3.5",
-"joda-time" % "joda-time" % "2.3",
-"org.joda" % "joda-convert" % "1.3.1",
-"ch.qos.logback" % "logback-classic" % "1.0.13" % "provided",
-"org.scalatest" %% "scalatest" % "2.2.1" % "test",
-"junit" % "junit" % "4.11" % "test"
+  "io.swagger" %% "swagger-async-httpclient" % "0.3.5",
+  "joda-time" % "joda-time" % "2.3",
+  "org.joda" % "joda-convert" % "1.3.1",
+  "ch.qos.logback" % "logback-classic" % "1.0.13" % "provided",
+  "org.scalatest" %% "scalatest" % "2.2.1" % "test",
+  "junit" % "junit" % "4.11" % "test"
 )
diff --git a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/SwaggerClient.scala b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/SwaggerClient.scala
index 92262387823..9d0c05187a9 100644
--- a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/SwaggerClient.scala
+++ b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/SwaggerClient.scala
@@ -7,21 +7,21 @@ import io.swagger.client._
 import java.io.Closeable
 
 class SwaggerClient(config: SwaggerConfig) extends Closeable {
-val locator = config.locator
-val name = config.name
-
-private[this] val client = transportClient
-
-protected def transportClient: TransportClient = new RestClient(config)
-
-    val user = new UserApi(client, config)
-
-    val pet = new PetApi(client, config)
-
-    val store = new StoreApi(client, config)
-
-
-def close() {
-client.close()
-}
+  val locator = config.locator
+  val name = config.name
+
+  private[this] val client = transportClient
+
+  protected def transportClient: TransportClient = new RestClient(config)
+  
+  val user = new UserApi(client, config)
+  
+  val pet = new PetApi(client, config)
+  
+  val store = new StoreApi(client, config)
+  
+
+  def close() {
+    client.close()
+  }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/api/PetApi.scala b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/api/PetApi.scala
index 5138049a22a..4b6a2b155d9 100644
--- a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/api/PetApi.scala
+++ b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/api/PetApi.scala
@@ -7,187 +7,191 @@ import scala.concurrent.{ Future, Await }
 import scala.concurrent.duration._
 import collection.mutable
 
-    class PetApi(client: TransportClient, config: SwaggerConfig) extends ApiClient(client, config) {
+class PetApi(client: TransportClient, config: SwaggerConfig) extends ApiClient(client, config) {
 
-    
-        def updatePet(body: Pet)(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[Pet]): Future[Unit] = {
-        // create path and map variables
-        val path = (addFmt("/pet"))
-
-        // query params
-        val queryParams = new mutable.HashMap[String, String]
-        val headerParams = new mutable.HashMap[String, String]
+  
+  def updatePet(body: Option[Pet] = None
+      )(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[Pet]): Future[Unit] = {
+    // create path and map variables
+    val path = (addFmt("/pet"))
 
-        
+    // query params
+    val queryParams = new mutable.HashMap[String, String]
+    val headerParams = new mutable.HashMap[String, String]
 
-        
-
-        
+    
 
-        val resFuture = client.submit("PUT", path, queryParams.toMap, headerParams.toMap, writer.write(body))
-        resFuture flatMap { resp =>
-        process(reader.read(resp))
-        }
-        }
+    
 
     
-        def addPet(body: Pet)(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[Pet]): Future[Unit] = {
-        // create path and map variables
-        val path = (addFmt("/pet"))
 
-        // query params
-        val queryParams = new mutable.HashMap[String, String]
-        val headerParams = new mutable.HashMap[String, String]
+    val resFuture = client.submit("PUT", path, queryParams.toMap, headerParams.toMap, writer.write(body))
+    resFuture flatMap { resp =>
+      process(reader.read(resp))
+    }
+  }
 
-        
+  
+  def addPet(body: Option[Pet] = None
+      )(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[Pet]): Future[Unit] = {
+    // create path and map variables
+    val path = (addFmt("/pet"))
 
-        
+    // query params
+    val queryParams = new mutable.HashMap[String, String]
+    val headerParams = new mutable.HashMap[String, String]
 
-        
+    
 
-        val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, writer.write(body))
-        resFuture flatMap { resp =>
-        process(reader.read(resp))
-        }
-        }
+    
 
     
-        def findPetsByStatus(status: List[String] = available)(implicit reader: ClientResponseReader[List[Pet]]): Future[List[Pet]] = {
-        // create path and map variables
-        val path = (addFmt("/pet/findByStatus"))
 
-        // query params
-        val queryParams = new mutable.HashMap[String, String]
-        val headerParams = new mutable.HashMap[String, String]
+    val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, writer.write(body))
+    resFuture flatMap { resp =>
+      process(reader.read(resp))
+    }
+  }
 
-        
+  
+  def findPetsByStatus(status: Option[List[String]] = Some(available)
+      )(implicit reader: ClientResponseReader[List[Pet]]): Future[List[Pet]] = {
+    // create path and map variables
+    val path = (addFmt("/pet/findByStatus"))
 
-        
-            if(status != null)   queryParams += "status" -> status.toString
+    // query params
+    val queryParams = new mutable.HashMap[String, String]
+    val headerParams = new mutable.HashMap[String, String]
 
-        
+    
 
-        val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "")
-        resFuture flatMap { resp =>
-        process(reader.read(resp))
-        }
-        }
+    if(status != null) status.foreach { v => queryParams += "status" -> v.toString }
 
     
-        def findPetsByTags(tags: List[String])(implicit reader: ClientResponseReader[List[Pet]]): Future[List[Pet]] = {
-        // create path and map variables
-        val path = (addFmt("/pet/findByTags"))
 
-        // query params
-        val queryParams = new mutable.HashMap[String, String]
-        val headerParams = new mutable.HashMap[String, String]
+    val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "")
+    resFuture flatMap { resp =>
+      process(reader.read(resp))
+    }
+  }
 
-        
+  
+  def findPetsByTags(tags: Option[List[String]] = None
+      )(implicit reader: ClientResponseReader[List[Pet]]): Future[List[Pet]] = {
+    // create path and map variables
+    val path = (addFmt("/pet/findByTags"))
 
-        
-            if(tags != null)   queryParams += "tags" -> tags.toString
+    // query params
+    val queryParams = new mutable.HashMap[String, String]
+    val headerParams = new mutable.HashMap[String, String]
 
-        
+    
 
-        val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "")
-        resFuture flatMap { resp =>
-        process(reader.read(resp))
-        }
-        }
+    if(tags != null) tags.foreach { v => queryParams += "tags" -> v.toString }
 
     
-        def getPetById(petId: Long)(implicit reader: ClientResponseReader[Pet]): Future[Pet] = {
-        // create path and map variables
-        val path = (addFmt("/pet/{petId}")
-            replaceAll ("\\{" + "petId" + "\\}",petId.toString))
-
-        // query params
-        val queryParams = new mutable.HashMap[String, String]
-        val headerParams = new mutable.HashMap[String, String]
 
-        
+    val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "")
+    resFuture flatMap { resp =>
+      process(reader.read(resp))
+    }
+  }
 
-        
+  
+  def getPetById(petId: Long)(implicit reader: ClientResponseReader[Pet]): Future[Pet] = {
+    // create path and map variables
+    val path = (addFmt("/pet/{petId}")
+        replaceAll ("\\{" + "petId" + "\\}",petId.toString))
 
-        
+    // query params
+    val queryParams = new mutable.HashMap[String, String]
+    val headerParams = new mutable.HashMap[String, String]
 
-        val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "")
-        resFuture flatMap { resp =>
-        process(reader.read(resp))
-        }
-        }
+    
 
     
-        def updatePetWithForm(petId: String,
-        name: String,
-        status: String)(implicit reader: ClientResponseReader[Unit]): Future[Unit] = {
-        // create path and map variables
-        val path = (addFmt("/pet/{petId}")
-            replaceAll ("\\{" + "petId" + "\\}",petId.toString))
 
-        // query params
-        val queryParams = new mutable.HashMap[String, String]
-        val headerParams = new mutable.HashMap[String, String]
+    
 
-        
+    val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "")
+    resFuture flatMap { resp =>
+      process(reader.read(resp))
+    }
+  }
 
-        
+  
+  def updatePetWithForm(petId: String,
+      name: Option[String] = None,
+      status: Option[String] = None
+      )(implicit reader: ClientResponseReader[Unit]): Future[Unit] = {
+    // create path and map variables
+    val path = (addFmt("/pet/{petId}")
+        replaceAll ("\\{" + "petId" + "\\}",petId.toString))
 
-        
+    // query params
+    val queryParams = new mutable.HashMap[String, String]
+    val headerParams = new mutable.HashMap[String, String]
 
-        val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, "")
-        resFuture flatMap { resp =>
-        process(reader.read(resp))
-        }
-        }
+    
 
     
-        def deletePet(apiKey: String,
-        petId: Long)(implicit reader: ClientResponseReader[Unit]): Future[Unit] = {
-        // create path and map variables
-        val path = (addFmt("/pet/{petId}")
-            replaceAll ("\\{" + "petId" + "\\}",petId.toString))
 
-        // query params
-        val queryParams = new mutable.HashMap[String, String]
-        val headerParams = new mutable.HashMap[String, String]
+    
 
-        
+    val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, "")
+    resFuture flatMap { resp =>
+      process(reader.read(resp))
+    }
+  }
 
-        
+  
+  def deletePet(apiKey: Option[String] = None,
+      petId: Long)(implicit reader: ClientResponseReader[Unit]): Future[Unit] = {
+    // create path and map variables
+    val path = (addFmt("/pet/{petId}")
+        replaceAll ("\\{" + "petId" + "\\}",petId.toString))
 
-        headerParams += "api_key" -> apiKey.toString
+    // query params
+    val queryParams = new mutable.HashMap[String, String]
+    val headerParams = new mutable.HashMap[String, String]
 
-        val resFuture = client.submit("DELETE", path, queryParams.toMap, headerParams.toMap, "")
-        resFuture flatMap { resp =>
-        process(reader.read(resp))
-        }
-        }
+    
 
     
-        def uploadFile(petId: Long,
-        additionalMetadata: String,
-        file: File)(implicit reader: ClientResponseReader[Unit]): Future[Unit] = {
-        // create path and map variables
-        val path = (addFmt("/pet/{petId}/uploadImage")
-            replaceAll ("\\{" + "petId" + "\\}",petId.toString))
 
-        // query params
-        val queryParams = new mutable.HashMap[String, String]
-        val headerParams = new mutable.HashMap[String, String]
+    headerParams += "api_key" -> apiKey.toString
 
-        
+    val resFuture = client.submit("DELETE", path, queryParams.toMap, headerParams.toMap, "")
+    resFuture flatMap { resp =>
+      process(reader.read(resp))
+    }
+  }
+
+  
+  def uploadFile(petId: Long,
+      additionalMetadata: Option[String] = None,
+      file: Option[File] = None
+      )(implicit reader: ClientResponseReader[Unit]): Future[Unit] = {
+    // create path and map variables
+    val path = (addFmt("/pet/{petId}/uploadImage")
+        replaceAll ("\\{" + "petId" + "\\}",petId.toString))
 
-        
+    // query params
+    val queryParams = new mutable.HashMap[String, String]
+    val headerParams = new mutable.HashMap[String, String]
 
-        
+    
 
-        val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, "")
-        resFuture flatMap { resp =>
-        process(reader.read(resp))
-        }
-        }
+    
 
     
 
+    val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, "")
+    resFuture flatMap { resp =>
+      process(reader.read(resp))
     }
+  }
+
+  
+
+}
diff --git a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/api/StoreApi.scala b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/api/StoreApi.scala
index c98675739de..c7a18efbf14 100644
--- a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/api/StoreApi.scala
+++ b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/api/StoreApi.scala
@@ -6,94 +6,95 @@ import scala.concurrent.{ Future, Await }
 import scala.concurrent.duration._
 import collection.mutable
 
-    class StoreApi(client: TransportClient, config: SwaggerConfig) extends ApiClient(client, config) {
+class StoreApi(client: TransportClient, config: SwaggerConfig) extends ApiClient(client, config) {
 
-    
-        def getInventory()(implicit reader: ClientResponseReader[Map[String, Integer]]): Future[Map[String, Integer]] = {
-        // create path and map variables
-        val path = (addFmt("/store/inventory"))
-
-        // query params
-        val queryParams = new mutable.HashMap[String, String]
-        val headerParams = new mutable.HashMap[String, String]
+  
+  def getInventory()(implicit reader: ClientResponseReader[Map[String, Integer]]): Future[Map[String, Integer]] = {
+    // create path and map variables
+    val path = (addFmt("/store/inventory"))
 
-        
+    // query params
+    val queryParams = new mutable.HashMap[String, String]
+    val headerParams = new mutable.HashMap[String, String]
 
-        
-
-        
+    
 
-        val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "")
-        resFuture flatMap { resp =>
-        process(reader.read(resp))
-        }
-        }
+    
 
     
-        def placeOrder(body: Order)(implicit reader: ClientResponseReader[Order], writer: RequestWriter[Order]): Future[Order] = {
-        // create path and map variables
-        val path = (addFmt("/store/order"))
 
-        // query params
-        val queryParams = new mutable.HashMap[String, String]
-        val headerParams = new mutable.HashMap[String, String]
+    val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "")
+    resFuture flatMap { resp =>
+      process(reader.read(resp))
+    }
+  }
 
-        
+  
+  def placeOrder(body: Option[Order] = None
+      )(implicit reader: ClientResponseReader[Order], writer: RequestWriter[Order]): Future[Order] = {
+    // create path and map variables
+    val path = (addFmt("/store/order"))
 
-        
+    // query params
+    val queryParams = new mutable.HashMap[String, String]
+    val headerParams = new mutable.HashMap[String, String]
 
-        
+    
 
-        val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, writer.write(body))
-        resFuture flatMap { resp =>
-        process(reader.read(resp))
-        }
-        }
+    
 
     
-        def getOrderById(orderId: String)(implicit reader: ClientResponseReader[Order]): Future[Order] = {
-        // create path and map variables
-        val path = (addFmt("/store/order/{orderId}")
-            replaceAll ("\\{" + "orderId" + "\\}",orderId.toString))
 
-        // query params
-        val queryParams = new mutable.HashMap[String, String]
-        val headerParams = new mutable.HashMap[String, String]
+    val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, writer.write(body))
+    resFuture flatMap { resp =>
+      process(reader.read(resp))
+    }
+  }
 
-        
+  
+  def getOrderById(orderId: String)(implicit reader: ClientResponseReader[Order]): Future[Order] = {
+    // create path and map variables
+    val path = (addFmt("/store/order/{orderId}")
+        replaceAll ("\\{" + "orderId" + "\\}",orderId.toString))
 
-        
+    // query params
+    val queryParams = new mutable.HashMap[String, String]
+    val headerParams = new mutable.HashMap[String, String]
 
-        
+    
 
-        val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "")
-        resFuture flatMap { resp =>
-        process(reader.read(resp))
-        }
-        }
+    
 
     
-        def deleteOrder(orderId: String)(implicit reader: ClientResponseReader[Unit]): Future[Unit] = {
-        // create path and map variables
-        val path = (addFmt("/store/order/{orderId}")
-            replaceAll ("\\{" + "orderId" + "\\}",orderId.toString))
 
-        // query params
-        val queryParams = new mutable.HashMap[String, String]
-        val headerParams = new mutable.HashMap[String, String]
+    val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "")
+    resFuture flatMap { resp =>
+      process(reader.read(resp))
+    }
+  }
 
-        
+  
+  def deleteOrder(orderId: String)(implicit reader: ClientResponseReader[Unit]): Future[Unit] = {
+    // create path and map variables
+    val path = (addFmt("/store/order/{orderId}")
+        replaceAll ("\\{" + "orderId" + "\\}",orderId.toString))
 
-        
+    // query params
+    val queryParams = new mutable.HashMap[String, String]
+    val headerParams = new mutable.HashMap[String, String]
 
-        
+    
 
-        val resFuture = client.submit("DELETE", path, queryParams.toMap, headerParams.toMap, "")
-        resFuture flatMap { resp =>
-        process(reader.read(resp))
-        }
-        }
+    
 
     
 
+    val resFuture = client.submit("DELETE", path, queryParams.toMap, headerParams.toMap, "")
+    resFuture flatMap { resp =>
+      process(reader.read(resp))
     }
+  }
+
+  
+
+}
diff --git a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/api/UserApi.scala b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/api/UserApi.scala
index 3b8ba3cdc2e..766e4d22312 100644
--- a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/api/UserApi.scala
+++ b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/api/UserApi.scala
@@ -6,183 +6,186 @@ import scala.concurrent.{ Future, Await }
 import scala.concurrent.duration._
 import collection.mutable
 
-    class UserApi(client: TransportClient, config: SwaggerConfig) extends ApiClient(client, config) {
+class UserApi(client: TransportClient, config: SwaggerConfig) extends ApiClient(client, config) {
 
-    
-        def createUser(body: User)(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[User]): Future[Unit] = {
-        // create path and map variables
-        val path = (addFmt("/user"))
-
-        // query params
-        val queryParams = new mutable.HashMap[String, String]
-        val headerParams = new mutable.HashMap[String, String]
+  
+  def createUser(body: Option[User] = None
+      )(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[User]): Future[Unit] = {
+    // create path and map variables
+    val path = (addFmt("/user"))
 
-        
+    // query params
+    val queryParams = new mutable.HashMap[String, String]
+    val headerParams = new mutable.HashMap[String, String]
 
-        
-
-        
+    
 
-        val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, writer.write(body))
-        resFuture flatMap { resp =>
-        process(reader.read(resp))
-        }
-        }
+    
 
     
-        def createUsersWithArrayInput(body: List[User])(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[List[User]]): Future[Unit] = {
-        // create path and map variables
-        val path = (addFmt("/user/createWithArray"))
 
-        // query params
-        val queryParams = new mutable.HashMap[String, String]
-        val headerParams = new mutable.HashMap[String, String]
+    val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, writer.write(body))
+    resFuture flatMap { resp =>
+      process(reader.read(resp))
+    }
+  }
 
-        
+  
+  def createUsersWithArrayInput(body: Option[List[User]] = None
+      )(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[List[User]]): Future[Unit] = {
+    // create path and map variables
+    val path = (addFmt("/user/createWithArray"))
 
-        
+    // query params
+    val queryParams = new mutable.HashMap[String, String]
+    val headerParams = new mutable.HashMap[String, String]
 
-        
+    
 
-        val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, writer.write(body))
-        resFuture flatMap { resp =>
-        process(reader.read(resp))
-        }
-        }
+    
 
     
-        def createUsersWithListInput(body: List[User])(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[List[User]]): Future[Unit] = {
-        // create path and map variables
-        val path = (addFmt("/user/createWithList"))
 
-        // query params
-        val queryParams = new mutable.HashMap[String, String]
-        val headerParams = new mutable.HashMap[String, String]
+    val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, writer.write(body))
+    resFuture flatMap { resp =>
+      process(reader.read(resp))
+    }
+  }
 
-        
+  
+  def createUsersWithListInput(body: Option[List[User]] = None
+      )(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[List[User]]): Future[Unit] = {
+    // create path and map variables
+    val path = (addFmt("/user/createWithList"))
 
-        
+    // query params
+    val queryParams = new mutable.HashMap[String, String]
+    val headerParams = new mutable.HashMap[String, String]
 
-        
+    
 
-        val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, writer.write(body))
-        resFuture flatMap { resp =>
-        process(reader.read(resp))
-        }
-        }
+    
 
     
-        def loginUser(username: String,
-        password: String)(implicit reader: ClientResponseReader[String]): Future[String] = {
-        // create path and map variables
-        val path = (addFmt("/user/login"))
 
-        // query params
-        val queryParams = new mutable.HashMap[String, String]
-        val headerParams = new mutable.HashMap[String, String]
+    val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, writer.write(body))
+    resFuture flatMap { resp =>
+      process(reader.read(resp))
+    }
+  }
 
-        
+  
+  def loginUser(username: Option[String] = None,
+      password: Option[String] = None
+      )(implicit reader: ClientResponseReader[String]): Future[String] = {
+    // create path and map variables
+    val path = (addFmt("/user/login"))
 
-        
-            if(username != null)   queryParams += "username" -> username.toString
-            if(password != null)   queryParams += "password" -> password.toString
+    // query params
+    val queryParams = new mutable.HashMap[String, String]
+    val headerParams = new mutable.HashMap[String, String]
 
-        
+    
 
-        val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "")
-        resFuture flatMap { resp =>
-        process(reader.read(resp))
-        }
-        }
+    if(username != null) username.foreach { v => queryParams += "username" -> v.toString }if(password != null) password.foreach { v => queryParams += "password" -> v.toString }
 
     
-        def logoutUser()(implicit reader: ClientResponseReader[Unit]): Future[Unit] = {
-        // create path and map variables
-        val path = (addFmt("/user/logout"))
 
-        // query params
-        val queryParams = new mutable.HashMap[String, String]
-        val headerParams = new mutable.HashMap[String, String]
+    val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "")
+    resFuture flatMap { resp =>
+      process(reader.read(resp))
+    }
+  }
 
-        
+  
+  def logoutUser()(implicit reader: ClientResponseReader[Unit]): Future[Unit] = {
+    // create path and map variables
+    val path = (addFmt("/user/logout"))
 
-        
+    // query params
+    val queryParams = new mutable.HashMap[String, String]
+    val headerParams = new mutable.HashMap[String, String]
 
-        
+    
 
-        val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "")
-        resFuture flatMap { resp =>
-        process(reader.read(resp))
-        }
-        }
+    
 
     
-        def getUserByName(username: String)(implicit reader: ClientResponseReader[User]): Future[User] = {
-        // create path and map variables
-        val path = (addFmt("/user/{username}")
-            replaceAll ("\\{" + "username" + "\\}",username.toString))
 
-        // query params
-        val queryParams = new mutable.HashMap[String, String]
-        val headerParams = new mutable.HashMap[String, String]
+    val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "")
+    resFuture flatMap { resp =>
+      process(reader.read(resp))
+    }
+  }
 
-        
+  
+  def getUserByName(username: String)(implicit reader: ClientResponseReader[User]): Future[User] = {
+    // create path and map variables
+    val path = (addFmt("/user/{username}")
+        replaceAll ("\\{" + "username" + "\\}",username.toString))
 
-        
+    // query params
+    val queryParams = new mutable.HashMap[String, String]
+    val headerParams = new mutable.HashMap[String, String]
 
-        
+    
 
-        val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "")
-        resFuture flatMap { resp =>
-        process(reader.read(resp))
-        }
-        }
+    
 
     
-        def updateUser(username: String,
-        body: User)(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[User]): Future[Unit] = {
-        // create path and map variables
-        val path = (addFmt("/user/{username}")
-            replaceAll ("\\{" + "username" + "\\}",username.toString))
 
-        // query params
-        val queryParams = new mutable.HashMap[String, String]
-        val headerParams = new mutable.HashMap[String, String]
+    val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "")
+    resFuture flatMap { resp =>
+      process(reader.read(resp))
+    }
+  }
 
-        
+  
+  def updateUser(username: String,
+      body: Option[User] = None
+      )(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[User]): Future[Unit] = {
+    // create path and map variables
+    val path = (addFmt("/user/{username}")
+        replaceAll ("\\{" + "username" + "\\}",username.toString))
 
-        
+    // query params
+    val queryParams = new mutable.HashMap[String, String]
+    val headerParams = new mutable.HashMap[String, String]
 
-        
+    
 
-        val resFuture = client.submit("PUT", path, queryParams.toMap, headerParams.toMap, writer.write(body))
-        resFuture flatMap { resp =>
-        process(reader.read(resp))
-        }
-        }
+    
 
     
-        def deleteUser(username: String)(implicit reader: ClientResponseReader[Unit]): Future[Unit] = {
-        // create path and map variables
-        val path = (addFmt("/user/{username}")
-            replaceAll ("\\{" + "username" + "\\}",username.toString))
 
-        // query params
-        val queryParams = new mutable.HashMap[String, String]
-        val headerParams = new mutable.HashMap[String, String]
+    val resFuture = client.submit("PUT", path, queryParams.toMap, headerParams.toMap, writer.write(body))
+    resFuture flatMap { resp =>
+      process(reader.read(resp))
+    }
+  }
 
-        
+  
+  def deleteUser(username: String)(implicit reader: ClientResponseReader[Unit]): Future[Unit] = {
+    // create path and map variables
+    val path = (addFmt("/user/{username}")
+        replaceAll ("\\{" + "username" + "\\}",username.toString))
 
-        
+    // query params
+    val queryParams = new mutable.HashMap[String, String]
+    val headerParams = new mutable.HashMap[String, String]
 
-        
+    
 
-        val resFuture = client.submit("DELETE", path, queryParams.toMap, headerParams.toMap, "")
-        resFuture flatMap { resp =>
-        process(reader.read(resp))
-        }
-        }
+    
 
     
 
+    val resFuture = client.submit("DELETE", path, queryParams.toMap, headerParams.toMap, "")
+    resFuture flatMap { resp =>
+      process(reader.read(resp))
     }
+  }
+
+  
+
+}
diff --git a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Category.scala b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Category.scala
index a19b846e875..1b410e7c59e 100644
--- a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Category.scala
+++ b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Category.scala
@@ -3,10 +3,8 @@ package io.swagger.client.model
 import org.joda.time.DateTime
 
 
-    
-        case class Category (
-        id: Long,
-        name: String
-        
-        )
-    
+case class Category (
+  id: Long,
+  name: String
+  
+)
diff --git a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Order.scala b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Order.scala
index 4e847e74b27..f7a10a44965 100644
--- a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Order.scala
+++ b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Order.scala
@@ -3,14 +3,12 @@ package io.swagger.client.model
 import org.joda.time.DateTime
 
 
-    
-        case class Order (
-        id: Long,
-        petId: Long,
-        quantity: Integer,
-        shipDate: DateTime,
-        status: String,  // Order Status
-        complete: Boolean
-        
-        )
-    
+case class Order (
+  id: Long,
+  petId: Long,
+  quantity: Integer,
+  shipDate: DateTime,
+  status: String,  // Order Status
+  complete: Boolean
+  
+)
diff --git a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Pet.scala b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Pet.scala
index d7da69df9ee..7e76c72914b 100644
--- a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Pet.scala
+++ b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Pet.scala
@@ -3,14 +3,12 @@ package io.swagger.client.model
 import org.joda.time.DateTime
 
 
-    
-        case class Pet (
-        id: Long,
-        category: Category,
-        name: String,
-        photoUrls: List[String],
-        tags: List[Tag],
-        status: String  // pet status in the store
-        
-        )
-    
+case class Pet (
+  id: Long,
+  category: Category,
+  name: String,
+  photoUrls: List[String],
+  tags: List[Tag],
+  status: String  // pet status in the store
+  
+)
diff --git a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Tag.scala b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Tag.scala
index aa2a883063f..9dfe60d36f8 100644
--- a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Tag.scala
+++ b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/Tag.scala
@@ -3,10 +3,8 @@ package io.swagger.client.model
 import org.joda.time.DateTime
 
 
-    
-        case class Tag (
-        id: Long,
-        name: String
-        
-        )
-    
+case class Tag (
+  id: Long,
+  name: String
+  
+)
diff --git a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/User.scala b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/User.scala
index 692ec715347..598adae451a 100644
--- a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/User.scala
+++ b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/User.scala
@@ -3,16 +3,14 @@ package io.swagger.client.model
 import org.joda.time.DateTime
 
 
-    
-        case class User (
-        id: Long,
-        username: String,
-        firstName: String,
-        lastName: String,
-        email: String,
-        password: String,
-        phone: String,
-        userStatus: Integer  // User Status
-        
-        )
-    
+case class User (
+  id: Long,
+  username: String,
+  firstName: String,
+  lastName: String,
+  email: String,
+  password: String,
+  phone: String,
+  userStatus: Integer  // User Status
+  
+)
diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/README.md b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/README.md
new file mode 100644
index 00000000000..5fe03fcb316
--- /dev/null
+++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/README.md
@@ -0,0 +1,10 @@
+# Csharp-DotNet2
+
+This generator creates C# code targeting the .Net 2.0 framework. The resulting DLLs can be used in places where .Net 2.0 is the maximum supported version, such as in the Unity3d.
+
+## Dependencies
+- Mono compiler
+- Note: NuGet is downloaded by the mono compilation script and packages are installed with it. No dependency DLLs are bundled with this generator.
+
+
+
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
new file mode 100644
index 00000000000..bc4e0989945
--- /dev/null
+++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/compile-mono.sh
@@ -0,0 +1,12 @@
+wget -nc https://nuget.org/nuget.exe;
+mozroots --import --sync
+mono nuget.exe install vendor/packages.config -o vendor;
+mkdir -p bin;
+mcs -sdk:2 -r:vendor/Newtonsoft.Json.7.0.1/lib/net20/Newtonsoft.Json.dll,\
+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 \
+-doc:bin/IO.Swagger.xml \
+-platform:anycpu
\ No newline at end of file
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
new file mode 100644
index 00000000000..238f7bf75e7
--- /dev/null
+++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Api/PetApi.cs
@@ -0,0 +1,475 @@
+using System;
+using System.IO;
+using System.Collections.Generic;
+using RestSharp;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
+
+namespace IO.Swagger.Api
+{
+    
+    public interface IPetApi
+    {
+        
+        /// <summary>
+        /// Update an existing pet 
+        /// </summary>
+        /// <param name="body">Pet object that needs to be added to the store</param>
+        /// <returns></returns>
+        void UpdatePet (Pet body);
+        
+        /// <summary>
+        /// Add a new pet to the store 
+        /// </summary>
+        /// <param name="body">Pet object that needs to be added to the store</param>
+        /// <returns></returns>
+        void AddPet (Pet body);
+        
+        /// <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>List<Pet></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>
+        List<Pet> FindPetsByTags (List<string> tags);
+        
+        /// <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>
+        Pet GetPetById (long? petId);
+        
+        /// <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>
+        /// <returns></returns>
+        void UpdatePetWithForm (string petId, string name, string status);
+        
+        /// <summary>
+        /// Deletes a pet 
+        /// </summary>
+        /// <param name="petId">Pet id to delete</param>
+        /// <param name="apiKey"></param>
+        /// <returns></returns>
+        void DeletePet (long? petId, string apiKey);
+        
+        /// <summary>
+        /// uploads an image 
+        /// </summary>
+        /// <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, Stream file);
+        
+    }
+  
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public class PetApi : IPetApi
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PetApi"/> class.
+        /// </summary>
+        /// <param name="apiClient"> an instance of ApiClient (optional)</param>
+        /// <returns></returns>
+        public PetApi(ApiClient apiClient = null)
+        {
+            if (apiClient == null) // use the default one in Configuration
+                this.ApiClient = Configuration.DefaultApiClient; 
+            else
+                this.ApiClient = apiClient;
+        }
+    
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PetApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public PetApi(String basePath)
+        {
+            this.ApiClient = new ApiClient(basePath);
+        }
+    
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <param name="basePath">The base path</param>
+        /// <value>The base path</value>
+        public void SetBasePath(String basePath)
+        {
+            this.ApiClient.BasePath = basePath;
+        }
+    
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <param name="basePath">The base path</param>
+        /// <value>The base path</value>
+        public String GetBasePath(String basePath)
+        {
+            return this.ApiClient.BasePath;
+        }
+    
+        /// <summary>
+        /// Gets or sets the API client.
+        /// </summary>
+        /// <value>An instance of the ApiClient</param>
+        public ApiClient ApiClient {get; set;}
+    
+        
+        /// <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)
+        {
+            
+    
+            var path = "/pet";
+            path = path.Replace("{format}", "json");
+            
+    
+            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;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdatePet: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdatePet: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        
+        /// <summary>
+        /// Add a new pet to the store 
+        /// </summary>
+        /// <param name="body">Pet object that needs to be added to the store</param> 
+        /// <returns></returns>            
+        public void AddPet (Pet body)
+        {
+            
+    
+            var path = "/pet";
+            path = path.Replace("{format}", "json");
+            
+    
+            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;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling AddPet: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling AddPet: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        
+        /// <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>List<Pet></returns>            
+        public List<Pet> FindPetsByStatus (List<string> status)
+        {
+            
+    
+            var path = "/pet/findByStatus";
+            path = path.Replace("{format}", "json");
+            
+    
+            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;
+    
+             if (status != null) queryParams.Add("status", ApiClient.ParameterToString(status)); // query parameter
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByStatus: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByStatus: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return (List<Pet>) ApiClient.Deserialize(response.Content, typeof(List<Pet>), response.Headers);
+        }
+    
+        
+        /// <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>            
+        public List<Pet> FindPetsByTags (List<string> tags)
+        {
+            
+    
+            var path = "/pet/findByTags";
+            path = path.Replace("{format}", "json");
+            
+    
+            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;
+    
+             if (tags != null) queryParams.Add("tags", ApiClient.ParameterToString(tags)); // query parameter
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByTags: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByTags: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return (List<Pet>) ApiClient.Deserialize(response.Content, typeof(List<Pet>), response.Headers);
+        }
+    
+        
+        /// <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)
+        {
+            
+            // 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}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
+            
+    
+            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;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "api_key", "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetPetById: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetPetById: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return (Pet) ApiClient.Deserialize(response.Content, typeof(Pet), response.Headers);
+        }
+    
+        
+        /// <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> 
+        /// <returns></returns>            
+        public void UpdatePetWithForm (string petId, string name, string status)
+        {
+            
+            // 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}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
+            
+    
+            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;
+    
+            
+            
+            if (name != null) formParams.Add("name", ApiClient.ParameterToString(name)); // form parameter
+            if (status != null) formParams.Add("status", ApiClient.ParameterToString(status)); // form parameter
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdatePetWithForm: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdatePetWithForm: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        
+        /// <summary>
+        /// Deletes a pet 
+        /// </summary>
+        /// <param name="petId">Pet id to delete</param> 
+        /// <param name="apiKey"></param> 
+        /// <returns></returns>            
+        public void DeletePet (long? petId, string apiKey)
+        {
+            
+            // verify the required parameter 'petId' is set
+            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling DeletePet");
+            
+    
+            var path = "/pet/{petId}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
+            
+    
+            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;
+    
+            
+             if (apiKey != null) headerParams.Add("api_key", ApiClient.ParameterToString(apiKey)); // header parameter
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling DeletePet: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling DeletePet: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        
+        /// <summary>
+        /// uploads an image 
+        /// </summary>
+        /// <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>            
+        public void UploadFile (long? petId, string additionalMetadata, Stream file)
+        {
+            
+            // verify the required parameter 'petId' is set
+            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UploadFile");
+            
+    
+            var path = "/pet/{petId}/uploadImage";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
+            
+    
+            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;
+    
+            
+            
+            if (additionalMetadata != null) formParams.Add("additionalMetadata", ApiClient.ParameterToString(additionalMetadata)); // form parameter
+            if (file != null) fileParams.Add("file", ApiClient.ParameterToFile("file", file));
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling UploadFile: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling UploadFile: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        
+    }
+    
+}
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
new file mode 100644
index 00000000000..c6c90631bef
--- /dev/null
+++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Api/StoreApi.cs
@@ -0,0 +1,263 @@
+using System;
+using System.IO;
+using System.Collections.Generic;
+using RestSharp;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
+
+namespace IO.Swagger.Api
+{
+    
+    public interface IStoreApi
+    {
+        
+        /// <summary>
+        /// Returns pet inventories by status Returns a map of status codes to quantities
+        /// </summary>
+        /// <returns>Dictionary<String, int?></returns>
+        Dictionary<String, int?> GetInventory ();
+        
+        /// <summary>
+        /// Place an order for a pet 
+        /// </summary>
+        /// <param name="body">order placed for purchasing the pet</param>
+        /// <returns>Order</returns>
+        Order PlaceOrder (Order body);
+        
+        /// <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>
+        Order GetOrderById (string orderId);
+        
+        /// <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>
+        /// <param name="orderId">ID of the order that needs to be deleted</param>
+        /// <returns></returns>
+        void DeleteOrder (string orderId);
+        
+    }
+  
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public class StoreApi : IStoreApi
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StoreApi"/> class.
+        /// </summary>
+        /// <param name="apiClient"> an instance of ApiClient (optional)</param>
+        /// <returns></returns>
+        public StoreApi(ApiClient apiClient = null)
+        {
+            if (apiClient == null) // use the default one in Configuration
+                this.ApiClient = Configuration.DefaultApiClient; 
+            else
+                this.ApiClient = apiClient;
+        }
+    
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StoreApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public StoreApi(String basePath)
+        {
+            this.ApiClient = new ApiClient(basePath);
+        }
+    
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <param name="basePath">The base path</param>
+        /// <value>The base path</value>
+        public void SetBasePath(String basePath)
+        {
+            this.ApiClient.BasePath = basePath;
+        }
+    
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <param name="basePath">The base path</param>
+        /// <value>The base path</value>
+        public String GetBasePath(String basePath)
+        {
+            return this.ApiClient.BasePath;
+        }
+    
+        /// <summary>
+        /// Gets or sets the API client.
+        /// </summary>
+        /// <value>An instance of the ApiClient</param>
+        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>            
+        public Dictionary<String, int?> GetInventory ()
+        {
+            
+    
+            var path = "/store/inventory";
+            path = path.Replace("{format}", "json");
+            
+    
+            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;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "api_key" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetInventory: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetInventory: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return (Dictionary<String, int?>) ApiClient.Deserialize(response.Content, typeof(Dictionary<String, int?>), response.Headers);
+        }
+    
+        
+        /// <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)
+        {
+            
+    
+            var path = "/store/order";
+            path = path.Replace("{format}", "json");
+            
+    
+            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;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling PlaceOrder: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling PlaceOrder: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return (Order) ApiClient.Deserialize(response.Content, typeof(Order), response.Headers);
+        }
+    
+        
+        /// <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)
+        {
+            
+            // 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}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "orderId" + "}", ApiClient.ParameterToString(orderId));
+            
+    
+            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;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetOrderById: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetOrderById: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return (Order) ApiClient.Deserialize(response.Content, typeof(Order), response.Headers);
+        }
+    
+        
+        /// <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>
+        /// <param name="orderId">ID of the order that needs to be deleted</param> 
+        /// <returns></returns>            
+        public void DeleteOrder (string orderId)
+        {
+            
+            // verify the required parameter 'orderId' is set
+            if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling DeleteOrder");
+            
+    
+            var path = "/store/order/{orderId}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "orderId" + "}", ApiClient.ParameterToString(orderId));
+            
+    
+            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;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling DeleteOrder: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling DeleteOrder: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        
+    }
+    
+}
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
new file mode 100644
index 00000000000..ae43e29ceaf
--- /dev/null
+++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Api/UserApi.cs
@@ -0,0 +1,460 @@
+using System;
+using System.IO;
+using System.Collections.Generic;
+using RestSharp;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
+
+namespace IO.Swagger.Api
+{
+    
+    public interface IUserApi
+    {
+        
+        /// <summary>
+        /// Create user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="body">Created user object</param>
+        /// <returns></returns>
+        void CreateUser (User body);
+        
+        /// <summary>
+        /// Creates list of users with given input array 
+        /// </summary>
+        /// <param name="body">List of user object</param>
+        /// <returns></returns>
+        void CreateUsersWithArrayInput (List<User> body);
+        
+        /// <summary>
+        /// Creates list of users with given input array 
+        /// </summary>
+        /// <param name="body">List of user object</param>
+        /// <returns></returns>
+        void CreateUsersWithListInput (List<User> body);
+        
+        /// <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>
+        string LoginUser (string username, string password);
+        
+        /// <summary>
+        /// Logs out current logged in user session 
+        /// </summary>
+        /// <returns></returns>
+        void LogoutUser ();
+        
+        /// <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>
+        User GetUserByName (string username);
+        
+        /// <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>
+        void UpdateUser (string username, User body);
+        
+        /// <summary>
+        /// Delete user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="username">The name that needs to be deleted</param>
+        /// <returns></returns>
+        void DeleteUser (string username);
+        
+    }
+  
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public class UserApi : IUserApi
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UserApi"/> class.
+        /// </summary>
+        /// <param name="apiClient"> an instance of ApiClient (optional)</param>
+        /// <returns></returns>
+        public UserApi(ApiClient apiClient = null)
+        {
+            if (apiClient == null) // use the default one in Configuration
+                this.ApiClient = Configuration.DefaultApiClient; 
+            else
+                this.ApiClient = apiClient;
+        }
+    
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UserApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public UserApi(String basePath)
+        {
+            this.ApiClient = new ApiClient(basePath);
+        }
+    
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <param name="basePath">The base path</param>
+        /// <value>The base path</value>
+        public void SetBasePath(String basePath)
+        {
+            this.ApiClient.BasePath = basePath;
+        }
+    
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <param name="basePath">The base path</param>
+        /// <value>The base path</value>
+        public String GetBasePath(String basePath)
+        {
+            return this.ApiClient.BasePath;
+        }
+    
+        /// <summary>
+        /// Gets or sets the API client.
+        /// </summary>
+        /// <value>An instance of the ApiClient</param>
+        public ApiClient ApiClient {get; set;}
+    
+        
+        /// <summary>
+        /// Create user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="body">Created user object</param> 
+        /// <returns></returns>            
+        public void CreateUser (User body)
+        {
+            
+    
+            var path = "/user";
+            path = path.Replace("{format}", "json");
+            
+    
+            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;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUser: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUser: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        
+        /// <summary>
+        /// Creates list of users with given input array 
+        /// </summary>
+        /// <param name="body">List of user object</param> 
+        /// <returns></returns>            
+        public void CreateUsersWithArrayInput (List<User> body)
+        {
+            
+    
+            var path = "/user/createWithArray";
+            path = path.Replace("{format}", "json");
+            
+    
+            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;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithArrayInput: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithArrayInput: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        
+        /// <summary>
+        /// Creates list of users with given input array 
+        /// </summary>
+        /// <param name="body">List of user object</param> 
+        /// <returns></returns>            
+        public void CreateUsersWithListInput (List<User> body)
+        {
+            
+    
+            var path = "/user/createWithList";
+            path = path.Replace("{format}", "json");
+            
+    
+            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;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithListInput: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithListInput: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        
+        /// <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, string password)
+        {
+            
+    
+            var path = "/user/login";
+            path = path.Replace("{format}", "json");
+            
+    
+            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;
+    
+             if (username != null) queryParams.Add("username", ApiClient.ParameterToString(username)); // query parameter
+             if (password != null) queryParams.Add("password", ApiClient.ParameterToString(password)); // query parameter
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling LoginUser: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling LoginUser: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return (string) ApiClient.Deserialize(response.Content, typeof(string), response.Headers);
+        }
+    
+        
+        /// <summary>
+        /// Logs out current logged in user session 
+        /// </summary>
+        /// <returns></returns>            
+        public void LogoutUser ()
+        {
+            
+    
+            var path = "/user/logout";
+            path = path.Replace("{format}", "json");
+            
+    
+            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;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling LogoutUser: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling LogoutUser: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        
+        /// <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)
+        {
+            
+            // 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}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username));
+            
+    
+            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;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetUserByName: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetUserByName: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return (User) ApiClient.Deserialize(response.Content, typeof(User), response.Headers);
+        }
+    
+        
+        /// <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)
+        {
+            
+            // 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}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username));
+            
+    
+            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;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdateUser: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdateUser: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        
+        /// <summary>
+        /// Delete user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="username">The name that needs to be deleted</param> 
+        /// <returns></returns>            
+        public void DeleteUser (string username)
+        {
+            
+            // verify the required parameter 'username' is set
+            if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling DeleteUser");
+            
+    
+            var path = "/user/{username}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username));
+            
+    
+            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;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling DeleteUser: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling DeleteUser: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        
+    }
+    
+}
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
new file mode 100644
index 00000000000..d4f32908b3d
--- /dev/null
+++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Client/ApiClient.cs
@@ -0,0 +1,296 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text.RegularExpressions;
+using System.IO;
+using System.Web;
+using System.Linq;
+using System.Net;
+using System.Text;
+using Newtonsoft.Json;
+using RestSharp;
+using RestSharp.Extensions;
+
+namespace IO.Swagger.Client
+{
+    /// <summary>
+    /// API client is mainly responible for making the HTTP call to the API backend.
+    /// </summary>
+    public class ApiClient
+    {
+        private readonly Dictionary<String, String> _defaultHeaderMap = new Dictionary<String, String>();
+  
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApiClient" /> class.
+        /// </summary>
+        /// <param name="basePath">The base path.</param>
+        public ApiClient(String basePath="http://petstore.swagger.io/v2")
+        {
+            BasePath = basePath;
+            RestClient = new RestClient(BasePath);
+        }
+    
+        /// <summary>
+        /// Gets or sets the base path.
+        /// </summary>
+        /// <value>The base path</value>
+        public string BasePath { get; set; }
+    
+        /// <summary>
+        /// Gets or sets the RestClient.
+        /// </summary>
+        /// <value>An instance of the RestClient</value>
+        public RestClient RestClient { get; set; }
+    
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        public Dictionary<String, String> DefaultHeader
+        {
+            get { return _defaultHeaderMap; }
+        }
+    
+        /// <summary>
+        /// Makes the HTTP request (Sync).
+        /// </summary>
+        /// <param name="path">URL path.</param>
+        /// <param name="method">HTTP method.</param>
+        /// <param name="queryParams">Query parameters.</param>
+        /// <param name="postBody">HTTP body (POST request).</param>
+        /// <param name="headerParams">Header parameters.</param>
+        /// <param name="formParams">Form parameters.</param>
+        /// <param name="fileParams">File parameters.</param>
+        /// <param name="authSettings">Authentication settings.</param>
+        /// <returns>Object</returns>
+        public Object CallApi(String path, RestSharp.Method method, Dictionary<String, String> queryParams, String postBody,
+            Dictionary<String, String> headerParams, Dictionary<String, String> formParams, 
+            Dictionary<String, FileParameter> fileParams, String[] authSettings)
+        {
+
+            var request = new RestRequest(path, method);
+   
+            UpdateParamsForAuth(queryParams, headerParams, authSettings);
+
+            // add default header, if any
+            foreach(var defaultHeader in _defaultHeaderMap)
+                request.AddHeader(defaultHeader.Key, defaultHeader.Value);
+
+            // add header parameter, if any
+            foreach(var param in headerParams)
+                request.AddHeader(param.Key, param.Value);
+
+            // add query parameter, if any
+            foreach(var param in queryParams)
+                request.AddParameter(param.Key, param.Value, ParameterType.GetOrPost);
+
+            // add form parameter, if any
+            foreach(var param in formParams)
+                request.AddParameter(param.Key, param.Value, ParameterType.GetOrPost);
+
+            // add file parameter, if any
+            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);
+
+            return (Object)RestClient.Execute(request);
+
+        }
+    
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        public void AddDefaultHeader(string key, string value)
+        {
+            _defaultHeaderMap.Add(key, value);
+        }
+    
+        /// <summary>
+        /// Escape string (url-encoded).
+        /// </summary>
+        /// <param name="str">String to be escaped.</param>
+        /// <returns>Escaped string.</returns>
+        public string EscapeString(string str)
+        {
+            return RestSharp.Contrib.HttpUtility.UrlEncode(str);
+        }
+    
+        /// <summary>
+        /// Create FileParameter based on Stream.
+        /// </summary>
+        /// <param name="name">Parameter name.</param>
+        /// <param name="stream">Input stream.</param>
+        /// <returns>FileParameter.</returns>
+        public FileParameter ParameterToFile(string name, Stream stream)
+        {
+            if (stream is FileStream)
+                return FileParameter.Create(name, stream.ReadAsBytes(), Path.GetFileName(((FileStream)stream).Name));
+            else
+                return FileParameter.Create(name, stream.ReadAsBytes(), "no_file_name_provided");
+        }
+    
+        /// <summary>
+        /// If parameter is DateTime, output in ISO8601 format.
+        /// If parameter is a list of string, join the list with ",".
+        /// Otherwise just return the string.
+        /// </summary>
+        /// <param name="obj">The parameter (header, path, query, form).</param>
+        /// <returns>Formatted string.</returns>
+        public string ParameterToString(object obj)
+        {
+            if (obj is DateTime)
+                return ((DateTime)obj).ToString ("u");
+            else if (obj is List<string>)
+                return String.Join(",", (obj as List<string>).ToArray());
+            else
+                return Convert.ToString (obj);
+        }
+    
+        /// <summary>
+        /// Deserialize the JSON string into a proper object.
+        /// </summary>
+        /// <param name="content">HTTP body (e.g. string, JSON).</param>
+        /// <param name="type">Object type.</param>
+        /// <returns>Object representation of the JSON string.</returns>
+        public object Deserialize(string content, Type type, IList<Parameter> headers=null)
+        {
+            if (type == typeof(Object)) // return an object
+            {
+                return content;
+            }
+
+            if (type == typeof(Stream))
+            {
+                var filePath = String.IsNullOrEmpty(Configuration.TempFolderPath)
+                    ? Path.GetTempPath()
+                    : Configuration.TempFolderPath;
+
+                var fileName = filePath + Guid.NewGuid();
+                if (headers != null)
+                {
+                    var regex = new Regex(@"Content-Disposition:.*filename=['""]?([^'""\s]+)['""]?$");
+                    var match = regex.Match(headers.ToString());
+                    if (match.Success)
+                        fileName = filePath + match.Value.Replace("\"", "").Replace("'", "");
+                }
+                File.WriteAllText(fileName, content);
+                return new FileStream(fileName, FileMode.Open);
+
+            }
+
+            if (type.Name.StartsWith("System.Nullable`1[[System.DateTime")) // return a datetime object
+            {
+                return DateTime.Parse(content,  null, System.Globalization.DateTimeStyles.RoundtripKind);
+            }
+
+            if (type == typeof(String) || type.Name.StartsWith("System.Nullable")) // return primitive type
+            {
+                return ConvertType(content, type); 
+            }
+    
+            // at this point, it must be a model (json)
+            try
+            {
+                return JsonConvert.DeserializeObject(content, type);
+            }
+            catch (IOException e)
+            {
+                throw new ApiException(500, e.Message);
+            }
+        }
+    
+        /// <summary>
+        /// Serialize an object into JSON string.
+        /// </summary>
+        /// <param name="obj">Object.</param>
+        /// <returns>JSON string.</returns>
+        public string Serialize(object obj)
+        {
+            try
+            {
+                return obj != null ? JsonConvert.SerializeObject(obj) : null;
+            }
+            catch (Exception e)
+            {
+                throw new ApiException(500, e.Message);
+            }
+        }
+    
+        /// <summary>
+        /// Get the API key with prefix.
+        /// </summary>
+        /// <param name="apiKeyIdentifier">API key identifier (authentication scheme).</param>
+        /// <returns>API key with prefix.</returns>
+        public string GetApiKeyWithPrefix (string apiKeyIdentifier)
+        {
+            var apiKeyValue = "";
+            Configuration.ApiKey.TryGetValue (apiKeyIdentifier, out apiKeyValue);
+            var apiKeyPrefix = "";
+            if (Configuration.ApiKeyPrefix.TryGetValue (apiKeyIdentifier, out apiKeyPrefix))
+                return apiKeyPrefix + " " + apiKeyValue;
+            else
+                return apiKeyValue;
+        }
+    
+        /// <summary>
+        /// Update parameters based on authentication.
+        /// </summary>
+        /// <param name="queryParams">Query parameters.</param>
+        /// <param name="headerParams">Header parameters.</param>
+        /// <param name="authSettings">Authentication settings.</param>
+        public void UpdateParamsForAuth(Dictionary<String, String> queryParams, Dictionary<String, String> headerParams, string[] authSettings)
+        {
+            if (authSettings == null || authSettings.Length == 0)
+                return;
+
+            foreach (string auth in authSettings)
+            {
+                // determine which one to use
+                switch(auth)
+                {
+                    
+                    case "api_key":
+                        headerParams["api_key"] = GetApiKeyWithPrefix("api_key");
+                        
+                        break;
+                    
+                    case "petstore_auth":
+                        
+                        //TODO support oauth
+                        break;
+                    
+                    default:
+                        //TODO show warning about security definition not found
+                        break;
+                }
+            }
+        }
+ 
+        /// <summary>
+        /// Encode string in base64 format.
+        /// </summary>
+        /// <param name="text">String to be encoded.</param>
+        /// <returns>Encoded string.</returns>
+        public static string Base64Encode(string text)
+        {
+            var textByte = System.Text.Encoding.UTF8.GetBytes(text);
+            return System.Convert.ToBase64String(textByte);
+        }
+    
+        /// <summary>
+        /// Dynamically cast the object into target type.
+        /// Ref: http://stackoverflow.com/questions/4925718/c-dynamic-runtime-cast
+        /// </summary>
+        /// <param name="source">Object to be casted</param>
+        /// <param name="dest">Target type</param>
+        /// <returns>Casted object</returns>
+        public static Object ConvertType(Object source, Type dest) {
+            return Convert.ChangeType(source, dest);
+        }
+  
+    }
+}
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
new file mode 100644
index 00000000000..ff0b4be791e
--- /dev/null
+++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Client/ApiException.cs
@@ -0,0 +1,48 @@
+using System;
+
+namespace IO.Swagger.Client {
+  /// <summary>
+  /// API Exception
+  /// </summary>
+  public class ApiException : Exception {
+      /// <summary>
+      /// Gets or sets the error code (HTTP status code)
+      /// </summary>
+      /// <value>The error code (HTTP status code).</value>
+      public int ErrorCode { get; set; }
+
+      /// <summary>
+      /// Gets or sets the error content (body json object)
+      /// </summary>
+      /// <value>The error content (Http response body).</value>
+      public Object ErrorContent { get; private set; }
+
+      /// <summary>
+      /// Initializes a new instance of the <see cref="ApiException"/> class.
+      /// </summary>
+      /// <param name="basePath">The base path.</param>
+      public ApiException() {}
+
+      /// <summary>
+      /// Initializes a new instance of the <see cref="ApiException"/> class.
+      /// </summary>
+      /// <param name="errorCode">HTTP status code.</param>
+      /// <param name="message">Error message.</param>
+      public ApiException(int errorCode, string message) : base(message) {
+          this.ErrorCode = errorCode;
+      }
+
+      /// <summary>
+      /// Initializes a new instance of the <see cref="ApiException"/> class.
+      /// </summary>
+      /// <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, Object errorContent = null) : base(message) {
+          this.ErrorCode = errorCode;
+          this.ErrorContent = errorContent;
+      }
+
+  }
+
+}
diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Client/Configuration.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Client/Configuration.cs
new file mode 100644
index 00000000000..80df0f4ec72
--- /dev/null
+++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Client/Configuration.cs
@@ -0,0 +1,99 @@
+using System;
+using System.Reflection;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace IO.Swagger.Client
+{
+    /// <summary>
+    /// Represents a set of configuration settings
+    /// </summary>
+    public class Configuration
+    {
+  
+        /// <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 API client for making HTTP calls.
+        /// </summary>
+        /// <value>The API client.</value>
+        public static ApiClient DefaultApiClient = new ApiClient();
+  
+        /// <summary>
+        /// Gets or sets the username (HTTP basic authentication).
+        /// </summary>
+        /// <value>The username.</value>
+        public static String Username { get; set; }
+  
+        /// <summary>
+        /// Gets or sets the password (HTTP basic authentication).
+        /// </summary>
+        /// <value>The password.</value>
+        public static String Password { get; set; }
+  
+        /// <summary>
+        /// Gets or sets the API key based on the authentication name.
+        /// </summary>
+        /// <value>The API key.</value>
+        public static 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>
+        /// <value>The prefix of the API key.</value>
+        public static Dictionary<String, String> ApiKeyPrefix = new Dictionary<String, String>();
+  
+        private static string _tempFolderPath = Path.GetTempPath();
+  
+        /// <summary>
+        /// Gets or sets the temporary folder path to store the files downloaded from the server.
+        /// </summary>
+        /// <value>Folder path.</value>
+        public static String TempFolderPath
+        {
+            get { return _tempFolderPath; }
+  
+            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;
+                else
+                    _tempFolderPath = value  + Path.DirectorySeparatorChar;
+            }
+        }
+  
+        /// <summary>
+        /// Returns a string with essential information for debugging.
+        /// </summary>
+        public static String ToDebugReport()
+        {
+            String report = "C# SDK (IO.Swagger) Debug Report:\n";
+            report += "    OS: " + Environment.OSVersion + "\n";
+            report += "    .NET Framework Version: " + Assembly
+                     .GetExecutingAssembly()
+                     .GetReferencedAssemblies()
+                     .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-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Model/Category.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Model/Category.cs
new file mode 100644
index 00000000000..a11c0761d2d
--- /dev/null
+++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Model/Category.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+
+namespace IO.Swagger.Model {
+
+  /// <summary>
+  /// 
+  /// </summary>
+  [DataContract]
+  public class Category {
+    
+    /// <summary>
+    /// Gets or Sets Id
+    /// </summary>
+    [DataMember(Name="id", EmitDefaultValue=false)]
+    [JsonProperty(PropertyName = "id")]
+    public long? Id { get; set; }
+
+    
+    /// <summary>
+    /// Gets or Sets Name
+    /// </summary>
+    [DataMember(Name="name", EmitDefaultValue=false)]
+    [JsonProperty(PropertyName = "name")]
+    public string Name { get; set; }
+
+    
+
+    /// <summary>
+    /// Get 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>
+    /// Get 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);
+    }
+
+}
+}
diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Model/Order.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Model/Order.cs
new file mode 100644
index 00000000000..17890990aa6
--- /dev/null
+++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Model/Order.cs
@@ -0,0 +1,99 @@
+using System;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+
+namespace IO.Swagger.Model {
+
+  /// <summary>
+  /// 
+  /// </summary>
+  [DataContract]
+  public class Order {
+    
+    /// <summary>
+    /// Gets or Sets Id
+    /// </summary>
+    [DataMember(Name="id", EmitDefaultValue=false)]
+    [JsonProperty(PropertyName = "id")]
+    public long? Id { get; set; }
+
+    
+    /// <summary>
+    /// Gets or Sets PetId
+    /// </summary>
+    [DataMember(Name="petId", EmitDefaultValue=false)]
+    [JsonProperty(PropertyName = "petId")]
+    public long? PetId { get; set; }
+
+    
+    /// <summary>
+    /// Gets or Sets Quantity
+    /// </summary>
+    [DataMember(Name="quantity", EmitDefaultValue=false)]
+    [JsonProperty(PropertyName = "quantity")]
+    public int? Quantity { get; set; }
+
+    
+    /// <summary>
+    /// Gets or Sets ShipDate
+    /// </summary>
+    [DataMember(Name="shipDate", EmitDefaultValue=false)]
+    [JsonProperty(PropertyName = "shipDate")]
+    public DateTime? ShipDate { get; set; }
+
+    
+    /// <summary>
+    /// Order Status
+    /// </summary>
+    /// <value>Order Status</value>
+    [DataMember(Name="status", EmitDefaultValue=false)]
+    [JsonProperty(PropertyName = "status")]
+    public string Status { get; set; }
+
+    
+    /// <summary>
+    /// Gets or Sets Complete
+    /// </summary>
+    [DataMember(Name="complete", EmitDefaultValue=false)]
+    [JsonProperty(PropertyName = "complete")]
+    public bool? Complete { get; set; }
+
+    
+
+    /// <summary>
+    /// Get 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>
+    /// Get 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);
+    }
+
+}
+}
diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Model/Pet.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Model/Pet.cs
new file mode 100644
index 00000000000..14f285794ad
--- /dev/null
+++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Model/Pet.cs
@@ -0,0 +1,99 @@
+using System;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+
+namespace IO.Swagger.Model {
+
+  /// <summary>
+  /// 
+  /// </summary>
+  [DataContract]
+  public class Pet {
+    
+    /// <summary>
+    /// Gets or Sets Id
+    /// </summary>
+    [DataMember(Name="id", EmitDefaultValue=false)]
+    [JsonProperty(PropertyName = "id")]
+    public long? Id { get; set; }
+
+    
+    /// <summary>
+    /// Gets or Sets Category
+    /// </summary>
+    [DataMember(Name="category", EmitDefaultValue=false)]
+    [JsonProperty(PropertyName = "category")]
+    public Category Category { get; set; }
+
+    
+    /// <summary>
+    /// Gets or Sets Name
+    /// </summary>
+    [DataMember(Name="name", EmitDefaultValue=false)]
+    [JsonProperty(PropertyName = "name")]
+    public string Name { get; set; }
+
+    
+    /// <summary>
+    /// Gets or Sets PhotoUrls
+    /// </summary>
+    [DataMember(Name="photoUrls", EmitDefaultValue=false)]
+    [JsonProperty(PropertyName = "photoUrls")]
+    public List<string> PhotoUrls { get; set; }
+
+    
+    /// <summary>
+    /// Gets or Sets Tags
+    /// </summary>
+    [DataMember(Name="tags", EmitDefaultValue=false)]
+    [JsonProperty(PropertyName = "tags")]
+    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)]
+    [JsonProperty(PropertyName = "status")]
+    public string Status { get; set; }
+
+    
+
+    /// <summary>
+    /// Get 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>
+    /// Get 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);
+    }
+
+}
+}
diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Model/Tag.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Model/Tag.cs
new file mode 100644
index 00000000000..9a784e07a7e
--- /dev/null
+++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Model/Tag.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+
+namespace IO.Swagger.Model {
+
+  /// <summary>
+  /// 
+  /// </summary>
+  [DataContract]
+  public class Tag {
+    
+    /// <summary>
+    /// Gets or Sets Id
+    /// </summary>
+    [DataMember(Name="id", EmitDefaultValue=false)]
+    [JsonProperty(PropertyName = "id")]
+    public long? Id { get; set; }
+
+    
+    /// <summary>
+    /// Gets or Sets Name
+    /// </summary>
+    [DataMember(Name="name", EmitDefaultValue=false)]
+    [JsonProperty(PropertyName = "name")]
+    public string Name { get; set; }
+
+    
+
+    /// <summary>
+    /// Get 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>
+    /// Get 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);
+    }
+
+}
+}
diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Model/User.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Model/User.cs
new file mode 100644
index 00000000000..ee7d6b035a3
--- /dev/null
+++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Model/User.cs
@@ -0,0 +1,119 @@
+using System;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+
+namespace IO.Swagger.Model {
+
+  /// <summary>
+  /// 
+  /// </summary>
+  [DataContract]
+  public class User {
+    
+    /// <summary>
+    /// Gets or Sets Id
+    /// </summary>
+    [DataMember(Name="id", EmitDefaultValue=false)]
+    [JsonProperty(PropertyName = "id")]
+    public long? Id { get; set; }
+
+    
+    /// <summary>
+    /// Gets or Sets Username
+    /// </summary>
+    [DataMember(Name="username", EmitDefaultValue=false)]
+    [JsonProperty(PropertyName = "username")]
+    public string Username { get; set; }
+
+    
+    /// <summary>
+    /// Gets or Sets FirstName
+    /// </summary>
+    [DataMember(Name="firstName", EmitDefaultValue=false)]
+    [JsonProperty(PropertyName = "firstName")]
+    public string FirstName { get; set; }
+
+    
+    /// <summary>
+    /// Gets or Sets LastName
+    /// </summary>
+    [DataMember(Name="lastName", EmitDefaultValue=false)]
+    [JsonProperty(PropertyName = "lastName")]
+    public string LastName { get; set; }
+
+    
+    /// <summary>
+    /// Gets or Sets Email
+    /// </summary>
+    [DataMember(Name="email", EmitDefaultValue=false)]
+    [JsonProperty(PropertyName = "email")]
+    public string Email { get; set; }
+
+    
+    /// <summary>
+    /// Gets or Sets Password
+    /// </summary>
+    [DataMember(Name="password", EmitDefaultValue=false)]
+    [JsonProperty(PropertyName = "password")]
+    public string Password { get; set; }
+
+    
+    /// <summary>
+    /// Gets or Sets Phone
+    /// </summary>
+    [DataMember(Name="phone", EmitDefaultValue=false)]
+    [JsonProperty(PropertyName = "phone")]
+    public string Phone { get; set; }
+
+    
+    /// <summary>
+    /// User Status
+    /// </summary>
+    /// <value>User Status</value>
+    [DataMember(Name="userStatus", EmitDefaultValue=false)]
+    [JsonProperty(PropertyName = "userStatus")]
+    public int? UserStatus { get; set; }
+
+    
+
+    /// <summary>
+    /// Get 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>
+    /// Get 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);
+    }
+
+}
+}
diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/vendor/packages.config b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/vendor/packages.config
new file mode 100644
index 00000000000..7b9cf186303
--- /dev/null
+++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/vendor/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="RestSharp.Net2" version="1.1.11" targetFramework="net20" developmentDependency="true" />
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net20" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/README.md b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/README.md
new file mode 100644
index 00000000000..bbab203d23f
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/README.md
@@ -0,0 +1,15 @@
+## Frameworks supported
+- .NET 3.5 or later
+- Windows Phone 7.1 (Mango)
+
+## Dependencies
+- [RestSharp] (https://www.nuget.org/packages/RestSharp)
+- [Json.NET] (https://www.nuget.org/packages/Newtonsoft.Json/)
+
+
+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:
+```
+Install-Package RestSharp
+Install-Package Newtonsoft.Json
+``` 
+
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
new file mode 100644
index 00000000000..ae725c4b598
Binary files /dev/null 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
new file mode 100644
index 00000000000..a7331ed6e23
Binary files /dev/null and b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/bin/RestSharp.dll differ
diff --git a/samples/client/petstore/csharp/compile.bat b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/compile.bat
similarity index 55%
rename from samples/client/petstore/csharp/compile.bat
rename to samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/compile.bat
index 63b79e03eed..90963356690 100644
--- a/samples/client/petstore/csharp/compile.bat
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/compile.bat
@@ -1,3 +1,3 @@
 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.Client.dll /recurse:src\*.cs /doc:bin/IO.Swagger.Client.xml
+%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/src/main/csharp/IO/Swagger/Api/PetApi.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs
new file mode 100644
index 00000000000..9f3bb5501b5
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs
@@ -0,0 +1,855 @@
+using System;
+using System.IO;
+using System.Collections.Generic;
+using RestSharp;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
+
+namespace IO.Swagger.Api
+{
+    
+    public interface IPetApi
+    {
+        
+        /// <summary>
+        /// Update an existing pet 
+        /// </summary>
+        /// <param name="body">Pet object that needs to be added to the store</param>
+        /// <returns></returns>
+        void UpdatePet (Pet body);
+  
+        /// <summary>
+        /// Update an existing pet 
+        /// </summary>
+        /// <param name="body">Pet object that needs to be added to the store</param>
+        /// <returns></returns>
+        System.Threading.Tasks.Task UpdatePetAsync (Pet body);
+        
+        /// <summary>
+        /// Add a new pet to the store 
+        /// </summary>
+        /// <param name="body">Pet object that needs to be added to the store</param>
+        /// <returns></returns>
+        void AddPet (Pet body);
+  
+        /// <summary>
+        /// Add a new pet to the store 
+        /// </summary>
+        /// <param name="body">Pet object that needs to be added to the store</param>
+        /// <returns></returns>
+        System.Threading.Tasks.Task AddPetAsync (Pet body);
+        
+        /// <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>List<Pet></returns>
+        List<Pet> FindPetsByStatus (List<string> status);
+  
+        /// <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>List<Pet></returns>
+        System.Threading.Tasks.Task<List<Pet>> FindPetsByStatusAsync (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>
+        List<Pet> FindPetsByTags (List<string> tags);
+  
+        /// <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>
+        System.Threading.Tasks.Task<List<Pet>> FindPetsByTagsAsync (List<string> tags);
+        
+        /// <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>
+        Pet GetPetById (long? petId);
+  
+        /// <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>
+        System.Threading.Tasks.Task<Pet> GetPetByIdAsync (long? petId);
+        
+        /// <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>
+        /// <returns></returns>
+        void UpdatePetWithForm (string petId, string name, string status);
+  
+        /// <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>
+        /// <returns></returns>
+        System.Threading.Tasks.Task UpdatePetWithFormAsync (string petId, string name, string status);
+        
+        /// <summary>
+        /// Deletes a pet 
+        /// </summary>
+        /// <param name="petId">Pet id to delete</param>
+        /// <param name="apiKey"></param>
+        /// <returns></returns>
+        void DeletePet (long? petId, string apiKey);
+  
+        /// <summary>
+        /// Deletes a pet 
+        /// </summary>
+        /// <param name="petId">Pet id to delete</param>
+        /// <param name="apiKey"></param>
+        /// <returns></returns>
+        System.Threading.Tasks.Task DeletePetAsync (long? petId, string apiKey);
+        
+        /// <summary>
+        /// uploads an image 
+        /// </summary>
+        /// <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, Stream file);
+  
+        /// <summary>
+        /// uploads an image 
+        /// </summary>
+        /// <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>
+        System.Threading.Tasks.Task UploadFileAsync (long? petId, string additionalMetadata, Stream file);
+        
+    }
+  
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public class PetApi : IPetApi
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PetApi"/> class.
+        /// </summary>
+        /// <param name="apiClient"> an instance of ApiClient (optional)</param>
+        /// <returns></returns>
+        public PetApi(ApiClient apiClient = null)
+        {
+            if (apiClient == null) // use the default one in Configuration
+                this.ApiClient = Configuration.DefaultApiClient; 
+            else
+                this.ApiClient = apiClient;
+        }
+    
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PetApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public PetApi(String basePath)
+        {
+            this.ApiClient = new ApiClient(basePath);
+        }
+    
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <param name="basePath">The base path</param>
+        /// <value>The base path</value>
+        public void SetBasePath(String basePath)
+        {
+            this.ApiClient.BasePath = basePath;
+        }
+    
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <param name="basePath">The base path</param>
+        /// <value>The base path</value>
+        public String GetBasePath(String basePath)
+        {
+            return this.ApiClient.BasePath;
+        }
+    
+        /// <summary>
+        /// Gets or sets the API client.
+        /// </summary>
+        /// <value>An instance of the ApiClient</param>
+        public ApiClient ApiClient {get; set;}
+    
+        
+        /// <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)
+        {
+            
+    
+            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;
+
+            pathParams.Add("format", "json");
+            
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdatePet: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdatePet: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        /// <summary>
+        /// Update an existing pet 
+        /// </summary>
+        /// <param name="body">Pet object that needs to be added to the store</param>
+        /// <returns></returns>
+        public async System.Threading.Tasks.Task UpdatePetAsync (Pet body)
+        {
+            
+    
+            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;
+    
+            pathParams.Add("format", "json");
+            
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdatePet: " + response.Content, response.Content);
+
+            
+            return;
+        }
+        
+        /// <summary>
+        /// Add a new pet to the store 
+        /// </summary>
+        /// <param name="body">Pet object that needs to be added to the store</param> 
+        /// <returns></returns>            
+        public void AddPet (Pet body)
+        {
+            
+    
+            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;
+
+            pathParams.Add("format", "json");
+            
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling AddPet: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling AddPet: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        /// <summary>
+        /// Add a new pet to the store 
+        /// </summary>
+        /// <param name="body">Pet object that needs to be added to the store</param>
+        /// <returns></returns>
+        public async System.Threading.Tasks.Task AddPetAsync (Pet body)
+        {
+            
+    
+            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;
+    
+            pathParams.Add("format", "json");
+            
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling AddPet: " + response.Content, response.Content);
+
+            
+            return;
+        }
+        
+        /// <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>List<Pet></returns>            
+        public List<Pet> FindPetsByStatus (List<string> status)
+        {
+            
+    
+            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;
+
+            pathParams.Add("format", "json");
+            
+            if (status != null) queryParams.Add("status", ApiClient.ParameterToString(status)); // query parameter
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByStatus: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByStatus: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return (List<Pet>) ApiClient.Deserialize(response.Content, typeof(List<Pet>), response.Headers);
+        }
+    
+        /// <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>List<Pet></returns>
+        public async System.Threading.Tasks.Task<List<Pet>> FindPetsByStatusAsync (List<string> status)
+        {
+            
+    
+            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;
+    
+            pathParams.Add("format", "json");
+            
+            if (status != null) queryParams.Add("status", ApiClient.ParameterToString(status)); // query parameter
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByStatus: " + response.Content, response.Content);
+
+            return (List<Pet>) ApiClient.Deserialize(response.Content, typeof(List<Pet>), response.Headers);
+        }
+        
+        /// <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>            
+        public List<Pet> FindPetsByTags (List<string> tags)
+        {
+            
+    
+            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;
+
+            pathParams.Add("format", "json");
+            
+            if (tags != null) queryParams.Add("tags", ApiClient.ParameterToString(tags)); // query parameter
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByTags: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByTags: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return (List<Pet>) ApiClient.Deserialize(response.Content, typeof(List<Pet>), response.Headers);
+        }
+    
+        /// <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>
+        public async System.Threading.Tasks.Task<List<Pet>> FindPetsByTagsAsync (List<string> tags)
+        {
+            
+    
+            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;
+    
+            pathParams.Add("format", "json");
+            
+            if (tags != null) queryParams.Add("tags", ApiClient.ParameterToString(tags)); // query parameter
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByTags: " + response.Content, response.Content);
+
+            return (List<Pet>) ApiClient.Deserialize(response.Content, typeof(List<Pet>), response.Headers);
+        }
+        
+        /// <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)
+        {
+            
+            // 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;
+
+            pathParams.Add("format", "json");
+            if (petId != null) pathParams.Add("petId", ApiClient.ParameterToString(petId)); // path parameter
+            
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "api_key", "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetPetById: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetPetById: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return (Pet) ApiClient.Deserialize(response.Content, typeof(Pet), response.Headers);
+        }
+    
+        /// <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 async System.Threading.Tasks.Task<Pet> GetPetByIdAsync (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;
+    
+            pathParams.Add("format", "json");
+            if (petId != null) pathParams.Add("petId", ApiClient.ParameterToString(petId)); // path parameter
+            
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "api_key", "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetPetById: " + response.Content, response.Content);
+
+            return (Pet) ApiClient.Deserialize(response.Content, typeof(Pet), response.Headers);
+        }
+        
+        /// <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> 
+        /// <returns></returns>            
+        public void UpdatePetWithForm (string petId, string name, string status)
+        {
+            
+            // 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 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;
+
+            pathParams.Add("format", "json");
+            if (petId != null) pathParams.Add("petId", ApiClient.ParameterToString(petId)); // path parameter
+            
+            
+            
+            if (name != null) formParams.Add("name", ApiClient.ParameterToString(name)); // form parameter
+            if (status != null) formParams.Add("status", ApiClient.ParameterToString(status)); // form parameter
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdatePetWithForm: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdatePetWithForm: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        /// <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>
+        /// <returns></returns>
+        public async System.Threading.Tasks.Task UpdatePetWithFormAsync (string petId, string name, string status)
+        {
+            // 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 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;
+    
+            pathParams.Add("format", "json");
+            if (petId != null) pathParams.Add("petId", ApiClient.ParameterToString(petId)); // path parameter
+            
+            
+            
+            if (name != null) formParams.Add("name", ApiClient.ParameterToString(name)); // form parameter
+            if (status != null) formParams.Add("status", ApiClient.ParameterToString(status)); // form parameter
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdatePetWithForm: " + response.Content, response.Content);
+
+            
+            return;
+        }
+        
+        /// <summary>
+        /// Deletes a pet 
+        /// </summary>
+        /// <param name="petId">Pet id to delete</param> 
+        /// <param name="apiKey"></param> 
+        /// <returns></returns>            
+        public void DeletePet (long? petId, string apiKey)
+        {
+            
+            // verify the required parameter 'petId' is set
+            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling DeletePet");
+            
+    
+            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;
+
+            pathParams.Add("format", "json");
+            if (petId != null) pathParams.Add("petId", ApiClient.ParameterToString(petId)); // path parameter
+            
+            
+            if (apiKey != null) headerParams.Add("api_key", ApiClient.ParameterToString(apiKey)); // header parameter
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling DeletePet: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling DeletePet: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        /// <summary>
+        /// Deletes a pet 
+        /// </summary>
+        /// <param name="petId">Pet id to delete</param>
+        /// <param name="apiKey"></param>
+        /// <returns></returns>
+        public async System.Threading.Tasks.Task DeletePetAsync (long? petId, string apiKey)
+        {
+            // verify the required parameter 'petId' is set
+            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling DeletePet");
+            
+    
+            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;
+    
+            pathParams.Add("format", "json");
+            if (petId != null) pathParams.Add("petId", ApiClient.ParameterToString(petId)); // path parameter
+            
+            
+            if (apiKey != null) headerParams.Add("api_key", ApiClient.ParameterToString(apiKey)); // header parameter
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling DeletePet: " + response.Content, response.Content);
+
+            
+            return;
+        }
+        
+        /// <summary>
+        /// uploads an image 
+        /// </summary>
+        /// <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>            
+        public void UploadFile (long? petId, string additionalMetadata, Stream file)
+        {
+            
+            // verify the required parameter 'petId' is set
+            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UploadFile");
+            
+    
+            var path = "/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;
+
+            pathParams.Add("format", "json");
+            if (petId != null) pathParams.Add("petId", ApiClient.ParameterToString(petId)); // path parameter
+            
+            
+            
+            if (additionalMetadata != null) formParams.Add("additionalMetadata", ApiClient.ParameterToString(additionalMetadata)); // form parameter
+            if (file != null) fileParams.Add("file", ApiClient.ParameterToFile("file", file));
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling UploadFile: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling UploadFile: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        /// <summary>
+        /// uploads an image 
+        /// </summary>
+        /// <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>
+        public async System.Threading.Tasks.Task UploadFileAsync (long? petId, string additionalMetadata, Stream file)
+        {
+            // verify the required parameter 'petId' is set
+            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UploadFile");
+            
+    
+            var path = "/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;
+    
+            pathParams.Add("format", "json");
+            if (petId != null) pathParams.Add("petId", ApiClient.ParameterToString(petId)); // path parameter
+            
+            
+            
+            if (additionalMetadata != null) formParams.Add("additionalMetadata", ApiClient.ParameterToString(additionalMetadata)); // form parameter
+            if (file != null) fileParams.Add("file", ApiClient.ParameterToFile("file", file));
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling UploadFile: " + response.Content, response.Content);
+
+            
+            return;
+        }
+        
+    }
+    
+}
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
new file mode 100644
index 00000000000..6dfd81bd99d
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs
@@ -0,0 +1,441 @@
+using System;
+using System.IO;
+using System.Collections.Generic;
+using RestSharp;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
+
+namespace IO.Swagger.Api
+{
+    
+    public interface IStoreApi
+    {
+        
+        /// <summary>
+        /// Returns pet inventories by status Returns a map of status codes to quantities
+        /// </summary>
+        /// <returns>Dictionary<String, int?></returns>
+        Dictionary<String, int?> GetInventory ();
+  
+        /// <summary>
+        /// Returns pet inventories by status Returns a map of status codes to quantities
+        /// </summary>
+        /// <returns>Dictionary<String, int?></returns>
+        System.Threading.Tasks.Task<Dictionary<String, int?>> GetInventoryAsync ();
+        
+        /// <summary>
+        /// Place an order for a pet 
+        /// </summary>
+        /// <param name="body">order placed for purchasing the pet</param>
+        /// <returns>Order</returns>
+        Order PlaceOrder (Order body);
+  
+        /// <summary>
+        /// Place an order for a pet 
+        /// </summary>
+        /// <param name="body">order placed for purchasing the pet</param>
+        /// <returns>Order</returns>
+        System.Threading.Tasks.Task<Order> PlaceOrderAsync (Order body);
+        
+        /// <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>
+        Order GetOrderById (string orderId);
+  
+        /// <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>
+        System.Threading.Tasks.Task<Order> GetOrderByIdAsync (string orderId);
+        
+        /// <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>
+        /// <param name="orderId">ID of the order that needs to be deleted</param>
+        /// <returns></returns>
+        void DeleteOrder (string orderId);
+  
+        /// <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>
+        /// <param name="orderId">ID of the order that needs to be deleted</param>
+        /// <returns></returns>
+        System.Threading.Tasks.Task DeleteOrderAsync (string orderId);
+        
+    }
+  
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public class StoreApi : IStoreApi
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StoreApi"/> class.
+        /// </summary>
+        /// <param name="apiClient"> an instance of ApiClient (optional)</param>
+        /// <returns></returns>
+        public StoreApi(ApiClient apiClient = null)
+        {
+            if (apiClient == null) // use the default one in Configuration
+                this.ApiClient = Configuration.DefaultApiClient; 
+            else
+                this.ApiClient = apiClient;
+        }
+    
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StoreApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public StoreApi(String basePath)
+        {
+            this.ApiClient = new ApiClient(basePath);
+        }
+    
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <param name="basePath">The base path</param>
+        /// <value>The base path</value>
+        public void SetBasePath(String basePath)
+        {
+            this.ApiClient.BasePath = basePath;
+        }
+    
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <param name="basePath">The base path</param>
+        /// <value>The base path</value>
+        public String GetBasePath(String basePath)
+        {
+            return this.ApiClient.BasePath;
+        }
+    
+        /// <summary>
+        /// Gets or sets the API client.
+        /// </summary>
+        /// <value>An instance of the ApiClient</param>
+        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>            
+        public Dictionary<String, int?> GetInventory ()
+        {
+            
+    
+            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;
+
+            pathParams.Add("format", "json");
+            
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "api_key" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetInventory: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetInventory: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return (Dictionary<String, int?>) ApiClient.Deserialize(response.Content, typeof(Dictionary<String, int?>), response.Headers);
+        }
+    
+        /// <summary>
+        /// Returns pet inventories by status Returns a map of status codes to quantities
+        /// </summary>
+        /// <returns>Dictionary<String, int?></returns>
+        public async System.Threading.Tasks.Task<Dictionary<String, int?>> GetInventoryAsync ()
+        {
+            
+    
+            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;
+    
+            pathParams.Add("format", "json");
+            
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "api_key" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetInventory: " + response.Content, response.Content);
+
+            return (Dictionary<String, int?>) ApiClient.Deserialize(response.Content, typeof(Dictionary<String, int?>), response.Headers);
+        }
+        
+        /// <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)
+        {
+            
+    
+            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;
+
+            pathParams.Add("format", "json");
+            
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling PlaceOrder: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling PlaceOrder: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return (Order) ApiClient.Deserialize(response.Content, typeof(Order), response.Headers);
+        }
+    
+        /// <summary>
+        /// Place an order for a pet 
+        /// </summary>
+        /// <param name="body">order placed for purchasing the pet</param>
+        /// <returns>Order</returns>
+        public async System.Threading.Tasks.Task<Order> PlaceOrderAsync (Order body)
+        {
+            
+    
+            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;
+    
+            pathParams.Add("format", "json");
+            
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling PlaceOrder: " + response.Content, response.Content);
+
+            return (Order) ApiClient.Deserialize(response.Content, typeof(Order), response.Headers);
+        }
+        
+        /// <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)
+        {
+            
+            // 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;
+
+            pathParams.Add("format", "json");
+            if (orderId != null) pathParams.Add("orderId", ApiClient.ParameterToString(orderId)); // path parameter
+            
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetOrderById: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetOrderById: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return (Order) ApiClient.Deserialize(response.Content, typeof(Order), response.Headers);
+        }
+    
+        /// <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 async System.Threading.Tasks.Task<Order> GetOrderByIdAsync (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;
+    
+            pathParams.Add("format", "json");
+            if (orderId != null) pathParams.Add("orderId", ApiClient.ParameterToString(orderId)); // path parameter
+            
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetOrderById: " + response.Content, response.Content);
+
+            return (Order) ApiClient.Deserialize(response.Content, typeof(Order), response.Headers);
+        }
+        
+        /// <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>
+        /// <param name="orderId">ID of the order that needs to be deleted</param> 
+        /// <returns></returns>            
+        public void DeleteOrder (string orderId)
+        {
+            
+            // verify the required parameter 'orderId' is set
+            if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling DeleteOrder");
+            
+    
+            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;
+
+            pathParams.Add("format", "json");
+            if (orderId != null) pathParams.Add("orderId", ApiClient.ParameterToString(orderId)); // path parameter
+            
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling DeleteOrder: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling DeleteOrder: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        /// <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>
+        /// <param name="orderId">ID of the order that needs to be deleted</param>
+        /// <returns></returns>
+        public async System.Threading.Tasks.Task DeleteOrderAsync (string orderId)
+        {
+            // verify the required parameter 'orderId' is set
+            if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling DeleteOrder");
+            
+    
+            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;
+    
+            pathParams.Add("format", "json");
+            if (orderId != null) pathParams.Add("orderId", ApiClient.ParameterToString(orderId)); // path parameter
+            
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling DeleteOrder: " + response.Content, response.Content);
+
+            
+            return;
+        }
+        
+    }
+    
+}
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
new file mode 100644
index 00000000000..1ca200137a2
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs
@@ -0,0 +1,827 @@
+using System;
+using System.IO;
+using System.Collections.Generic;
+using RestSharp;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
+
+namespace IO.Swagger.Api
+{
+    
+    public interface IUserApi
+    {
+        
+        /// <summary>
+        /// Create user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="body">Created user object</param>
+        /// <returns></returns>
+        void CreateUser (User body);
+  
+        /// <summary>
+        /// Create user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="body">Created user object</param>
+        /// <returns></returns>
+        System.Threading.Tasks.Task CreateUserAsync (User body);
+        
+        /// <summary>
+        /// Creates list of users with given input array 
+        /// </summary>
+        /// <param name="body">List of user object</param>
+        /// <returns></returns>
+        void CreateUsersWithArrayInput (List<User> body);
+  
+        /// <summary>
+        /// Creates list of users with given input array 
+        /// </summary>
+        /// <param name="body">List of user object</param>
+        /// <returns></returns>
+        System.Threading.Tasks.Task CreateUsersWithArrayInputAsync (List<User> body);
+        
+        /// <summary>
+        /// Creates list of users with given input array 
+        /// </summary>
+        /// <param name="body">List of user object</param>
+        /// <returns></returns>
+        void CreateUsersWithListInput (List<User> body);
+  
+        /// <summary>
+        /// Creates list of users with given input array 
+        /// </summary>
+        /// <param name="body">List of user object</param>
+        /// <returns></returns>
+        System.Threading.Tasks.Task CreateUsersWithListInputAsync (List<User> body);
+        
+        /// <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>
+        string LoginUser (string username, string password);
+  
+        /// <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>
+        System.Threading.Tasks.Task<string> LoginUserAsync (string username, string password);
+        
+        /// <summary>
+        /// Logs out current logged in user session 
+        /// </summary>
+        /// <returns></returns>
+        void LogoutUser ();
+  
+        /// <summary>
+        /// Logs out current logged in user session 
+        /// </summary>
+        /// <returns></returns>
+        System.Threading.Tasks.Task LogoutUserAsync ();
+        
+        /// <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>
+        User GetUserByName (string username);
+  
+        /// <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>
+        System.Threading.Tasks.Task<User> GetUserByNameAsync (string username);
+        
+        /// <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>
+        void UpdateUser (string username, User 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></returns>
+        System.Threading.Tasks.Task UpdateUserAsync (string username, User body);
+        
+        /// <summary>
+        /// Delete user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="username">The name that needs to be deleted</param>
+        /// <returns></returns>
+        void DeleteUser (string username);
+  
+        /// <summary>
+        /// Delete user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="username">The name that needs to be deleted</param>
+        /// <returns></returns>
+        System.Threading.Tasks.Task DeleteUserAsync (string username);
+        
+    }
+  
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public class UserApi : IUserApi
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UserApi"/> class.
+        /// </summary>
+        /// <param name="apiClient"> an instance of ApiClient (optional)</param>
+        /// <returns></returns>
+        public UserApi(ApiClient apiClient = null)
+        {
+            if (apiClient == null) // use the default one in Configuration
+                this.ApiClient = Configuration.DefaultApiClient; 
+            else
+                this.ApiClient = apiClient;
+        }
+    
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UserApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public UserApi(String basePath)
+        {
+            this.ApiClient = new ApiClient(basePath);
+        }
+    
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <param name="basePath">The base path</param>
+        /// <value>The base path</value>
+        public void SetBasePath(String basePath)
+        {
+            this.ApiClient.BasePath = basePath;
+        }
+    
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <param name="basePath">The base path</param>
+        /// <value>The base path</value>
+        public String GetBasePath(String basePath)
+        {
+            return this.ApiClient.BasePath;
+        }
+    
+        /// <summary>
+        /// Gets or sets the API client.
+        /// </summary>
+        /// <value>An instance of the ApiClient</param>
+        public ApiClient ApiClient {get; set;}
+    
+        
+        /// <summary>
+        /// Create user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="body">Created user object</param> 
+        /// <returns></returns>            
+        public void CreateUser (User body)
+        {
+            
+    
+            var path = "/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;
+
+            pathParams.Add("format", "json");
+            
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUser: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUser: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        /// <summary>
+        /// Create user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="body">Created user object</param>
+        /// <returns></returns>
+        public async System.Threading.Tasks.Task CreateUserAsync (User body)
+        {
+            
+    
+            var path = "/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;
+    
+            pathParams.Add("format", "json");
+            
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUser: " + response.Content, response.Content);
+
+            
+            return;
+        }
+        
+        /// <summary>
+        /// Creates list of users with given input array 
+        /// </summary>
+        /// <param name="body">List of user object</param> 
+        /// <returns></returns>            
+        public void CreateUsersWithArrayInput (List<User> body)
+        {
+            
+    
+            var path = "/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;
+
+            pathParams.Add("format", "json");
+            
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithArrayInput: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithArrayInput: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        /// <summary>
+        /// Creates list of users with given input array 
+        /// </summary>
+        /// <param name="body">List of user object</param>
+        /// <returns></returns>
+        public async System.Threading.Tasks.Task CreateUsersWithArrayInputAsync (List<User> body)
+        {
+            
+    
+            var path = "/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;
+    
+            pathParams.Add("format", "json");
+            
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithArrayInput: " + response.Content, response.Content);
+
+            
+            return;
+        }
+        
+        /// <summary>
+        /// Creates list of users with given input array 
+        /// </summary>
+        /// <param name="body">List of user object</param> 
+        /// <returns></returns>            
+        public void CreateUsersWithListInput (List<User> body)
+        {
+            
+    
+            var path = "/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;
+
+            pathParams.Add("format", "json");
+            
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithListInput: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithListInput: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        /// <summary>
+        /// Creates list of users with given input array 
+        /// </summary>
+        /// <param name="body">List of user object</param>
+        /// <returns></returns>
+        public async System.Threading.Tasks.Task CreateUsersWithListInputAsync (List<User> body)
+        {
+            
+    
+            var path = "/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;
+    
+            pathParams.Add("format", "json");
+            
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithListInput: " + response.Content, response.Content);
+
+            
+            return;
+        }
+        
+        /// <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, string password)
+        {
+            
+    
+            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;
+
+            pathParams.Add("format", "json");
+            
+            if (username != null) queryParams.Add("username", ApiClient.ParameterToString(username)); // query parameter
+            if (password != null) queryParams.Add("password", ApiClient.ParameterToString(password)); // query parameter
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling LoginUser: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling LoginUser: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return (string) ApiClient.Deserialize(response.Content, typeof(string), response.Headers);
+        }
+    
+        /// <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 async System.Threading.Tasks.Task<string> LoginUserAsync (string username, string password)
+        {
+            
+    
+            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;
+    
+            pathParams.Add("format", "json");
+            
+            if (username != null) queryParams.Add("username", ApiClient.ParameterToString(username)); // query parameter
+            if (password != null) queryParams.Add("password", ApiClient.ParameterToString(password)); // query parameter
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling LoginUser: " + response.Content, response.Content);
+
+            return (string) ApiClient.Deserialize(response.Content, typeof(string), response.Headers);
+        }
+        
+        /// <summary>
+        /// Logs out current logged in user session 
+        /// </summary>
+        /// <returns></returns>            
+        public void LogoutUser ()
+        {
+            
+    
+            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;
+
+            pathParams.Add("format", "json");
+            
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling LogoutUser: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling LogoutUser: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        /// <summary>
+        /// Logs out current logged in user session 
+        /// </summary>
+        /// <returns></returns>
+        public async System.Threading.Tasks.Task LogoutUserAsync ()
+        {
+            
+    
+            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;
+    
+            pathParams.Add("format", "json");
+            
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling LogoutUser: " + response.Content, response.Content);
+
+            
+            return;
+        }
+        
+        /// <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)
+        {
+            
+            // 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;
+
+            pathParams.Add("format", "json");
+            if (username != null) pathParams.Add("username", ApiClient.ParameterToString(username)); // path parameter
+            
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetUserByName: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetUserByName: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return (User) ApiClient.Deserialize(response.Content, typeof(User), response.Headers);
+        }
+    
+        /// <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 async System.Threading.Tasks.Task<User> GetUserByNameAsync (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;
+    
+            pathParams.Add("format", "json");
+            if (username != null) pathParams.Add("username", ApiClient.ParameterToString(username)); // path parameter
+            
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetUserByName: " + response.Content, response.Content);
+
+            return (User) ApiClient.Deserialize(response.Content, typeof(User), response.Headers);
+        }
+        
+        /// <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)
+        {
+            
+            // 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;
+
+            pathParams.Add("format", "json");
+            if (username != null) pathParams.Add("username", ApiClient.ParameterToString(username)); // path parameter
+            
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdateUser: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdateUser: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        /// <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 async System.Threading.Tasks.Task UpdateUserAsync (string username, User body)
+        {
+            // 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;
+    
+            pathParams.Add("format", "json");
+            if (username != null) pathParams.Add("username", ApiClient.ParameterToString(username)); // path parameter
+            
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdateUser: " + response.Content, response.Content);
+
+            
+            return;
+        }
+        
+        /// <summary>
+        /// Delete user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="username">The name that needs to be deleted</param> 
+        /// <returns></returns>            
+        public void DeleteUser (string username)
+        {
+            
+            // verify the required parameter 'username' is set
+            if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling DeleteUser");
+            
+    
+            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;
+
+            pathParams.Add("format", "json");
+            if (username != null) pathParams.Add("username", ApiClient.ParameterToString(username)); // path parameter
+            
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling DeleteUser: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling DeleteUser: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        /// <summary>
+        /// Delete user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="username">The name that needs to be deleted</param>
+        /// <returns></returns>
+        public async System.Threading.Tasks.Task DeleteUserAsync (string username)
+        {
+            // verify the required parameter 'username' is set
+            if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling DeleteUser");
+            
+    
+            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;
+    
+            pathParams.Add("format", "json");
+            if (username != null) pathParams.Add("username", ApiClient.ParameterToString(username)); // path parameter
+            
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling DeleteUser: " + response.Content, response.Content);
+
+            
+            return;
+        }
+        
+    }
+    
+}
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
new file mode 100644
index 00000000000..4d87e7bd9c6
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs
@@ -0,0 +1,350 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text.RegularExpressions;
+using System.IO;
+using System.Web;
+using System.Linq;
+using System.Net;
+using System.Text;
+using Newtonsoft.Json;
+using RestSharp;
+using RestSharp.Extensions;
+
+namespace IO.Swagger.Client
+{
+    /// <summary>
+    /// API client is mainly responible for making the HTTP call to the API backend.
+    /// </summary>
+    public class ApiClient
+    {
+        private readonly Dictionary<String, String> _defaultHeaderMap = new Dictionary<String, String>();
+  
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApiClient" /> class.
+        /// </summary>
+        /// <param name="basePath">The base path.</param>
+        public ApiClient(String basePath="http://petstore.swagger.io/v2")
+        {
+            BasePath = basePath;
+            RestClient = new RestClient(BasePath);
+        }
+    
+        /// <summary>
+        /// Gets or sets the base path.
+        /// </summary>
+        /// <value>The base path</value>
+        public string BasePath { get; set; }
+    
+        /// <summary>
+        /// Gets or sets the RestClient.
+        /// </summary>
+        /// <value>An instance of the RestClient</value>
+        public RestClient RestClient { get; set; }
+    
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        public Dictionary<String, String> DefaultHeader
+        {
+            get { return _defaultHeaderMap; }
+        }
+
+        /// <summary>
+        /// Gets the status code of the previous request
+        /// </summary>
+        public int StatusCode { get; private set; }
+
+        /// <summary>
+        /// Gets the response headers of the previous request
+        /// </summary>
+        public Dictionary<String, String> ResponseHeaders { get; private set; } 
+    
+        // Creates and sets up a RestRequest prior to a call.
+        private RestRequest PrepareRequest(
+            String path, RestSharp.Method method, Dictionary<String, String> queryParams, String postBody,
+            Dictionary<String, String> headerParams, Dictionary<String, String> formParams,
+            Dictionary<String, FileParameter> fileParams, Dictionary<String, String> pathParams, String[] authSettings)
+        {
+            var request = new RestRequest(path, method);
+   
+            UpdateParamsForAuth(queryParams, headerParams, authSettings);
+
+            // add default header, if any
+            foreach(var defaultHeader in _defaultHeaderMap)
+                request.AddHeader(defaultHeader.Key, defaultHeader.Value);
+
+            // add path parameter, if any
+            foreach(var param in pathParams)
+                request.AddParameter(param.Key, param.Value, ParameterType.UrlSegment); 
+
+            // add header parameter, if any
+            foreach(var param in headerParams)
+                request.AddHeader(param.Key, param.Value);
+
+            // add query parameter, if any
+            foreach(var param in queryParams)
+                request.AddQueryParameter(param.Key, param.Value);
+
+            // add form parameter, if any
+            foreach(var param in formParams)
+                request.AddParameter(param.Key, param.Value);
+
+            // add file parameter, if any
+            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);
+    
+            return request;
+        }
+
+        /// <summary>
+        /// Makes the HTTP request (Sync).
+        /// </summary>
+        /// <param name="path">URL path.</param>
+        /// <param name="method">HTTP method.</param>
+        /// <param name="queryParams">Query parameters.</param>
+        /// <param name="postBody">HTTP body (POST request).</param>
+        /// <param name="headerParams">Header parameters.</param>
+        /// <param name="formParams">Form parameters.</param>
+        /// <param name="fileParams">File parameters.</param>
+        /// <param name="pathParams">Path parameters.</param>
+        /// <param name="authSettings">Authentication settings.</param>
+        /// <returns>Object</returns>
+        public Object CallApi(
+            String path, RestSharp.Method method, Dictionary<String, String> queryParams, String postBody,
+            Dictionary<String, String> headerParams, Dictionary<String, String> formParams,
+            Dictionary<String, FileParameter> fileParams, Dictionary<String, String> pathParams, String[] authSettings)
+        {
+            var request = PrepareRequest(
+                path, method, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+            var response = RestClient.Execute(request);
+            StatusCode = (int) response.StatusCode;
+            ResponseHeaders = response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString());
+            return (Object) response;
+        }
+
+        /// <summary>
+        /// Makes the asynchronous HTTP request.
+        /// </summary>
+        /// <param name="path">URL path.</param>
+        /// <param name="method">HTTP method.</param>
+        /// <param name="queryParams">Query parameters.</param>
+        /// <param name="postBody">HTTP body (POST request).</param>
+        /// <param name="headerParams">Header parameters.</param>
+        /// <param name="formParams">Form parameters.</param>
+        /// <param name="fileParams">File parameters.</param>
+        /// <param name="pathParams">Path parameters.</param>
+        /// <param name="authSettings">Authentication settings.</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,
+            Dictionary<String, String> headerParams, Dictionary<String, String> formParams,
+            Dictionary<String, FileParameter> fileParams, Dictionary<String, String> pathParams, String[] authSettings)
+        {
+            var request = PrepareRequest(
+                path, method, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
+            var response = await RestClient.ExecuteTaskAsync(request);
+            StatusCode = (int)response.StatusCode;
+            ResponseHeaders = response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString());
+            return (Object)response;
+        }
+    
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        public void AddDefaultHeader(string key, string value)
+        {
+            _defaultHeaderMap.Add(key, value);
+        }
+    
+        /// <summary>
+        /// Escape string (url-encoded).
+        /// </summary>
+        /// <param name="str">String to be escaped.</param>
+        /// <returns>Escaped string.</returns>
+        public string EscapeString(string str)
+        {
+            return RestSharp.Extensions.StringExtensions.UrlDecode(str);
+        }
+    
+        /// <summary>
+        /// Create FileParameter based on Stream.
+        /// </summary>
+        /// <param name="name">Parameter name.</param>
+        /// <param name="stream">Input stream.</param>
+        /// <returns>FileParameter.</returns>
+        public FileParameter ParameterToFile(string name, Stream stream)
+        {
+            if (stream is FileStream)
+                return FileParameter.Create(name, stream.ReadAsBytes(), Path.GetFileName(((FileStream)stream).Name));
+            else
+                return FileParameter.Create(name, stream.ReadAsBytes(), "no_file_name_provided");
+        }
+    
+        /// <summary>
+        /// If parameter is DateTime, output in ISO8601 format.
+        /// If parameter is a list of string, join the list with ",".
+        /// Otherwise just return the string.
+        /// </summary>
+        /// <param name="obj">The parameter (header, path, query, form).</param>
+        /// <returns>Formatted string.</returns>
+        public string ParameterToString(object obj)
+        {
+            if (obj is DateTime)
+                return ((DateTime)obj).ToString ("u");
+            else if (obj is List<string>)
+                return String.Join(",", obj as List<string>);
+            else
+                return Convert.ToString (obj);
+        }
+    
+        /// <summary>
+        /// Deserialize the JSON string into a proper object.
+        /// </summary>
+        /// <param name="content">HTTP body (e.g. string, JSON).</param>
+        /// <param name="type">Object type.</param>
+        /// <returns>Object representation of the JSON string.</returns>
+        public object Deserialize(string content, Type type, IList<Parameter> headers=null)
+        {
+            if (type == typeof(Object)) // return an object
+            {
+                return content;
+            }
+
+            if (type == typeof(Stream))
+            {
+                var filePath = String.IsNullOrEmpty(Configuration.TempFolderPath)
+                    ? Path.GetTempPath()
+                    : Configuration.TempFolderPath;
+
+                var fileName = filePath + Guid.NewGuid();
+                if (headers != null)
+                {
+                    var regex = new Regex(@"Content-Disposition:.*filename=['""]?([^'""\s]+)['""]?$");
+                    var match = regex.Match(headers.ToString());
+                    if (match.Success)
+                        fileName = filePath + match.Value.Replace("\"", "").Replace("'", "");
+                }
+                File.WriteAllText(fileName, content);
+                return new FileStream(fileName, FileMode.Open);
+
+            }
+
+            if (type.Name.StartsWith("System.Nullable`1[[System.DateTime")) // return a datetime object
+            {
+                return DateTime.Parse(content,  null, System.Globalization.DateTimeStyles.RoundtripKind);
+            }
+
+            if (type == typeof(String) || type.Name.StartsWith("System.Nullable")) // return primitive type
+            {
+                return ConvertType(content, type); 
+            }
+    
+            // at this point, it must be a model (json)
+            try
+            {
+                return JsonConvert.DeserializeObject(content, type);
+            }
+            catch (Exception e)
+            {
+                throw new ApiException(500, e.Message);
+            }
+        }
+    
+        /// <summary>
+        /// Serialize an object into JSON string.
+        /// </summary>
+        /// <param name="obj">Object.</param>
+        /// <returns>JSON string.</returns>
+        public string Serialize(object obj)
+        {
+            try
+            {
+                return obj != null ? JsonConvert.SerializeObject(obj) : null;
+            }
+            catch (Exception e)
+            {
+                throw new ApiException(500, e.Message);
+            }
+        }
+    
+        /// <summary>
+        /// Get the API key with prefix.
+        /// </summary>
+        /// <param name="apiKeyIdentifier">API key identifier (authentication scheme).</param>
+        /// <returns>API key with prefix.</returns>
+        public string GetApiKeyWithPrefix (string apiKeyIdentifier)
+        {
+            var apiKeyValue = "";
+            Configuration.ApiKey.TryGetValue (apiKeyIdentifier, out apiKeyValue);
+            var apiKeyPrefix = "";
+            if (Configuration.ApiKeyPrefix.TryGetValue (apiKeyIdentifier, out apiKeyPrefix))
+                return apiKeyPrefix + " " + apiKeyValue;
+            else
+                return apiKeyValue;
+        }
+    
+        /// <summary>
+        /// Update parameters based on authentication.
+        /// </summary>
+        /// <param name="queryParams">Query parameters.</param>
+        /// <param name="headerParams">Header parameters.</param>
+        /// <param name="authSettings">Authentication settings.</param>
+        public void UpdateParamsForAuth(Dictionary<String, String> queryParams, Dictionary<String, String> headerParams, string[] authSettings)
+        {
+            if (authSettings == null || authSettings.Length == 0)
+                return;
+
+            foreach (string auth in authSettings)
+            {
+                // determine which one to use
+                switch(auth)
+                {
+                    
+                    case "api_key":
+                        headerParams["api_key"] = GetApiKeyWithPrefix("api_key");
+                        
+                        break;
+                    
+                    case "petstore_auth":
+                        
+                        //TODO support oauth
+                        break;
+                    
+                    default:
+                        //TODO show warning about security definition not found
+                        break;
+                }
+            }
+        }
+ 
+        /// <summary>
+        /// Encode string in base64 format.
+        /// </summary>
+        /// <param name="text">String to be encoded.</param>
+        /// <returns>Encoded string.</returns>
+        public static string Base64Encode(string text)
+        {
+            var textByte = System.Text.Encoding.UTF8.GetBytes(text);
+            return System.Convert.ToBase64String(textByte);
+        }
+    
+        /// <summary>
+        /// Dynamically cast the object into target type.
+        /// Ref: http://stackoverflow.com/questions/4925718/c-dynamic-runtime-cast
+        /// </summary>
+        /// <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) {
+            return Convert.ChangeType(source, dest);
+        }
+  
+    }
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiException.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiException.cs
new file mode 100644
index 00000000000..20df8115c79
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiException.cs
@@ -0,0 +1,48 @@
+using System;
+
+namespace IO.Swagger.Client {
+  /// <summary>
+  /// API Exception
+  /// </summary>
+  public class ApiException : Exception {
+      /// <summary>
+      /// Gets or sets the error code (HTTP status code)
+      /// </summary>
+      /// <value>The error code (HTTP status code).</value>
+      public int ErrorCode { get; set; }
+
+      /// <summary>
+      /// Gets or sets the error content (body json object)
+      /// </summary>
+      /// <value>The error content (Http response body).</value>
+      public dynamic ErrorContent { get; private set; }
+
+      /// <summary>
+      /// Initializes a new instance of the <see cref="ApiException"/> class.
+      /// </summary>
+      /// <param name="basePath">The base path.</param>
+      public ApiException() {}
+
+      /// <summary>
+      /// Initializes a new instance of the <see cref="ApiException"/> class.
+      /// </summary>
+      /// <param name="errorCode">HTTP status code.</param>
+      /// <param name="message">Error message.</param>
+      public ApiException(int errorCode, string message) : base(message) {
+          this.ErrorCode = errorCode;
+      }
+
+      /// <summary>
+      /// Initializes a new instance of the <see cref="ApiException"/> class.
+      /// </summary>
+      /// <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) {
+          this.ErrorCode = errorCode;
+          this.ErrorContent = errorContent;
+      }
+
+  }
+
+}
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
new file mode 100644
index 00000000000..80df0f4ec72
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/Configuration.cs
@@ -0,0 +1,99 @@
+using System;
+using System.Reflection;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace IO.Swagger.Client
+{
+    /// <summary>
+    /// Represents a set of configuration settings
+    /// </summary>
+    public class Configuration
+    {
+  
+        /// <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 API client for making HTTP calls.
+        /// </summary>
+        /// <value>The API client.</value>
+        public static ApiClient DefaultApiClient = new ApiClient();
+  
+        /// <summary>
+        /// Gets or sets the username (HTTP basic authentication).
+        /// </summary>
+        /// <value>The username.</value>
+        public static String Username { get; set; }
+  
+        /// <summary>
+        /// Gets or sets the password (HTTP basic authentication).
+        /// </summary>
+        /// <value>The password.</value>
+        public static String Password { get; set; }
+  
+        /// <summary>
+        /// Gets or sets the API key based on the authentication name.
+        /// </summary>
+        /// <value>The API key.</value>
+        public static 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>
+        /// <value>The prefix of the API key.</value>
+        public static Dictionary<String, String> ApiKeyPrefix = new Dictionary<String, String>();
+  
+        private static string _tempFolderPath = Path.GetTempPath();
+  
+        /// <summary>
+        /// Gets or sets the temporary folder path to store the files downloaded from the server.
+        /// </summary>
+        /// <value>Folder path.</value>
+        public static String TempFolderPath
+        {
+            get { return _tempFolderPath; }
+  
+            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;
+                else
+                    _tempFolderPath = value  + Path.DirectorySeparatorChar;
+            }
+        }
+  
+        /// <summary>
+        /// Returns a string with essential information for debugging.
+        /// </summary>
+        public static String ToDebugReport()
+        {
+            String report = "C# SDK (IO.Swagger) Debug Report:\n";
+            report += "    OS: " + Environment.OSVersion + "\n";
+            report += "    .NET Framework Version: " + Assembly
+                     .GetExecutingAssembly()
+                     .GetReferencedAssemblies()
+                     .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/src/main/csharp/io/swagger/Model/Category.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Category.cs
similarity index 90%
rename from samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Category.cs
rename to samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Category.cs
index 74121762af9..c402188b9fc 100644
--- a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Category.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Category.cs
@@ -13,12 +13,16 @@ namespace IO.Swagger.Model {
   [DataContract]
   public class Category {
     
-    
+    /// <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; }
 
@@ -49,6 +53,4 @@ public string ToJson() {
     }
 
 }
-  
-  
 }
diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Order.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs
similarity index 81%
rename from samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Order.cs
rename to samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs
index 7451619050c..07b3d14e598 100644
--- a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Order.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs
@@ -13,32 +13,45 @@ namespace IO.Swagger.Model {
   [DataContract]
   public class Order {
     
-    
+    /// <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; }
 
     
-    /* Order Status */
+    /// <summary>
+    /// Order Status
+    /// </summary>
+    /// <value>Order Status</value>
     [DataMember(Name="status", EmitDefaultValue=false)]
     public string Status { get; set; }
 
     
-    
+    /// <summary>
+    /// Gets or Sets Complete
+    /// </summary>
     [DataMember(Name="complete", EmitDefaultValue=false)]
     public bool? Complete { get; set; }
 
@@ -77,6 +90,4 @@ public string ToJson() {
     }
 
 }
-  
-  
 }
diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Pet.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs
similarity index 80%
rename from samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Pet.cs
rename to samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs
index 0bfba35b1e3..41216b52802 100644
--- a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Pet.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs
@@ -13,32 +13,45 @@ namespace IO.Swagger.Model {
   [DataContract]
   public class Pet {
     
-    
+    /// <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; }
 
     
-    /* pet status in the store */
+    /// <summary>
+    /// pet status in the store
+    /// </summary>
+    /// <value>pet status in the store</value>
     [DataMember(Name="status", EmitDefaultValue=false)]
     public string Status { get; set; }
 
@@ -77,6 +90,4 @@ public string ToJson() {
     }
 
 }
-  
-  
 }
diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Tag.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Tag.cs
similarity index 90%
rename from samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Tag.cs
rename to samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Tag.cs
index 53901491a47..10ace1ad185 100644
--- a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Tag.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Tag.cs
@@ -13,12 +13,16 @@ namespace IO.Swagger.Model {
   [DataContract]
   public class Tag {
     
-    
+    /// <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; }
 
@@ -49,6 +53,4 @@ public string ToJson() {
     }
 
 }
-  
-  
 }
diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/User.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/User.cs
similarity index 80%
rename from samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/User.cs
rename to samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/User.cs
index e58d0296a06..d22ac54c094 100644
--- a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/User.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/User.cs
@@ -13,42 +13,59 @@ namespace IO.Swagger.Model {
   [DataContract]
   public class User {
     
-    
+    /// <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; }
 
     
-    /* User Status */
+    /// <summary>
+    /// User Status
+    /// </summary>
+    /// <value>User Status</value>
     [DataMember(Name="userStatus", EmitDefaultValue=false)]
     public int? UserStatus { get; set; }
 
@@ -91,6 +108,4 @@ public string ToJson() {
     }
 
 }
-  
-  
 }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.csproj b/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.csproj
new file mode 100644
index 00000000000..982ecc7a315
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.csproj
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{1011E844-3414-4D65-BF1F-7C8CE0167174}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>SwaggerClientTest</RootNamespace>
+    <AssemblyName>SwaggerClientTest</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>Lib\SwaggerClient\bin\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="nunit.framework">
+      <HintPath>packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web" />
+    <Reference Include="RestSharp">
+      <HintPath>Lib\SwaggerClient\bin\RestSharp.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Lib\SwaggerClient\src\main\csharp\IO\Swagger\Api\PetApi.cs" />
+    <Compile Include="Lib\SwaggerClient\src\main\csharp\IO\Swagger\Api\StoreApi.cs" />
+    <Compile Include="Lib\SwaggerClient\src\main\csharp\IO\Swagger\Api\UserApi.cs" />
+    <Compile Include="Lib\SwaggerClient\src\main\csharp\IO\Swagger\Client\ApiClient.cs" />
+    <Compile Include="Lib\SwaggerClient\src\main\csharp\IO\Swagger\Client\ApiException.cs" />
+    <Compile Include="Lib\SwaggerClient\src\main\csharp\IO\Swagger\Client\Configuration.cs" />
+    <Compile Include="Lib\SwaggerClient\src\main\csharp\IO\Swagger\Model\Category.cs" />
+    <Compile Include="Lib\SwaggerClient\src\main\csharp\IO\Swagger\Model\Order.cs" />
+    <Compile Include="Lib\SwaggerClient\src\main\csharp\IO\Swagger\Model\Pet.cs" />
+    <Compile Include="Lib\SwaggerClient\src\main\csharp\IO\Swagger\Model\Tag.cs" />
+    <Compile Include="Lib\SwaggerClient\src\main\csharp\IO\Swagger\Model\User.cs" />
+    <Compile Include="TestPet.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <None Include="Lib\SwaggerClient\compile.bat" />
+    <None Include="Lib\SwaggerClient\bin\Newtonsoft.Json.dll" />
+    <None Include="Lib\SwaggerClient\bin\RestSharp.dll" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Lib\" />
+    <Folder Include="Lib\SwaggerClient\" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.sln b/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.sln
new file mode 100644
index 00000000000..dfb6e762ce2
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.sln
@@ -0,0 +1,17 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SwaggerClientTest", "SwaggerClientTest.csproj", "{1011E844-3414-4D65-BF1F-7C8CE0167174}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{1011E844-3414-4D65-BF1F-7C8CE0167174}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1011E844-3414-4D65-BF1F-7C8CE0167174}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1011E844-3414-4D65-BF1F-7C8CE0167174}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1011E844-3414-4D65-BF1F-7C8CE0167174}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs b/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs
new file mode 100644
index 00000000000..3839afecb77
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs
@@ -0,0 +1,12 @@
+<Properties StartupItem="SwaggerClientTest.csproj">
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
+  <MonoDevelop.Ide.Workbench ActiveDocument="TestPet.cs">
+    <Files>
+      <File FileName="TestPet.cs" Line="68" Column="30" />
+    </Files>
+  </MonoDevelop.Ide.Workbench>
+  <MonoDevelop.Ide.DebuggingService.Breakpoints>
+    <BreakpointStore />
+  </MonoDevelop.Ide.DebuggingService.Breakpoints>
+  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
+</Properties>
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/TestPet.cs b/samples/client/petstore/csharp/SwaggerClientTest/TestPet.cs
new file mode 100644
index 00000000000..98326a63ae7
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/TestPet.cs
@@ -0,0 +1,144 @@
+using NUnit.Framework;
+using System;
+using System.IO;
+using System.Collections.Generic;
+using IO.Swagger.Api;
+using IO.Swagger.Model;
+using IO.Swagger.Client;
+
+
+namespace SwaggerClient.TestPet
+{
+	[TestFixture ()]
+	public class TestPet
+	{
+		public long petId = 11088;
+
+		[SetUp] public void Init()
+		{
+			// create pet
+			Pet p = new Pet();
+			p.Id = petId;
+			p.Name = "Csharp test";
+			p.Status = "available";
+			// create Category object
+			Category category = new Category();
+			category.Id = 56;
+			category.Name = "sample category name2";
+			List<String> photoUrls = new List<String>(new String[] {"sample photoUrls"});
+			// create Tag object
+			Tag tag = new Tag();
+			tag.Id = petId;
+			tag.Name = "sample tag name1";
+			List<Tag> tags = new List<Tag>(new Tag[] {tag});
+			p.Tags = tags;
+			p.Category = category;
+			p.PhotoUrls = photoUrls;
+
+			// add pet before testing
+			PetApi petApi = new PetApi("http://petstore.swagger.io/v2/");
+			petApi.AddPet (p);
+
+		}
+
+		[TearDown] public void Cleanup()
+		{
+			// remove the pet after testing
+			PetApi petApi = new PetApi ();
+			petApi.DeletePet(petId, "test key");
+		}
+
+
+		[Test ()]
+		public void TestGetPetByIdAsync ()
+		{
+			PetApi petApi = new PetApi ();
+			var task = petApi.GetPetByIdAsync (petId);
+			Pet response = task.Result;
+			Assert.IsInstanceOf<Pet> (response, "Response is a Pet");
+
+			Assert.AreEqual ("Csharp test", response.Name);
+			Assert.AreEqual ("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.IsInstanceOf<List<String>> (response.PhotoUrls, "Response.PhotoUrls is a Array");
+			Assert.AreEqual ("sample photoUrls", response.PhotoUrls [0]);
+
+			Assert.IsInstanceOf<Category> (response.Category, "Response.Category is a Category");
+			Assert.AreEqual (56, response.Category.Id);
+			Assert.AreEqual ("sample category name2", response.Category.Name);
+
+		}
+
+		[Test ()]
+		public void TestGetPetById ()
+		{
+			PetApi petApi = new PetApi ();
+			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.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.IsInstanceOf<List<String>> (response.PhotoUrls, "Response.PhotoUrls is a Array");
+			Assert.AreEqual ("sample photoUrls", response.PhotoUrls [0]);
+
+			Assert.IsInstanceOf<Category> (response.Category, "Response.Category is a Category");
+			Assert.AreEqual (56, response.Category.Id);
+			Assert.AreEqual ("sample category name2", response.Category.Name);
+
+		}
+
+		[Test ()]
+		public void TestUpdatePetWithForm ()
+		{
+			PetApi petApi = new PetApi ();
+			petApi.UpdatePetWithForm (petId.ToString(), "new form name", "pending");
+
+			Pet response = petApi.GetPetById (petId);
+			Assert.IsInstanceOf<Pet> (response, "Response is a Pet");
+			Assert.IsInstanceOf<Category> (response.Category, "Response.Category is a Category");
+			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 (petId, response.Tags [0].Id);
+			Assert.AreEqual (56, response.Category.Id);
+		}
+
+		[Test ()]
+		public void TestUploadFile ()
+		{
+			PetApi petApi = new PetApi ();
+			//NOTE: please provide a valid file (full path)
+			FileStream fileStream = new FileStream("/var/tmp/small.gif", FileMode.Open);
+			petApi.UploadFile(petId, "new form name", fileStream);
+		}
+
+
+		[Test ()]
+		public void TestFindPetByStatus ()
+		{
+			PetApi petApi = new PetApi ();
+			List<String> statusList = new List<String>(new String[] {"available"});
+
+			List<Pet> listPet = petApi.FindPetsByStatus (statusList);
+			foreach (Pet pet in listPet) // Loop through List with foreach.
+			{
+				Assert.IsInstanceOf<Pet> (pet, "Response is a Pet");
+				Assert.AreEqual ("available", pet.Status);
+			}
+
+		}
+
+	}
+}
+
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/Newtonsoft.Json.dll b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/Newtonsoft.Json.dll
new file mode 100644
index 00000000000..ae725c4b598
Binary files /dev/null and b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/Newtonsoft.Json.dll differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/RestSharp.dll b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/RestSharp.dll
new file mode 100644
index 00000000000..a7331ed6e23
Binary files /dev/null and b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/RestSharp.dll differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll
new file mode 100755
index 00000000000..8f38016c832
Binary files /dev/null and b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll 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
new file mode 100644
index 00000000000..290bbd5f2e0
Binary files /dev/null and b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll.mdb 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
new file mode 100644
index 00000000000..ed6550bb055
Binary files /dev/null and b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/nunit.framework.dll differ
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
new file mode 100644
index 00000000000..fdcb678cdda
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttribute.cs
@@ -0,0 +1,2 @@
+// <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
new file mode 100644
index 00000000000..dded8c015ee
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.csproj.FilesWrittenAbsolute.txt
@@ -0,0 +1,8 @@
+/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/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/RestSharp.dll
+/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/nunit.framework.dll
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll
new file mode 100755
index 00000000000..8f38016c832
Binary files /dev/null and b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll 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
new file mode 100644
index 00000000000..290bbd5f2e0
Binary files /dev/null and b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll.mdb differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/packages.config b/samples/client/petstore/csharp/SwaggerClientTest/packages.config
new file mode 100644
index 00000000000..09300da2fcd
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit" version="2.6.4" targetFramework="net45" />
+</packages>
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.4/NUnit.2.6.4.nupkg b/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.4/NUnit.2.6.4.nupkg
new file mode 100644
index 00000000000..379b15bf5cd
Binary files /dev/null and b/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.4/NUnit.2.6.4.nupkg differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.4/lib/nunit.framework.dll b/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.4/lib/nunit.framework.dll
new file mode 100644
index 00000000000..ed6550bb055
Binary files /dev/null and b/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.4/lib/nunit.framework.dll differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.4/lib/nunit.framework.xml b/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.4/lib/nunit.framework.xml
new file mode 100644
index 00000000000..532d8286707
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.4/lib/nunit.framework.xml
@@ -0,0 +1,10984 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>nunit.framework</name>
+    </assembly>
+    <members>
+        <member name="T:NUnit.Framework.ActionTargets">
+            <summary>
+            The different targets a test action attribute can be applied to
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.ActionTargets.Default">
+            <summary>
+            Default target, which is determined by where the action attribute is attached
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.ActionTargets.Test">
+            <summary>
+            Target a individual test case
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.ActionTargets.Suite">
+            <summary>
+            Target a suite of test cases
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.TestDelegate">
+            <summary>
+            Delegate used by tests that execute code and
+            capture any thrown exception.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Assert">
+            <summary>
+            The Assert class contains a collection of static methods that
+            implement the most common assertions used in NUnit.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Assert.#ctor">
+            <summary>
+            We don't actually want any instances of this object, but some people
+            like to inherit from it to add other static methods. Hence, the
+            protected constructor disallows any instances of this object. 
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Equals(System.Object,System.Object)">
+            <summary>
+            The Equals method throws an AssertionException. This is done 
+            to make sure there is no mistake by calling this function.
+            </summary>
+            <param name="a"></param>
+            <param name="b"></param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.ReferenceEquals(System.Object,System.Object)">
+            <summary>
+            override the default ReferenceEquals to throw an AssertionException. This 
+            implementation makes sure there is no mistake in calling this function 
+            as part of Assert. 
+            </summary>
+            <param name="a"></param>
+            <param name="b"></param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Pass(System.String,System.Object[])">
+            <summary>
+            Throws a <see cref="T:NUnit.Framework.SuccessException"/> with the message and arguments 
+            that are passed in. This allows a test to be cut short, with a result
+            of success returned to NUnit.
+            </summary>
+            <param name="message">The message to initialize the <see cref="T:NUnit.Framework.AssertionException"/> with.</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Pass(System.String)">
+            <summary>
+            Throws a <see cref="T:NUnit.Framework.SuccessException"/> with the message and arguments 
+            that are passed in. This allows a test to be cut short, with a result
+            of success returned to NUnit.
+            </summary>
+            <param name="message">The message to initialize the <see cref="T:NUnit.Framework.AssertionException"/> with.</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Pass">
+            <summary>
+            Throws a <see cref="T:NUnit.Framework.SuccessException"/> with the message and arguments 
+            that are passed in. This allows a test to be cut short, with a result
+            of success returned to NUnit.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Fail(System.String,System.Object[])">
+            <summary>
+            Throws an <see cref="T:NUnit.Framework.AssertionException"/> with the message and arguments 
+            that are passed in. This is used by the other Assert functions. 
+            </summary>
+            <param name="message">The message to initialize the <see cref="T:NUnit.Framework.AssertionException"/> with.</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Fail(System.String)">
+            <summary>
+            Throws an <see cref="T:NUnit.Framework.AssertionException"/> with the message that is 
+            passed in. This is used by the other Assert functions. 
+            </summary>
+            <param name="message">The message to initialize the <see cref="T:NUnit.Framework.AssertionException"/> with.</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Fail">
+            <summary>
+            Throws an <see cref="T:NUnit.Framework.AssertionException"/>. 
+            This is used by the other Assert functions. 
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Ignore(System.String,System.Object[])">
+            <summary>
+            Throws an <see cref="T:NUnit.Framework.IgnoreException"/> with the message and arguments 
+            that are passed in.  This causes the test to be reported as ignored.
+            </summary>
+            <param name="message">The message to initialize the <see cref="T:NUnit.Framework.AssertionException"/> with.</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Ignore(System.String)">
+            <summary>
+            Throws an <see cref="T:NUnit.Framework.IgnoreException"/> with the message that is 
+            passed in. This causes the test to be reported as ignored. 
+            </summary>
+            <param name="message">The message to initialize the <see cref="T:NUnit.Framework.AssertionException"/> with.</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Ignore">
+            <summary>
+            Throws an <see cref="T:NUnit.Framework.IgnoreException"/>. 
+            This causes the test to be reported as ignored. 
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Inconclusive(System.String,System.Object[])">
+            <summary>
+            Throws an <see cref="T:NUnit.Framework.InconclusiveException"/> with the message and arguments 
+            that are passed in.  This causes the test to be reported as inconclusive.
+            </summary>
+            <param name="message">The message to initialize the <see cref="T:NUnit.Framework.InconclusiveException"/> with.</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Inconclusive(System.String)">
+            <summary>
+            Throws an <see cref="T:NUnit.Framework.InconclusiveException"/> with the message that is 
+            passed in. This causes the test to be reported as inconclusive. 
+            </summary>
+            <param name="message">The message to initialize the <see cref="T:NUnit.Framework.InconclusiveException"/> with.</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Inconclusive">
+            <summary>
+            Throws an <see cref="T:NUnit.Framework.InconclusiveException"/>. 
+            This causes the test to be reported as Inconclusive. 
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Assert.That(System.Object,NUnit.Framework.Constraints.IResolveConstraint)">
+            <summary>
+            Apply a constraint to an actual value, succeeding if the constraint
+            is satisfied and throwing an assertion exception on failure.
+            </summary>
+            <param name="actual">The actual value to test</param>
+            <param name="expression">A Constraint to be applied</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.That(System.Object,NUnit.Framework.Constraints.IResolveConstraint,System.String)">
+            <summary>
+            Apply a constraint to an actual value, succeeding if the constraint
+            is satisfied and throwing an assertion exception on failure.
+            </summary>
+            <param name="actual">The actual value to test</param>
+            <param name="expression">A Constraint to be applied</param>
+            <param name="message">The message that will be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.That(System.Object,NUnit.Framework.Constraints.IResolveConstraint,System.String,System.Object[])">
+            <summary>
+            Apply a constraint to an actual value, succeeding if the constraint
+            is satisfied and throwing an assertion exception on failure.
+            </summary>
+            <param name="actual">The actual value to test</param>
+            <param name="expression">A Constraint expression to be applied</param>
+            <param name="message">The message that will be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.That(System.Boolean,System.String,System.Object[])">
+            <summary>
+            Asserts that a condition is true. If the condition is false the method throws
+            an <see cref="T:NUnit.Framework.AssertionException"/>.
+            </summary> 
+            <param name="condition">The evaluated condition</param>
+            <param name="message">The message to display if the condition is false</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.That(System.Boolean,System.String)">
+            <summary>
+            Asserts that a condition is true. If the condition is false the method throws
+            an <see cref="T:NUnit.Framework.AssertionException"/>.
+            </summary>
+            <param name="condition">The evaluated condition</param>
+            <param name="message">The message to display if the condition is false</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.That(System.Boolean)">
+            <summary>
+            Asserts that a condition is true. If the condition is false the method throws
+            an <see cref="T:NUnit.Framework.AssertionException"/>.
+            </summary>
+            <param name="condition">The evaluated condition</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.That``1(NUnit.Framework.Constraints.ActualValueDelegate{``0},NUnit.Framework.Constraints.IResolveConstraint)">
+            <summary>
+            Apply a constraint to an actual value, succeeding if the constraint
+            is satisfied and throwing an assertion exception on failure.
+            </summary>
+            <param name="del">An ActualValueDelegate returning the value to be tested</param>
+            <param name="expr">A Constraint expression to be applied</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.That``1(NUnit.Framework.Constraints.ActualValueDelegate{``0},NUnit.Framework.Constraints.IResolveConstraint,System.String)">
+            <summary>
+            Apply a constraint to an actual value, succeeding if the constraint
+            is satisfied and throwing an assertion exception on failure.
+            </summary>
+            <param name="del">An ActualValueDelegate returning the value to be tested</param>
+            <param name="expr">A Constraint expression to be applied</param>
+            <param name="message">The message that will be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.That``1(NUnit.Framework.Constraints.ActualValueDelegate{``0},NUnit.Framework.Constraints.IResolveConstraint,System.String,System.Object[])">
+            <summary>
+            Apply a constraint to an actual value, succeeding if the constraint
+            is satisfied and throwing an assertion exception on failure.
+            </summary>
+            <param name="del">An ActualValueDelegate returning the value to be tested</param>
+            <param name="expr">A Constraint expression to be applied</param>
+            <param name="message">The message that will be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.That``1(``0@,NUnit.Framework.Constraints.IResolveConstraint)">
+            <summary>
+            Apply a constraint to a referenced value, succeeding if the constraint
+            is satisfied and throwing an assertion exception on failure.
+            </summary>
+            <param name="actual">The actual value to test</param>
+            <param name="expression">A Constraint to be applied</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.That``1(``0@,NUnit.Framework.Constraints.IResolveConstraint,System.String)">
+            <summary>
+            Apply a constraint to a referenced value, succeeding if the constraint
+            is satisfied and throwing an assertion exception on failure.
+            </summary>
+            <param name="actual">The actual value to test</param>
+            <param name="expression">A Constraint to be applied</param>
+            <param name="message">The message that will be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.That``1(``0@,NUnit.Framework.Constraints.IResolveConstraint,System.String,System.Object[])">
+            <summary>
+            Apply a constraint to a referenced value, succeeding if the constraint
+            is satisfied and throwing an assertion exception on failure.
+            </summary>
+            <param name="actual">The actual value to test</param>
+            <param name="expression">A Constraint to be applied</param>
+            <param name="message">The message that will be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.That(NUnit.Framework.TestDelegate,NUnit.Framework.Constraints.IResolveConstraint)">
+            <summary>
+            Asserts that the code represented by a delegate throws an exception
+            that satisfies the constraint provided.
+            </summary>
+            <param name="code">A TestDelegate to be executed</param>
+            <param name="constraint">A ThrowsConstraint used in the test</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.ByVal(System.Object,NUnit.Framework.Constraints.IResolveConstraint)">
+            <summary>
+            Apply a constraint to an actual value, succeeding if the constraint
+            is satisfied and throwing an assertion exception on failure.
+            Used as a synonym for That in rare cases where a private setter 
+            causes a Visual Basic compilation error.
+            </summary>
+            <param name="actual">The actual value to test</param>
+            <param name="expression">A Constraint to be applied</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.ByVal(System.Object,NUnit.Framework.Constraints.IResolveConstraint,System.String)">
+            <summary>
+            Apply a constraint to an actual value, succeeding if the constraint
+            is satisfied and throwing an assertion exception on failure.
+            Used as a synonym for That in rare cases where a private setter 
+            causes a Visual Basic compilation error.
+            </summary>
+            <param name="actual">The actual value to test</param>
+            <param name="expression">A Constraint to be applied</param>
+            <param name="message">The message that will be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.ByVal(System.Object,NUnit.Framework.Constraints.IResolveConstraint,System.String,System.Object[])">
+            <summary>
+            Apply a constraint to an actual value, succeeding if the constraint
+            is satisfied and throwing an assertion exception on failure. 
+            Used as a synonym for That in rare cases where a private setter 
+            causes a Visual Basic compilation error.
+            </summary>
+            <remarks>
+            This method is provided for use by VB developers needing to test
+            the value of properties with private setters.
+            </remarks>
+            <param name="actual">The actual value to test</param>
+            <param name="expression">A Constraint expression to be applied</param>
+            <param name="message">The message that will be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Throws(NUnit.Framework.Constraints.IResolveConstraint,NUnit.Framework.TestDelegate,System.String,System.Object[])">
+            <summary>
+            Verifies that a delegate throws a particular exception when called.
+            </summary>
+            <param name="expression">A constraint to be satisfied by the exception</param>
+            <param name="code">A TestDelegate</param>
+            <param name="message">The message that will be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Throws(NUnit.Framework.Constraints.IResolveConstraint,NUnit.Framework.TestDelegate,System.String)">
+            <summary>
+            Verifies that a delegate throws a particular exception when called.
+            </summary>
+            <param name="expression">A constraint to be satisfied by the exception</param>
+            <param name="code">A TestDelegate</param>
+            <param name="message">The message that will be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Throws(NUnit.Framework.Constraints.IResolveConstraint,NUnit.Framework.TestDelegate)">
+            <summary>
+            Verifies that a delegate throws a particular exception when called.
+            </summary>
+            <param name="expression">A constraint to be satisfied by the exception</param>
+            <param name="code">A TestDelegate</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Throws(System.Type,NUnit.Framework.TestDelegate,System.String,System.Object[])">
+            <summary>
+            Verifies that a delegate throws a particular exception when called.
+            </summary>
+            <param name="expectedExceptionType">The exception Type expected</param>
+            <param name="code">A TestDelegate</param>
+            <param name="message">The message that will be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Throws(System.Type,NUnit.Framework.TestDelegate,System.String)">
+            <summary>
+            Verifies that a delegate throws a particular exception when called.
+            </summary>
+            <param name="expectedExceptionType">The exception Type expected</param>
+            <param name="code">A TestDelegate</param>
+            <param name="message">The message that will be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Throws(System.Type,NUnit.Framework.TestDelegate)">
+            <summary>
+            Verifies that a delegate throws a particular exception when called.
+            </summary>
+            <param name="expectedExceptionType">The exception Type expected</param>
+            <param name="code">A TestDelegate</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Throws``1(NUnit.Framework.TestDelegate,System.String,System.Object[])">
+            <summary>
+            Verifies that a delegate throws a particular exception when called.
+            </summary>
+            <typeparam name="T">Type of the expected exception</typeparam>
+            <param name="code">A TestDelegate</param>
+            <param name="message">The message that will be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Throws``1(NUnit.Framework.TestDelegate,System.String)">
+            <summary>
+            Verifies that a delegate throws a particular exception when called.
+            </summary>
+            <typeparam name="T">Type of the expected exception</typeparam>
+            <param name="code">A TestDelegate</param>
+            <param name="message">The message that will be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Throws``1(NUnit.Framework.TestDelegate)">
+            <summary>
+            Verifies that a delegate throws a particular exception when called.
+            </summary>
+            <typeparam name="T">Type of the expected exception</typeparam>
+            <param name="code">A TestDelegate</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Catch(NUnit.Framework.TestDelegate,System.String,System.Object[])">
+            <summary>
+            Verifies that a delegate throws an exception when called
+            and returns it.
+            </summary>
+            <param name="code">A TestDelegate</param>
+            <param name="message">The message that will be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Catch(NUnit.Framework.TestDelegate,System.String)">
+            <summary>
+            Verifies that a delegate throws an exception when called
+            and returns it.
+            </summary>
+            <param name="code">A TestDelegate</param>
+            <param name="message">The message that will be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Catch(NUnit.Framework.TestDelegate)">
+            <summary>
+            Verifies that a delegate throws an exception when called
+            and returns it.
+            </summary>
+            <param name="code">A TestDelegate</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Catch(System.Type,NUnit.Framework.TestDelegate,System.String,System.Object[])">
+            <summary>
+            Verifies that a delegate throws an exception of a certain Type
+            or one derived from it when called and returns it.
+            </summary>
+            <param name="expectedExceptionType">The expected Exception Type</param>
+            <param name="code">A TestDelegate</param>
+            <param name="message">The message that will be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Catch(System.Type,NUnit.Framework.TestDelegate,System.String)">
+            <summary>
+            Verifies that a delegate throws an exception of a certain Type
+            or one derived from it when called and returns it.
+            </summary>
+            <param name="expectedExceptionType">The expected Exception Type</param>
+            <param name="code">A TestDelegate</param>
+            <param name="message">The message that will be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Catch(System.Type,NUnit.Framework.TestDelegate)">
+            <summary>
+            Verifies that a delegate throws an exception of a certain Type
+            or one derived from it when called and returns it.
+            </summary>
+            <param name="expectedExceptionType">The expected Exception Type</param>
+            <param name="code">A TestDelegate</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Catch``1(NUnit.Framework.TestDelegate,System.String,System.Object[])">
+            <summary>
+            Verifies that a delegate throws an exception of a certain Type
+            or one derived from it when called and returns it.
+            </summary>
+            <typeparam name="T">The expected Exception Type</typeparam>
+            <param name="code">A TestDelegate</param>
+            <param name="message">The message that will be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Catch``1(NUnit.Framework.TestDelegate,System.String)">
+            <summary>
+            Verifies that a delegate throws an exception of a certain Type
+            or one derived from it when called and returns it.
+            </summary>
+            <typeparam name="T">The expected Exception Type</typeparam>
+            <param name="code">A TestDelegate</param>
+            <param name="message">The message that will be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Catch``1(NUnit.Framework.TestDelegate)">
+            <summary>
+            Verifies that a delegate throws an exception of a certain Type
+            or one derived from it when called and returns it.
+            </summary>
+            <typeparam name="T">The expected Exception Type</typeparam>
+            <param name="code">A TestDelegate</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.DoesNotThrow(NUnit.Framework.TestDelegate,System.String,System.Object[])">
+            <summary>
+            Verifies that a delegate does not throw an exception
+            </summary>
+            <param name="code">A TestDelegate</param>
+            <param name="message">The message that will be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.DoesNotThrow(NUnit.Framework.TestDelegate,System.String)">
+            <summary>
+            Verifies that a delegate does not throw an exception.
+            </summary>
+            <param name="code">A TestDelegate</param>
+            <param name="message">The message that will be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.DoesNotThrow(NUnit.Framework.TestDelegate)">
+            <summary>
+            Verifies that a delegate does not throw an exception.
+            </summary>
+            <param name="code">A TestDelegate</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.True(System.Boolean,System.String,System.Object[])">
+            <summary>
+            Asserts that a condition is true. If the condition is false the method throws
+            an <see cref="T:NUnit.Framework.AssertionException"/>.
+            </summary>
+            <param name="condition">The evaluated condition</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.True(System.Boolean,System.String)">
+            <summary>
+            Asserts that a condition is true. If the condition is false the method throws
+            an <see cref="T:NUnit.Framework.AssertionException"/>.
+            </summary>
+            <param name="condition">The evaluated condition</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.True(System.Boolean)">
+            <summary>
+            Asserts that a condition is true. If the condition is false the method throws
+            an <see cref="T:NUnit.Framework.AssertionException"/>.
+            </summary>
+            <param name="condition">The evaluated condition</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsTrue(System.Boolean,System.String,System.Object[])">
+            <summary>
+            Asserts that a condition is true. If the condition is false the method throws
+            an <see cref="T:NUnit.Framework.AssertionException"/>.
+            </summary>
+            <param name="condition">The evaluated condition</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsTrue(System.Boolean,System.String)">
+            <summary>
+            Asserts that a condition is true. If the condition is false the method throws
+            an <see cref="T:NUnit.Framework.AssertionException"/>.
+            </summary>
+            <param name="condition">The evaluated condition</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsTrue(System.Boolean)">
+            <summary>
+            Asserts that a condition is true. If the condition is false the method throws
+            an <see cref="T:NUnit.Framework.AssertionException"/>.
+            </summary>
+            <param name="condition">The evaluated condition</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.False(System.Boolean,System.String,System.Object[])">
+            <summary>
+            Asserts that a condition is false. If the condition is true the method throws
+            an <see cref="T:NUnit.Framework.AssertionException"/>.
+            </summary> 
+            <param name="condition">The evaluated condition</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.False(System.Boolean,System.String)">
+            <summary>
+            Asserts that a condition is false. If the condition is true the method throws
+            an <see cref="T:NUnit.Framework.AssertionException"/>.
+            </summary> 
+            <param name="condition">The evaluated condition</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.False(System.Boolean)">
+            <summary>
+            Asserts that a condition is false. If the condition is true the method throws
+            an <see cref="T:NUnit.Framework.AssertionException"/>.
+            </summary> 
+            <param name="condition">The evaluated condition</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsFalse(System.Boolean,System.String,System.Object[])">
+            <summary>
+            Asserts that a condition is false. If the condition is true the method throws
+            an <see cref="T:NUnit.Framework.AssertionException"/>.
+            </summary> 
+            <param name="condition">The evaluated condition</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsFalse(System.Boolean,System.String)">
+            <summary>
+            Asserts that a condition is false. If the condition is true the method throws
+            an <see cref="T:NUnit.Framework.AssertionException"/>.
+            </summary> 
+            <param name="condition">The evaluated condition</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsFalse(System.Boolean)">
+            <summary>
+            Asserts that a condition is false. If the condition is true the method throws
+            an <see cref="T:NUnit.Framework.AssertionException"/>.
+            </summary> 
+            <param name="condition">The evaluated condition</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.NotNull(System.Object,System.String,System.Object[])">
+            <summary>
+            Verifies that the object that is passed in is not equal to <code>null</code>
+            If the object is <code>null</code> then an <see cref="T:NUnit.Framework.AssertionException"/>
+            is thrown.
+            </summary>
+            <param name="anObject">The object that is to be tested</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.NotNull(System.Object,System.String)">
+            <summary>
+            Verifies that the object that is passed in is not equal to <code>null</code>
+            If the object is <code>null</code> then an <see cref="T:NUnit.Framework.AssertionException"/>
+            is thrown.
+            </summary>
+            <param name="anObject">The object that is to be tested</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.NotNull(System.Object)">
+            <summary>
+            Verifies that the object that is passed in is not equal to <code>null</code>
+            If the object is <code>null</code> then an <see cref="T:NUnit.Framework.AssertionException"/>
+            is thrown.
+            </summary>
+            <param name="anObject">The object that is to be tested</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNotNull(System.Object,System.String,System.Object[])">
+            <summary>
+            Verifies that the object that is passed in is not equal to <code>null</code>
+            If the object is <code>null</code> then an <see cref="T:NUnit.Framework.AssertionException"/>
+            is thrown.
+            </summary>
+            <param name="anObject">The object that is to be tested</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNotNull(System.Object,System.String)">
+            <summary>
+            Verifies that the object that is passed in is not equal to <code>null</code>
+            If the object is <code>null</code> then an <see cref="T:NUnit.Framework.AssertionException"/>
+            is thrown.
+            </summary>
+            <param name="anObject">The object that is to be tested</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNotNull(System.Object)">
+            <summary>
+            Verifies that the object that is passed in is not equal to <code>null</code>
+            If the object is <code>null</code> then an <see cref="T:NUnit.Framework.AssertionException"/>
+            is thrown.
+            </summary>
+            <param name="anObject">The object that is to be tested</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Null(System.Object,System.String,System.Object[])">
+            <summary>
+            Verifies that the object that is passed in is equal to <code>null</code>
+            If the object is not <code>null</code> then an <see cref="T:NUnit.Framework.AssertionException"/>
+            is thrown.
+            </summary>
+            <param name="anObject">The object that is to be tested</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Null(System.Object,System.String)">
+            <summary>
+            Verifies that the object that is passed in is equal to <code>null</code>
+            If the object is not <code>null</code> then an <see cref="T:NUnit.Framework.AssertionException"/>
+            is thrown.
+            </summary>
+            <param name="anObject">The object that is to be tested</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Null(System.Object)">
+            <summary>
+            Verifies that the object that is passed in is equal to <code>null</code>
+            If the object is not <code>null</code> then an <see cref="T:NUnit.Framework.AssertionException"/>
+            is thrown.
+            </summary>
+            <param name="anObject">The object that is to be tested</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNull(System.Object,System.String,System.Object[])">
+            <summary>
+            Verifies that the object that is passed in is equal to <code>null</code>
+            If the object is not <code>null</code> then an <see cref="T:NUnit.Framework.AssertionException"/>
+            is thrown.
+            </summary>
+            <param name="anObject">The object that is to be tested</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNull(System.Object,System.String)">
+            <summary>
+            Verifies that the object that is passed in is equal to <code>null</code>
+            If the object is not <code>null</code> then an <see cref="T:NUnit.Framework.AssertionException"/>
+            is thrown.
+            </summary>
+            <param name="anObject">The object that is to be tested</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNull(System.Object)">
+            <summary>
+            Verifies that the object that is passed in is equal to <code>null</code>
+            If the object is not <code>null</code> then an <see cref="T:NUnit.Framework.AssertionException"/>
+            is thrown.
+            </summary>
+            <param name="anObject">The object that is to be tested</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreEqual(System.Int32,System.Int32,System.String,System.Object[])">
+            <summary>
+            Verifies that two ints are equal. If they are not, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreEqual(System.Int32,System.Int32,System.String)">
+            <summary>
+            Verifies that two ints are equal. If they are not, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreEqual(System.Int32,System.Int32)">
+            <summary>
+            Verifies that two ints are equal. If they are not, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreEqual(System.Int64,System.Int64,System.String,System.Object[])">
+            <summary>
+            Verifies that two longs are equal. If they are not, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreEqual(System.Int64,System.Int64,System.String)">
+            <summary>
+            Verifies that two longs are equal. If they are not, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreEqual(System.Int64,System.Int64)">
+            <summary>
+            Verifies that two longs are equal. If they are not, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreEqual(System.UInt32,System.UInt32,System.String,System.Object[])">
+            <summary>
+            Verifies that two unsigned ints are equal. If they are not, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreEqual(System.UInt32,System.UInt32,System.String)">
+            <summary>
+            Verifies that two unsigned ints are equal. If they are not, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreEqual(System.UInt32,System.UInt32)">
+            <summary>
+            Verifies that two unsigned ints are equal. If they are not, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreEqual(System.UInt64,System.UInt64,System.String,System.Object[])">
+            <summary>
+            Verifies that two unsigned longs are equal. If they are not, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreEqual(System.UInt64,System.UInt64,System.String)">
+            <summary>
+            Verifies that two unsigned longs are equal. If they are not, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreEqual(System.UInt64,System.UInt64)">
+            <summary>
+            Verifies that two unsigned longs are equal. If they are not, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreEqual(System.Decimal,System.Decimal,System.String,System.Object[])">
+            <summary>
+            Verifies that two decimals are equal. If they are not, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreEqual(System.Decimal,System.Decimal,System.String)">
+            <summary>
+            Verifies that two decimals are equal. If they are not, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreEqual(System.Decimal,System.Decimal)">
+            <summary>
+            Verifies that two decimals are equal. If they are not, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreEqual(System.Double,System.Double,System.Double,System.String,System.Object[])">
+            <summary>
+            Verifies that two doubles are equal considering a delta. If the
+            expected value is infinity then the delta value is ignored. If 
+            they are not equal then an <see cref="T:NUnit.Framework.AssertionException"/> is
+            thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="delta">The maximum acceptable difference between the
+            the expected and the actual</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreEqual(System.Double,System.Double,System.Double,System.String)">
+            <summary>
+            Verifies that two doubles are equal considering a delta. If the
+            expected value is infinity then the delta value is ignored. If 
+            they are not equal then an <see cref="T:NUnit.Framework.AssertionException"/> is
+            thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="delta">The maximum acceptable difference between the
+            the expected and the actual</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreEqual(System.Double,System.Double,System.Double)">
+            <summary>
+            Verifies that two doubles are equal considering a delta. If the
+            expected value is infinity then the delta value is ignored. If 
+            they are not equal then an <see cref="T:NUnit.Framework.AssertionException"/> is
+            thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="delta">The maximum acceptable difference between the
+            the expected and the actual</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreEqual(System.Double,System.Nullable{System.Double},System.Double,System.String,System.Object[])">
+            <summary>
+            Verifies that two doubles are equal considering a delta. If the
+            expected value is infinity then the delta value is ignored. If 
+            they are not equal then an <see cref="T:NUnit.Framework.AssertionException"/> is
+            thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="delta">The maximum acceptable difference between the
+            the expected and the actual</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreEqual(System.Double,System.Nullable{System.Double},System.Double,System.String)">
+            <summary>
+            Verifies that two doubles are equal considering a delta. If the
+            expected value is infinity then the delta value is ignored. If 
+            they are not equal then an <see cref="T:NUnit.Framework.AssertionException"/> is
+            thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="delta">The maximum acceptable difference between the
+            the expected and the actual</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreEqual(System.Double,System.Nullable{System.Double},System.Double)">
+            <summary>
+            Verifies that two doubles are equal considering a delta. If the
+            expected value is infinity then the delta value is ignored. If 
+            they are not equal then an <see cref="T:NUnit.Framework.AssertionException"/> is
+            thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="delta">The maximum acceptable difference between the
+            the expected and the actual</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreEqual(System.Object,System.Object,System.String,System.Object[])">
+            <summary>
+            Verifies that two objects are equal.  Two objects are considered
+            equal if both are null, or if both have the same value. NUnit
+            has special semantics for some object types.
+            If they are not equal an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The value that is expected</param>
+            <param name="actual">The actual value</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreEqual(System.Object,System.Object,System.String)">
+            <summary>
+            Verifies that two objects are equal.  Two objects are considered
+            equal if both are null, or if both have the same value. NUnit
+            has special semantics for some object types.
+            If they are not equal an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The value that is expected</param>
+            <param name="actual">The actual value</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreEqual(System.Object,System.Object)">
+            <summary>
+            Verifies that two objects are equal.  Two objects are considered
+            equal if both are null, or if both have the same value. NUnit
+            has special semantics for some object types.
+            If they are not equal an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The value that is expected</param>
+            <param name="actual">The actual value</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreNotEqual(System.Int32,System.Int32,System.String,System.Object[])">
+            <summary>
+            Verifies that two ints are not equal. If they are equal, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreNotEqual(System.Int32,System.Int32,System.String)">
+            <summary>
+            Verifies that two ints are not equal. If they are equal, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreNotEqual(System.Int32,System.Int32)">
+            <summary>
+            Verifies that two ints are not equal. If they are equal, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreNotEqual(System.Int64,System.Int64,System.String,System.Object[])">
+            <summary>
+            Verifies that two longs are not equal. If they are equal, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreNotEqual(System.Int64,System.Int64,System.String)">
+            <summary>
+            Verifies that two longs are not equal. If they are equal, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreNotEqual(System.Int64,System.Int64)">
+            <summary>
+            Verifies that two longs are not equal. If they are equal, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreNotEqual(System.UInt32,System.UInt32,System.String,System.Object[])">
+            <summary>
+            Verifies that two unsigned ints are not equal. If they are equal, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreNotEqual(System.UInt32,System.UInt32,System.String)">
+            <summary>
+            Verifies that two unsigned ints are not equal. If they are equal, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreNotEqual(System.UInt32,System.UInt32)">
+            <summary>
+            Verifies that two unsigned ints are not equal. If they are equal, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreNotEqual(System.UInt64,System.UInt64,System.String,System.Object[])">
+            <summary>
+            Verifies that two unsigned longs are not equal. If they are equal, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreNotEqual(System.UInt64,System.UInt64,System.String)">
+            <summary>
+            Verifies that two unsigned longs are not equal. If they are equal, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreNotEqual(System.UInt64,System.UInt64)">
+            <summary>
+            Verifies that two unsigned longs are not equal. If they are equal, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreNotEqual(System.Decimal,System.Decimal,System.String,System.Object[])">
+            <summary>
+            Verifies that two decimals are not equal. If they are equal, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreNotEqual(System.Decimal,System.Decimal,System.String)">
+            <summary>
+            Verifies that two decimals are not equal. If they are equal, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreNotEqual(System.Decimal,System.Decimal)">
+            <summary>
+            Verifies that two decimals are not equal. If they are equal, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreNotEqual(System.Single,System.Single,System.String,System.Object[])">
+            <summary>
+            Verifies that two floats are not equal. If they are equal, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreNotEqual(System.Single,System.Single,System.String)">
+            <summary>
+            Verifies that two floats are not equal. If they are equal, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreNotEqual(System.Single,System.Single)">
+            <summary>
+            Verifies that two floats are not equal. If they are equal, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreNotEqual(System.Double,System.Double,System.String,System.Object[])">
+            <summary>
+            Verifies that two doubles are not equal. If they are equal, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreNotEqual(System.Double,System.Double,System.String)">
+            <summary>
+            Verifies that two doubles are not equal. If they are equal, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreNotEqual(System.Double,System.Double)">
+            <summary>
+            Verifies that two doubles are not equal. If they are equal, then an 
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreNotEqual(System.Object,System.Object,System.String,System.Object[])">
+            <summary>
+            Verifies that two objects are not equal.  Two objects are considered
+            equal if both are null, or if both have the same value. NUnit
+            has special semantics for some object types.
+            If they are equal an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The value that is expected</param>
+            <param name="actual">The actual value</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreNotEqual(System.Object,System.Object,System.String)">
+            <summary>
+            Verifies that two objects are not equal.  Two objects are considered
+            equal if both are null, or if both have the same value. NUnit
+            has special semantics for some object types.
+            If they are equal an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The value that is expected</param>
+            <param name="actual">The actual value</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreNotEqual(System.Object,System.Object)">
+            <summary>
+            Verifies that two objects are not equal.  Two objects are considered
+            equal if both are null, or if both have the same value. NUnit
+            has special semantics for some object types.
+            If they are equal an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The value that is expected</param>
+            <param name="actual">The actual value</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreSame(System.Object,System.Object,System.String,System.Object[])">
+            <summary>
+            Asserts that two objects refer to the same object. If they
+            are not the same an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected object</param>
+            <param name="actual">The actual object</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreSame(System.Object,System.Object,System.String)">
+            <summary>
+            Asserts that two objects refer to the same object. If they
+            are not the same an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected object</param>
+            <param name="actual">The actual object</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreSame(System.Object,System.Object)">
+            <summary>
+            Asserts that two objects refer to the same object. If they
+            are not the same an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected object</param>
+            <param name="actual">The actual object</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreNotSame(System.Object,System.Object,System.String,System.Object[])">
+            <summary>
+            Asserts that two objects do not refer to the same object. If they
+            are the same an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected object</param>
+            <param name="actual">The actual object</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreNotSame(System.Object,System.Object,System.String)">
+            <summary>
+            Asserts that two objects do not refer to the same object. If they
+            are the same an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected object</param>
+            <param name="actual">The actual object</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AreNotSame(System.Object,System.Object)">
+            <summary>
+            Asserts that two objects do not refer to the same object. If they
+            are the same an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected object</param>
+            <param name="actual">The actual object</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNaN(System.Double,System.String,System.Object[])">
+            <summary>
+            Verifies that the double that is passed in is an <code>NaN</code> value.
+            If the object is not <code>NaN</code> then an <see cref="T:NUnit.Framework.AssertionException"/>
+            is thrown.
+            </summary>
+            <param name="aDouble">The value that is to be tested</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNaN(System.Double,System.String)">
+            <summary>
+            Verifies that the double that is passed in is an <code>NaN</code> value.
+            If the object is not <code>NaN</code> then an <see cref="T:NUnit.Framework.AssertionException"/>
+            is thrown.
+            </summary>
+            <param name="aDouble">The value that is to be tested</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNaN(System.Double)">
+            <summary>
+            Verifies that the double that is passed in is an <code>NaN</code> value.
+            If the object is not <code>NaN</code> then an <see cref="T:NUnit.Framework.AssertionException"/>
+            is thrown.
+            </summary>
+            <param name="aDouble">The value that is to be tested</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNaN(System.Nullable{System.Double},System.String,System.Object[])">
+            <summary>
+            Verifies that the double that is passed in is an <code>NaN</code> value.
+            If the object is not <code>NaN</code> then an <see cref="T:NUnit.Framework.AssertionException"/>
+            is thrown.
+            </summary>
+            <param name="aDouble">The value that is to be tested</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNaN(System.Nullable{System.Double},System.String)">
+            <summary>
+            Verifies that the double that is passed in is an <code>NaN</code> value.
+            If the object is not <code>NaN</code> then an <see cref="T:NUnit.Framework.AssertionException"/>
+            is thrown.
+            </summary>
+            <param name="aDouble">The value that is to be tested</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNaN(System.Nullable{System.Double})">
+            <summary>
+            Verifies that the double that is passed in is an <code>NaN</code> value.
+            If the object is not <code>NaN</code> then an <see cref="T:NUnit.Framework.AssertionException"/>
+            is thrown.
+            </summary>
+            <param name="aDouble">The value that is to be tested</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsEmpty(System.String,System.String,System.Object[])">
+            <summary>
+            Assert that a string is empty - that is equal to string.Empty
+            </summary>
+            <param name="aString">The string to be tested</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsEmpty(System.String,System.String)">
+            <summary>
+            Assert that a string is empty - that is equal to string.Empty
+            </summary>
+            <param name="aString">The string to be tested</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsEmpty(System.String)">
+            <summary>
+            Assert that a string is empty - that is equal to string.Empty
+            </summary>
+            <param name="aString">The string to be tested</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsEmpty(System.Collections.IEnumerable,System.String,System.Object[])">
+            <summary>
+            Assert that an array, list or other collection is empty
+            </summary>
+            <param name="collection">An array, list or other collection implementing ICollection</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsEmpty(System.Collections.IEnumerable,System.String)">
+            <summary>
+            Assert that an array, list or other collection is empty
+            </summary>
+            <param name="collection">An array, list or other collection implementing ICollection</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsEmpty(System.Collections.IEnumerable)">
+            <summary>
+            Assert that an array, list or other collection is empty
+            </summary>
+            <param name="collection">An array, list or other collection implementing ICollection</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNotEmpty(System.String,System.String,System.Object[])">
+            <summary>
+            Assert that a string is not empty - that is not equal to string.Empty
+            </summary>
+            <param name="aString">The string to be tested</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNotEmpty(System.String,System.String)">
+            <summary>
+            Assert that a string is not empty - that is not equal to string.Empty
+            </summary>
+            <param name="aString">The string to be tested</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNotEmpty(System.String)">
+            <summary>
+            Assert that a string is not empty - that is not equal to string.Empty
+            </summary>
+            <param name="aString">The string to be tested</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNotEmpty(System.Collections.IEnumerable,System.String,System.Object[])">
+            <summary>
+            Assert that an array, list or other collection is not empty
+            </summary>
+            <param name="collection">An array, list or other collection implementing ICollection</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNotEmpty(System.Collections.IEnumerable,System.String)">
+            <summary>
+            Assert that an array, list or other collection is not empty
+            </summary>
+            <param name="collection">An array, list or other collection implementing ICollection</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNotEmpty(System.Collections.IEnumerable)">
+            <summary>
+            Assert that an array, list or other collection is not empty
+            </summary>
+            <param name="collection">An array, list or other collection implementing ICollection</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNullOrEmpty(System.String,System.String,System.Object[])">
+            <summary>
+            Assert that a string is either null or equal to string.Empty
+            </summary>
+            <param name="aString">The string to be tested</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNullOrEmpty(System.String,System.String)">
+            <summary>
+            Assert that a string is either null or equal to string.Empty
+            </summary>
+            <param name="aString">The string to be tested</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNullOrEmpty(System.String)">
+            <summary>
+            Assert that a string is either null or equal to string.Empty
+            </summary>
+            <param name="aString">The string to be tested</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNotNullOrEmpty(System.String,System.String,System.Object[])">
+            <summary>
+            Assert that a string is not null or empty
+            </summary>
+            <param name="aString">The string to be tested</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNotNullOrEmpty(System.String,System.String)">
+            <summary>
+            Assert that a string is not null or empty
+            </summary>
+            <param name="aString">The string to be tested</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNotNullOrEmpty(System.String)">
+            <summary>
+            Assert that a string is not null or empty
+            </summary>
+            <param name="aString">The string to be tested</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsAssignableFrom(System.Type,System.Object,System.String,System.Object[])">
+            <summary>
+            Asserts that an object may be assigned a  value of a given Type.
+            </summary>
+            <param name="expected">The expected Type.</param>
+            <param name="actual">The object under examination</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsAssignableFrom(System.Type,System.Object,System.String)">
+            <summary>
+            Asserts that an object may be assigned a  value of a given Type.
+            </summary>
+            <param name="expected">The expected Type.</param>
+            <param name="actual">The object under examination</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsAssignableFrom(System.Type,System.Object)">
+            <summary>
+            Asserts that an object may be assigned a  value of a given Type.
+            </summary>
+            <param name="expected">The expected Type.</param>
+            <param name="actual">The object under examination</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsAssignableFrom``1(System.Object,System.String,System.Object[])">
+            <summary>
+            Asserts that an object may be assigned a  value of a given Type.
+            </summary>
+            <typeparam name="T">The expected Type.</typeparam>
+            <param name="actual">The object under examination</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsAssignableFrom``1(System.Object,System.String)">
+            <summary>
+            Asserts that an object may be assigned a  value of a given Type.
+            </summary>
+            <typeparam name="T">The expected Type.</typeparam>
+            <param name="actual">The object under examination</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsAssignableFrom``1(System.Object)">
+            <summary>
+            Asserts that an object may be assigned a  value of a given Type.
+            </summary>
+            <typeparam name="T">The expected Type.</typeparam>
+            <param name="actual">The object under examination</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNotAssignableFrom(System.Type,System.Object,System.String,System.Object[])">
+            <summary>
+            Asserts that an object may not be assigned a  value of a given Type.
+            </summary>
+            <param name="expected">The expected Type.</param>
+            <param name="actual">The object under examination</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNotAssignableFrom(System.Type,System.Object,System.String)">
+            <summary>
+            Asserts that an object may not be assigned a  value of a given Type.
+            </summary>
+            <param name="expected">The expected Type.</param>
+            <param name="actual">The object under examination</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNotAssignableFrom(System.Type,System.Object)">
+            <summary>
+            Asserts that an object may not be assigned a  value of a given Type.
+            </summary>
+            <param name="expected">The expected Type.</param>
+            <param name="actual">The object under examination</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNotAssignableFrom``1(System.Object,System.String,System.Object[])">
+            <summary>
+            Asserts that an object may not be assigned a  value of a given Type.
+            </summary>
+            <typeparam name="T">The expected Type.</typeparam>
+            <param name="actual">The object under examination</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNotAssignableFrom``1(System.Object,System.String)">
+            <summary>
+            Asserts that an object may not be assigned a  value of a given Type.
+            </summary>
+            <typeparam name="T">The expected Type.</typeparam>
+            <param name="actual">The object under examination</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNotAssignableFrom``1(System.Object)">
+            <summary>
+            Asserts that an object may not be assigned a  value of a given Type.
+            </summary>
+            <typeparam name="T">The expected Type.</typeparam>
+            <param name="actual">The object under examination</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsInstanceOf(System.Type,System.Object,System.String,System.Object[])">
+            <summary>
+            Asserts that an object is an instance of a given type.
+            </summary>
+            <param name="expected">The expected Type</param>
+            <param name="actual">The object being examined</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsInstanceOf(System.Type,System.Object,System.String)">
+            <summary>
+            Asserts that an object is an instance of a given type.
+            </summary>
+            <param name="expected">The expected Type</param>
+            <param name="actual">The object being examined</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsInstanceOf(System.Type,System.Object)">
+            <summary>
+            Asserts that an object is an instance of a given type.
+            </summary>
+            <param name="expected">The expected Type</param>
+            <param name="actual">The object being examined</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsInstanceOfType(System.Type,System.Object,System.String,System.Object[])">
+            <summary>
+            Asserts that an object is an instance of a given type.
+            </summary>
+            <param name="expected">The expected Type</param>
+            <param name="actual">The object being examined</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsInstanceOfType(System.Type,System.Object,System.String)">
+            <summary>
+            Asserts that an object is an instance of a given type.
+            </summary>
+            <param name="expected">The expected Type</param>
+            <param name="actual">The object being examined</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsInstanceOfType(System.Type,System.Object)">
+            <summary>
+            Asserts that an object is an instance of a given type.
+            </summary>
+            <param name="expected">The expected Type</param>
+            <param name="actual">The object being examined</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsInstanceOf``1(System.Object,System.String,System.Object[])">
+            <summary>
+            Asserts that an object is an instance of a given type.
+            </summary>
+            <typeparam name="T">The expected Type</typeparam>
+            <param name="actual">The object being examined</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsInstanceOf``1(System.Object,System.String)">
+            <summary>
+            Asserts that an object is an instance of a given type.
+            </summary>
+            <typeparam name="T">The expected Type</typeparam>
+            <param name="actual">The object being examined</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsInstanceOf``1(System.Object)">
+            <summary>
+            Asserts that an object is an instance of a given type.
+            </summary>
+            <typeparam name="T">The expected Type</typeparam>
+            <param name="actual">The object being examined</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNotInstanceOf(System.Type,System.Object,System.String,System.Object[])">
+            <summary>
+            Asserts that an object is not an instance of a given type.
+            </summary>
+            <param name="expected">The expected Type</param>
+            <param name="actual">The object being examined</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNotInstanceOf(System.Type,System.Object,System.String)">
+            <summary>
+            Asserts that an object is not an instance of a given type.
+            </summary>
+            <param name="expected">The expected Type</param>
+            <param name="actual">The object being examined</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNotInstanceOf(System.Type,System.Object)">
+            <summary>
+            Asserts that an object is not an instance of a given type.
+            </summary>
+            <param name="expected">The expected Type</param>
+            <param name="actual">The object being examined</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNotInstanceOfType(System.Type,System.Object,System.String,System.Object[])">
+            <summary>
+            Asserts that an object is not an instance of a given type.
+            </summary>
+            <param name="expected">The expected Type</param>
+            <param name="actual">The object being examined</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNotInstanceOfType(System.Type,System.Object,System.String)">
+            <summary>
+            Asserts that an object is not an instance of a given type.
+            </summary>
+            <param name="expected">The expected Type</param>
+            <param name="actual">The object being examined</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNotInstanceOfType(System.Type,System.Object)">
+            <summary>
+            Asserts that an object is not an instance of a given type.
+            </summary>
+            <param name="expected">The expected Type</param>
+            <param name="actual">The object being examined</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNotInstanceOf``1(System.Object,System.String,System.Object[])">
+            <summary>
+            Asserts that an object is not an instance of a given type.
+            </summary>
+            <typeparam name="T">The expected Type</typeparam>
+            <param name="actual">The object being examined</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNotInstanceOf``1(System.Object,System.String)">
+            <summary>
+            Asserts that an object is not an instance of a given type.
+            </summary>
+            <typeparam name="T">The expected Type</typeparam>
+            <param name="actual">The object being examined</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.IsNotInstanceOf``1(System.Object)">
+            <summary>
+            Asserts that an object is not an instance of a given type.
+            </summary>
+            <typeparam name="T">The expected Type</typeparam>
+            <param name="actual">The object being examined</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Greater(System.Int32,System.Int32,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is greater than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Greater(System.Int32,System.Int32,System.String)">
+            <summary>
+            Verifies that the first value is greater than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Greater(System.Int32,System.Int32)">
+            <summary>
+            Verifies that the first value is greater than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Greater(System.UInt32,System.UInt32,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is greater than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Greater(System.UInt32,System.UInt32,System.String)">
+            <summary>
+            Verifies that the first value is greater than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Greater(System.UInt32,System.UInt32)">
+            <summary>
+            Verifies that the first value is greater than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Greater(System.Int64,System.Int64,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is greater than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Greater(System.Int64,System.Int64,System.String)">
+            <summary>
+            Verifies that the first value is greater than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Greater(System.Int64,System.Int64)">
+            <summary>
+            Verifies that the first value is greater than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Greater(System.UInt64,System.UInt64,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is greater than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Greater(System.UInt64,System.UInt64,System.String)">
+            <summary>
+            Verifies that the first value is greater than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Greater(System.UInt64,System.UInt64)">
+            <summary>
+            Verifies that the first value is greater than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Greater(System.Decimal,System.Decimal,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is greater than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Greater(System.Decimal,System.Decimal,System.String)">
+            <summary>
+            Verifies that the first value is greater than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Greater(System.Decimal,System.Decimal)">
+            <summary>
+            Verifies that the first value is greater than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Greater(System.Double,System.Double,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is greater than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Greater(System.Double,System.Double,System.String)">
+            <summary>
+            Verifies that the first value is greater than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Greater(System.Double,System.Double)">
+            <summary>
+            Verifies that the first value is greater than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Greater(System.Single,System.Single,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is greater than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Greater(System.Single,System.Single,System.String)">
+            <summary>
+            Verifies that the first value is greater than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Greater(System.Single,System.Single)">
+            <summary>
+            Verifies that the first value is greater than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Greater(System.IComparable,System.IComparable,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is greater than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Greater(System.IComparable,System.IComparable,System.String)">
+            <summary>
+            Verifies that the first value is greater than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Greater(System.IComparable,System.IComparable)">
+            <summary>
+            Verifies that the first value is greater than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Less(System.Int32,System.Int32,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is less than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Less(System.Int32,System.Int32,System.String)">
+            <summary>
+            Verifies that the first value is less than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Less(System.Int32,System.Int32)">
+            <summary>
+            Verifies that the first value is less than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Less(System.UInt32,System.UInt32,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is less than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Less(System.UInt32,System.UInt32,System.String)">
+            <summary>
+            Verifies that the first value is less than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Less(System.UInt32,System.UInt32)">
+            <summary>
+            Verifies that the first value is less than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Less(System.Int64,System.Int64,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is less than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Less(System.Int64,System.Int64,System.String)">
+            <summary>
+            Verifies that the first value is less than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Less(System.Int64,System.Int64)">
+            <summary>
+            Verifies that the first value is less than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Less(System.UInt64,System.UInt64,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is less than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Less(System.UInt64,System.UInt64,System.String)">
+            <summary>
+            Verifies that the first value is less than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Less(System.UInt64,System.UInt64)">
+            <summary>
+            Verifies that the first value is less than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Less(System.Decimal,System.Decimal,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is less than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Less(System.Decimal,System.Decimal,System.String)">
+            <summary>
+            Verifies that the first value is less than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Less(System.Decimal,System.Decimal)">
+            <summary>
+            Verifies that the first value is less than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Less(System.Double,System.Double,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is less than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Less(System.Double,System.Double,System.String)">
+            <summary>
+            Verifies that the first value is less than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Less(System.Double,System.Double)">
+            <summary>
+            Verifies that the first value is less than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Less(System.Single,System.Single,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is less than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Less(System.Single,System.Single,System.String)">
+            <summary>
+            Verifies that the first value is less than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Less(System.Single,System.Single)">
+            <summary>
+            Verifies that the first value is less than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Less(System.IComparable,System.IComparable,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is less than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Less(System.IComparable,System.IComparable,System.String)">
+            <summary>
+            Verifies that the first value is less than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Less(System.IComparable,System.IComparable)">
+            <summary>
+            Verifies that the first value is less than the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.GreaterOrEqual(System.Int32,System.Int32,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is greater than or equal tothe second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.GreaterOrEqual(System.Int32,System.Int32,System.String)">
+            <summary>
+            Verifies that the first value is greater than or equal tothe second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.GreaterOrEqual(System.Int32,System.Int32)">
+            <summary>
+            Verifies that the first value is greater than or equal tothe second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.GreaterOrEqual(System.UInt32,System.UInt32,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is greater than or equal tothe second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.GreaterOrEqual(System.UInt32,System.UInt32,System.String)">
+            <summary>
+            Verifies that the first value is greater than or equal tothe second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.GreaterOrEqual(System.UInt32,System.UInt32)">
+            <summary>
+            Verifies that the first value is greater than or equal tothe second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.GreaterOrEqual(System.Int64,System.Int64,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is greater than or equal tothe second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.GreaterOrEqual(System.Int64,System.Int64,System.String)">
+            <summary>
+            Verifies that the first value is greater than or equal tothe second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.GreaterOrEqual(System.Int64,System.Int64)">
+            <summary>
+            Verifies that the first value is greater than or equal tothe second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.GreaterOrEqual(System.UInt64,System.UInt64,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is greater than or equal tothe second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.GreaterOrEqual(System.UInt64,System.UInt64,System.String)">
+            <summary>
+            Verifies that the first value is greater than or equal tothe second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.GreaterOrEqual(System.UInt64,System.UInt64)">
+            <summary>
+            Verifies that the first value is greater than or equal tothe second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.GreaterOrEqual(System.Decimal,System.Decimal,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is greater than or equal tothe second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.GreaterOrEqual(System.Decimal,System.Decimal,System.String)">
+            <summary>
+            Verifies that the first value is greater than or equal tothe second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.GreaterOrEqual(System.Decimal,System.Decimal)">
+            <summary>
+            Verifies that the first value is greater than or equal tothe second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.GreaterOrEqual(System.Double,System.Double,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is greater than or equal tothe second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.GreaterOrEqual(System.Double,System.Double,System.String)">
+            <summary>
+            Verifies that the first value is greater than or equal tothe second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.GreaterOrEqual(System.Double,System.Double)">
+            <summary>
+            Verifies that the first value is greater than or equal tothe second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.GreaterOrEqual(System.Single,System.Single,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is greater than or equal tothe second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.GreaterOrEqual(System.Single,System.Single,System.String)">
+            <summary>
+            Verifies that the first value is greater than or equal tothe second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.GreaterOrEqual(System.Single,System.Single)">
+            <summary>
+            Verifies that the first value is greater than or equal tothe second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.GreaterOrEqual(System.IComparable,System.IComparable,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is greater than or equal tothe second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.GreaterOrEqual(System.IComparable,System.IComparable,System.String)">
+            <summary>
+            Verifies that the first value is greater than or equal tothe second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.GreaterOrEqual(System.IComparable,System.IComparable)">
+            <summary>
+            Verifies that the first value is greater than or equal tothe second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be greater</param>
+            <param name="arg2">The second value, expected to be less</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.LessOrEqual(System.Int32,System.Int32,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is less than or equal to the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.LessOrEqual(System.Int32,System.Int32,System.String)">
+            <summary>
+            Verifies that the first value is less than or equal to the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.LessOrEqual(System.Int32,System.Int32)">
+            <summary>
+            Verifies that the first value is less than or equal to the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.LessOrEqual(System.UInt32,System.UInt32,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is less than or equal to the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.LessOrEqual(System.UInt32,System.UInt32,System.String)">
+            <summary>
+            Verifies that the first value is less than or equal to the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.LessOrEqual(System.UInt32,System.UInt32)">
+            <summary>
+            Verifies that the first value is less than or equal to the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.LessOrEqual(System.Int64,System.Int64,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is less than or equal to the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.LessOrEqual(System.Int64,System.Int64,System.String)">
+            <summary>
+            Verifies that the first value is less than or equal to the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.LessOrEqual(System.Int64,System.Int64)">
+            <summary>
+            Verifies that the first value is less than or equal to the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.LessOrEqual(System.UInt64,System.UInt64,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is less than or equal to the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.LessOrEqual(System.UInt64,System.UInt64,System.String)">
+            <summary>
+            Verifies that the first value is less than or equal to the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.LessOrEqual(System.UInt64,System.UInt64)">
+            <summary>
+            Verifies that the first value is less than or equal to the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.LessOrEqual(System.Decimal,System.Decimal,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is less than or equal to the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.LessOrEqual(System.Decimal,System.Decimal,System.String)">
+            <summary>
+            Verifies that the first value is less than or equal to the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.LessOrEqual(System.Decimal,System.Decimal)">
+            <summary>
+            Verifies that the first value is less than or equal to the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.LessOrEqual(System.Double,System.Double,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is less than or equal to the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.LessOrEqual(System.Double,System.Double,System.String)">
+            <summary>
+            Verifies that the first value is less than or equal to the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.LessOrEqual(System.Double,System.Double)">
+            <summary>
+            Verifies that the first value is less than or equal to the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.LessOrEqual(System.Single,System.Single,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is less than or equal to the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.LessOrEqual(System.Single,System.Single,System.String)">
+            <summary>
+            Verifies that the first value is less than or equal to the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.LessOrEqual(System.Single,System.Single)">
+            <summary>
+            Verifies that the first value is less than or equal to the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.LessOrEqual(System.IComparable,System.IComparable,System.String,System.Object[])">
+            <summary>
+            Verifies that the first value is less than or equal to the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.LessOrEqual(System.IComparable,System.IComparable,System.String)">
+            <summary>
+            Verifies that the first value is less than or equal to the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.LessOrEqual(System.IComparable,System.IComparable)">
+            <summary>
+            Verifies that the first value is less than or equal to the second
+            value. If it is not, then an
+            <see cref="T:NUnit.Framework.AssertionException"/> is thrown. 
+            </summary>
+            <param name="arg1">The first value, expected to be less</param>
+            <param name="arg2">The second value, expected to be greater</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Contains(System.Object,System.Collections.ICollection,System.String,System.Object[])">
+            <summary>
+            Asserts that an object is contained in a list.
+            </summary>
+            <param name="expected">The expected object</param>
+            <param name="actual">The list to be examined</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Contains(System.Object,System.Collections.ICollection,System.String)">
+            <summary>
+            Asserts that an object is contained in a list.
+            </summary>
+            <param name="expected">The expected object</param>
+            <param name="actual">The list to be examined</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.Contains(System.Object,System.Collections.ICollection)">
+            <summary>
+            Asserts that an object is contained in a list.
+            </summary>
+            <param name="expected">The expected object</param>
+            <param name="actual">The list to be examined</param>
+        </member>
+        <member name="M:NUnit.Framework.Assert.AssertDoublesAreEqual(System.Double,System.Double,System.Double,System.String,System.Object[])">
+            <summary>
+            Helper for Assert.AreEqual(double expected, double actual, ...)
+            allowing code generation to work consistently.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="delta">The maximum acceptable difference between the
+            the expected and the actual</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Array of objects to be used in formatting the message</param>
+        </member>
+        <member name="P:NUnit.Framework.Assert.Counter">
+            <summary>
+            Gets the number of assertions executed so far and 
+            resets the counter to zero.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.AssertionHelper">
+            <summary>
+            AssertionHelper is an optional base class for user tests,
+            allowing the use of shorter names for constraints and
+            asserts and avoiding conflict with the definition of 
+            <see cref="T:NUnit.Framework.Is"/>, from which it inherits much of its
+            behavior, in certain mock object frameworks.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.ConstraintFactory">
+            <summary>
+            Helper class with properties and methods that supply
+            a number of constraints used in Asserts.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.Exactly(System.Int32)">
+            <summary>
+            Returns a ConstraintExpression, which will apply
+            the following constraint to all members of a collection,
+            succeeding only if a specified number of them succeed.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.Property(System.String)">
+            <summary>
+            Returns a new PropertyConstraintExpression, which will either
+            test for the existence of the named property on the object
+            being tested or apply any following constraint to that property.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.Attribute(System.Type)">
+            <summary>
+            Returns a new AttributeConstraint checking for the
+            presence of a particular attribute on an object.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.Attribute``1">
+            <summary>
+            Returns a new AttributeConstraint checking for the
+            presence of a particular attribute on an object.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.EqualTo(System.Object)">
+            <summary>
+            Returns a constraint that tests two items for equality
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.SameAs(System.Object)">
+            <summary>
+            Returns a constraint that tests that two references are the same object
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.GreaterThan(System.Object)">
+            <summary>
+            Returns a constraint that tests whether the
+            actual value is greater than the suppled argument
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.GreaterThanOrEqualTo(System.Object)">
+            <summary>
+            Returns a constraint that tests whether the
+            actual value is greater than or equal to the suppled argument
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.AtLeast(System.Object)">
+            <summary>
+            Returns a constraint that tests whether the
+            actual value is greater than or equal to the suppled argument
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.LessThan(System.Object)">
+            <summary>
+            Returns a constraint that tests whether the
+            actual value is less than the suppled argument
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.LessThanOrEqualTo(System.Object)">
+            <summary>
+            Returns a constraint that tests whether the
+            actual value is less than or equal to the suppled argument
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.AtMost(System.Object)">
+            <summary>
+            Returns a constraint that tests whether the
+            actual value is less than or equal to the suppled argument
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.TypeOf(System.Type)">
+            <summary>
+            Returns a constraint that tests whether the actual
+            value is of the exact type supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.TypeOf``1">
+            <summary>
+            Returns a constraint that tests whether the actual
+            value is of the exact type supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.InstanceOf(System.Type)">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is of the type supplied as an argument or a derived type.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.InstanceOf``1">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is of the type supplied as an argument or a derived type.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.InstanceOfType(System.Type)">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is of the type supplied as an argument or a derived type.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.InstanceOfType``1">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is of the type supplied as an argument or a derived type.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.AssignableFrom(System.Type)">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is assignable from the type supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.AssignableFrom``1">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is assignable from the type supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.AssignableTo(System.Type)">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is assignable from the type supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.AssignableTo``1">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is assignable from the type supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.EquivalentTo(System.Collections.IEnumerable)">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is a collection containing the same elements as the 
+            collection supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.SubsetOf(System.Collections.IEnumerable)">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is a subset of the collection supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.Member(System.Object)">
+            <summary>
+            Returns a new CollectionContainsConstraint checking for the
+            presence of a particular object in the collection.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.Contains(System.Object)">
+            <summary>
+            Returns a new CollectionContainsConstraint checking for the
+            presence of a particular object in the collection.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.Contains(System.String)">
+            <summary>
+            Returns a new ContainsConstraint. This constraint
+            will, in turn, make use of the appropriate second-level
+            constraint, depending on the type of the actual argument. 
+            This overload is only used if the item sought is a string,
+            since any other type implies that we are looking for a 
+            collection member.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.StringContaining(System.String)">
+            <summary>
+            Returns a constraint that succeeds if the actual
+            value contains the substring supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.ContainsSubstring(System.String)">
+            <summary>
+            Returns a constraint that succeeds if the actual
+            value contains the substring supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.DoesNotContain(System.String)">
+            <summary>
+            Returns a constraint that fails if the actual
+            value contains the substring supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.StartsWith(System.String)">
+            <summary>
+            Returns a constraint that succeeds if the actual
+            value starts with the substring supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.StringStarting(System.String)">
+            <summary>
+            Returns a constraint that succeeds if the actual
+            value starts with the substring supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.DoesNotStartWith(System.String)">
+            <summary>
+            Returns a constraint that fails if the actual
+            value starts with the substring supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.EndsWith(System.String)">
+            <summary>
+            Returns a constraint that succeeds if the actual
+            value ends with the substring supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.StringEnding(System.String)">
+            <summary>
+            Returns a constraint that succeeds if the actual
+            value ends with the substring supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.DoesNotEndWith(System.String)">
+            <summary>
+            Returns a constraint that fails if the actual
+            value ends with the substring supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.Matches(System.String)">
+            <summary>
+            Returns a constraint that succeeds if the actual
+            value matches the regular expression supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.StringMatching(System.String)">
+            <summary>
+            Returns a constraint that succeeds if the actual
+            value matches the regular expression supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.DoesNotMatch(System.String)">
+            <summary>
+            Returns a constraint that fails if the actual
+            value matches the pattern supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.SamePath(System.String)">
+            <summary>
+            Returns a constraint that tests whether the path provided 
+            is the same as an expected path after canonicalization.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.SubPath(System.String)">
+            <summary>
+            Returns a constraint that tests whether the path provided 
+            is the same path or under an expected path after canonicalization.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.SamePathOrUnder(System.String)">
+            <summary>
+            Returns a constraint that tests whether the path provided 
+            is the same path or under an expected path after canonicalization.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintFactory.InRange``1(``0,``0)">
+            <summary>
+            Returns a constraint that tests whether the actual value falls 
+            within a specified range.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintFactory.Not">
+            <summary>
+            Returns a ConstraintExpression that negates any
+            following constraint.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintFactory.No">
+            <summary>
+            Returns a ConstraintExpression that negates any
+            following constraint.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintFactory.All">
+            <summary>
+            Returns a ConstraintExpression, which will apply
+            the following constraint to all members of a collection,
+            succeeding if all of them succeed.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintFactory.Some">
+            <summary>
+            Returns a ConstraintExpression, which will apply
+            the following constraint to all members of a collection,
+            succeeding if at least one of them succeeds.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintFactory.None">
+            <summary>
+            Returns a ConstraintExpression, which will apply
+            the following constraint to all members of a collection,
+            succeeding if all of them fail.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintFactory.Length">
+            <summary>
+            Returns a new ConstraintExpression, which will apply the following
+            constraint to the Length property of the object being tested.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintFactory.Count">
+            <summary>
+            Returns a new ConstraintExpression, which will apply the following
+            constraint to the Count property of the object being tested.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintFactory.Message">
+            <summary>
+            Returns a new ConstraintExpression, which will apply the following
+            constraint to the Message property of the object being tested.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintFactory.InnerException">
+            <summary>
+            Returns a new ConstraintExpression, which will apply the following
+            constraint to the InnerException property of the object being tested.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintFactory.Null">
+            <summary>
+            Returns a constraint that tests for null
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintFactory.True">
+            <summary>
+            Returns a constraint that tests for True
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintFactory.False">
+            <summary>
+            Returns a constraint that tests for False
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintFactory.Positive">
+            <summary>
+            Returns a constraint that tests for a positive value
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintFactory.Negative">
+            <summary>
+            Returns a constraint that tests for a negative value
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintFactory.NaN">
+            <summary>
+            Returns a constraint that tests for NaN
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintFactory.Empty">
+            <summary>
+            Returns a constraint that tests for empty
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintFactory.Unique">
+            <summary>
+            Returns a constraint that tests whether a collection 
+            contains all unique items.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintFactory.BinarySerializable">
+            <summary>
+            Returns a constraint that tests whether an object graph is serializable in binary format.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintFactory.XmlSerializable">
+            <summary>
+            Returns a constraint that tests whether an object graph is serializable in xml format.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintFactory.Ordered">
+            <summary>
+            Returns a constraint that tests whether a collection is ordered
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.AssertionHelper.Expect(System.Object,NUnit.Framework.Constraints.IResolveConstraint)">
+            <summary>
+            Apply a constraint to an actual value, succeeding if the constraint
+            is satisfied and throwing an assertion exception on failure. Works
+            identically to Assert.That.
+            </summary>
+            <param name="actual">The actual value to test</param>
+            <param name="expression">A Constraint to be applied</param>
+        </member>
+        <member name="M:NUnit.Framework.AssertionHelper.Expect(System.Object,NUnit.Framework.Constraints.IResolveConstraint,System.String)">
+            <summary>
+            Apply a constraint to an actual value, succeeding if the constraint
+            is satisfied and throwing an assertion exception on failure. Works
+            identically to Assert.That.
+            </summary>
+            <param name="actual">The actual value to test</param>
+            <param name="expression">A Constraint to be applied</param>
+            <param name="message">The message to be displayed in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.AssertionHelper.Expect(System.Object,NUnit.Framework.Constraints.IResolveConstraint,System.String,System.Object[])">
+            <summary>
+            Apply a constraint to an actual value, succeeding if the constraint
+            is satisfied and throwing an assertion exception on failure. Works
+            identically to Assert.That.
+            </summary>
+            <param name="actual">The actual value to test</param>
+            <param name="expression">A Constraint to be applied</param>
+            <param name="message">The message to be displayed in case of failure</param>
+            <param name="args">Arguments to use in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.AssertionHelper.Expect(System.Boolean,System.String,System.Object[])">
+            <summary>
+            Asserts that a condition is true. If the condition is false the method throws
+            an <see cref="T:NUnit.Framework.AssertionException"/>. Works Identically to 
+            <see cref="M:NUnit.Framework.Assert.That(System.Boolean,System.String,System.Object[])"/>.
+            </summary> 
+            <param name="condition">The evaluated condition</param>
+            <param name="message">The message to display if the condition is false</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.AssertionHelper.Expect(System.Boolean,System.String)">
+            <summary>
+            Asserts that a condition is true. If the condition is false the method throws
+            an <see cref="T:NUnit.Framework.AssertionException"/>. Works Identically to
+            <see cref="M:NUnit.Framework.Assert.That(System.Boolean,System.String)"/>.
+            </summary>
+            <param name="condition">The evaluated condition</param>
+            <param name="message">The message to display if the condition is false</param>
+        </member>
+        <member name="M:NUnit.Framework.AssertionHelper.Expect(System.Boolean)">
+            <summary>
+            Asserts that a condition is true. If the condition is false the method throws
+            an <see cref="T:NUnit.Framework.AssertionException"/>. Works Identically to <see cref="M:NUnit.Framework.Assert.That(System.Boolean)"/>.
+            </summary>
+            <param name="condition">The evaluated condition</param>
+        </member>
+        <member name="M:NUnit.Framework.AssertionHelper.Expect``1(NUnit.Framework.Constraints.ActualValueDelegate{``0},NUnit.Framework.Constraints.IResolveConstraint)">
+            <summary>
+            Apply a constraint to an actual value, succeeding if the constraint
+            is satisfied and throwing an assertion exception on failure.
+            </summary>
+            <param name="expr">A Constraint expression to be applied</param>
+            <param name="del">An ActualValueDelegate returning the value to be tested</param>
+        </member>
+        <member name="M:NUnit.Framework.AssertionHelper.Expect``1(NUnit.Framework.Constraints.ActualValueDelegate{``0},NUnit.Framework.Constraints.IResolveConstraint,System.String)">
+            <summary>
+            Apply a constraint to an actual value, succeeding if the constraint
+            is satisfied and throwing an assertion exception on failure.
+            </summary>
+            <param name="expr">A Constraint expression to be applied</param>
+            <param name="del">An ActualValueDelegate returning the value to be tested</param>
+            <param name="message">The message that will be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.AssertionHelper.Expect``1(NUnit.Framework.Constraints.ActualValueDelegate{``0},NUnit.Framework.Constraints.IResolveConstraint,System.String,System.Object[])">
+            <summary>
+            Apply a constraint to an actual value, succeeding if the constraint
+            is satisfied and throwing an assertion exception on failure.
+            </summary>
+            <param name="del">An ActualValueDelegate returning the value to be tested</param>
+            <param name="expr">A Constraint expression to be applied</param>
+            <param name="message">The message that will be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.AssertionHelper.Expect``1(``0@,NUnit.Framework.Constraints.IResolveConstraint)">
+            <summary>
+            Apply a constraint to a referenced value, succeeding if the constraint
+            is satisfied and throwing an assertion exception on failure.
+            </summary>
+            <param name="actual">The actual value to test</param>
+            <param name="expression">A Constraint to be applied</param>
+        </member>
+        <member name="M:NUnit.Framework.AssertionHelper.Expect``1(``0@,NUnit.Framework.Constraints.IResolveConstraint,System.String)">
+            <summary>
+            Apply a constraint to a referenced value, succeeding if the constraint
+            is satisfied and throwing an assertion exception on failure.
+            </summary>
+            <param name="actual">The actual value to test</param>
+            <param name="expression">A Constraint to be applied</param>
+            <param name="message">The message that will be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.AssertionHelper.Expect``1(``0@,NUnit.Framework.Constraints.IResolveConstraint,System.String,System.Object[])">
+            <summary>
+            Apply a constraint to a referenced value, succeeding if the constraint
+            is satisfied and throwing an assertion exception on failure.
+            </summary>
+            <param name="actual">The actual value to test</param>
+            <param name="expression">A Constraint to be applied</param>
+            <param name="message">The message that will be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.AssertionHelper.Expect(NUnit.Framework.TestDelegate,NUnit.Framework.Constraints.IResolveConstraint)">
+            <summary>
+            Asserts that the code represented by a delegate throws an exception
+            that satisfies the constraint provided.
+            </summary>
+            <param name="code">A TestDelegate to be executed</param>
+            <param name="constraint">A ThrowsConstraint used in the test</param>
+        </member>
+        <member name="M:NUnit.Framework.AssertionHelper.Map(System.Collections.ICollection)">
+            <summary>
+            Returns a ListMapper based on a collection.
+            </summary>
+            <param name="original">The original collection</param>
+            <returns></returns>
+        </member>
+        <member name="T:NUnit.Framework.Assume">
+            <summary>
+            Provides static methods to express the assumptions
+            that must be met for a test to give a meaningful
+            result. If an assumption is not met, the test
+            should produce an inconclusive result.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Assume.Equals(System.Object,System.Object)">
+            <summary>
+            The Equals method throws an AssertionException. This is done 
+            to make sure there is no mistake by calling this function.
+            </summary>
+            <param name="a"></param>
+            <param name="b"></param>
+        </member>
+        <member name="M:NUnit.Framework.Assume.ReferenceEquals(System.Object,System.Object)">
+            <summary>
+            override the default ReferenceEquals to throw an AssertionException. This 
+            implementation makes sure there is no mistake in calling this function 
+            as part of Assert. 
+            </summary>
+            <param name="a"></param>
+            <param name="b"></param>
+        </member>
+        <member name="M:NUnit.Framework.Assume.That(System.Object,NUnit.Framework.Constraints.IResolveConstraint)">
+            <summary>
+            Apply a constraint to an actual value, succeeding if the constraint
+            is satisfied and throwing an InconclusiveException on failure.
+            </summary>
+            <param name="expression">A Constraint expression to be applied</param>
+            <param name="actual">The actual value to test</param>
+        </member>
+        <member name="M:NUnit.Framework.Assume.That(System.Object,NUnit.Framework.Constraints.IResolveConstraint,System.String)">
+            <summary>
+            Apply a constraint to an actual value, succeeding if the constraint
+            is satisfied and throwing an InconclusiveException on failure.
+            </summary>
+            <param name="expression">A Constraint expression to be applied</param>
+            <param name="actual">The actual value to test</param>
+            <param name="message">The message that will be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assume.That(System.Object,NUnit.Framework.Constraints.IResolveConstraint,System.String,System.Object[])">
+            <summary>
+            Apply a constraint to an actual value, succeeding if the constraint
+            is satisfied and throwing an InconclusiveException on failure.
+            </summary>
+            <param name="expression">A Constraint expression to be applied</param>
+            <param name="actual">The actual value to test</param>
+            <param name="message">The message that will be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assume.That(System.Boolean,System.String,System.Object[])">
+            <summary>
+            Asserts that a condition is true. If the condition is false the method throws
+            an <see cref="T:NUnit.Framework.InconclusiveException"/>.
+            </summary> 
+            <param name="condition">The evaluated condition</param>
+            <param name="message">The message to display if the condition is false</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assume.That(System.Boolean,System.String)">
+            <summary>
+            Asserts that a condition is true. If the condition is false the method throws
+            an <see cref="T:NUnit.Framework.InconclusiveException"/>.
+            </summary>
+            <param name="condition">The evaluated condition</param>
+            <param name="message">The message to display if the condition is false</param>
+        </member>
+        <member name="M:NUnit.Framework.Assume.That(System.Boolean)">
+            <summary>
+            Asserts that a condition is true. If the condition is false the 
+            method throws an <see cref="T:NUnit.Framework.InconclusiveException"/>.
+            </summary>
+            <param name="condition">The evaluated condition</param>
+        </member>
+        <member name="M:NUnit.Framework.Assume.That``1(NUnit.Framework.Constraints.ActualValueDelegate{``0},NUnit.Framework.Constraints.IResolveConstraint)">
+            <summary>
+            Apply a constraint to an actual value, succeeding if the constraint
+            is satisfied and throwing an InconclusiveException on failure.
+            </summary>
+            <param name="expr">A Constraint expression to be applied</param>
+            <param name="del">An ActualValueDelegate returning the value to be tested</param>
+        </member>
+        <member name="M:NUnit.Framework.Assume.That``1(NUnit.Framework.Constraints.ActualValueDelegate{``0},NUnit.Framework.Constraints.IResolveConstraint,System.String)">
+            <summary>
+            Apply a constraint to an actual value, succeeding if the constraint
+            is satisfied and throwing an InconclusiveException on failure.
+            </summary>
+            <param name="expr">A Constraint expression to be applied</param>
+            <param name="del">An ActualValueDelegate returning the value to be tested</param>
+            <param name="message">The message that will be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assume.That``1(NUnit.Framework.Constraints.ActualValueDelegate{``0},NUnit.Framework.Constraints.IResolveConstraint,System.String,System.Object[])">
+            <summary>
+            Apply a constraint to an actual value, succeeding if the constraint
+            is satisfied and throwing an InconclusiveException on failure.
+            </summary>
+            <param name="del">An ActualValueDelegate returning the value to be tested</param>
+            <param name="expr">A Constraint expression to be applied</param>
+            <param name="message">The message that will be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assume.That``1(``0@,NUnit.Framework.Constraints.IResolveConstraint)">
+            <summary>
+            Apply a constraint to a referenced value, succeeding if the constraint
+            is satisfied and throwing an InconclusiveException on failure.
+            </summary>
+            <param name="expression">A Constraint expression to be applied</param>
+            <param name="actual">The actual value to test</param>
+        </member>
+        <member name="M:NUnit.Framework.Assume.That``1(``0@,NUnit.Framework.Constraints.IResolveConstraint,System.String)">
+            <summary>
+            Apply a constraint to a referenced value, succeeding if the constraint
+            is satisfied and throwing an InconclusiveException on failure.
+            </summary>
+            <param name="expression">A Constraint expression to be applied</param>
+            <param name="actual">The actual value to test</param>
+            <param name="message">The message that will be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Assume.That``1(``0@,NUnit.Framework.Constraints.IResolveConstraint,System.String,System.Object[])">
+            <summary>
+            Apply a constraint to a referenced value, succeeding if the constraint
+            is satisfied and throwing an InconclusiveException on failure.
+            </summary>
+            <param name="expression">A Constraint expression to be applied</param>
+            <param name="actual">The actual value to test</param>
+            <param name="message">The message that will be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Assume.That(NUnit.Framework.TestDelegate,NUnit.Framework.Constraints.IResolveConstraint)">
+            <summary>
+            Asserts that the code represented by a delegate throws an exception
+            that satisfies the constraint provided.
+            </summary>
+            <param name="code">A TestDelegate to be executed</param>
+            <param name="constraint">A ThrowsConstraint used in the test</param>
+        </member>
+        <member name="M:NUnit.Framework.AsyncInvocationRegion.WaitForPendingOperationsToComplete(System.Object)">
+            <summary>
+            Waits for pending asynchronous operations to complete, if appropriate,
+            and returns a proper result of the invocation by unwrapping task results
+            </summary>
+            <param name="invocationResult">The raw result of the method invocation</param>
+            <returns>The unwrapped result, if necessary</returns>
+        </member>
+        <member name="T:NUnit.Framework.CollectionAssert">
+            <summary>
+            A set of Assert methods operationg on one or more collections
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.Equals(System.Object,System.Object)">
+            <summary>
+            The Equals method throws an AssertionException. This is done 
+            to make sure there is no mistake by calling this function.
+            </summary>
+            <param name="a"></param>
+            <param name="b"></param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.ReferenceEquals(System.Object,System.Object)">
+            <summary>
+            override the default ReferenceEquals to throw an AssertionException. This 
+            implementation makes sure there is no mistake in calling this function 
+            as part of Assert. 
+            </summary>
+            <param name="a"></param>
+            <param name="b"></param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.AllItemsAreInstancesOfType(System.Collections.IEnumerable,System.Type)">
+            <summary>
+            Asserts that all items contained in collection are of the type specified by expectedType.
+            </summary>
+            <param name="collection">IEnumerable containing objects to be considered</param>
+            <param name="expectedType">System.Type that all objects in collection must be instances of</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.AllItemsAreInstancesOfType(System.Collections.IEnumerable,System.Type,System.String)">
+            <summary>
+            Asserts that all items contained in collection are of the type specified by expectedType.
+            </summary>
+            <param name="collection">IEnumerable containing objects to be considered</param>
+            <param name="expectedType">System.Type that all objects in collection must be instances of</param>
+            <param name="message">The message that will be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.AllItemsAreInstancesOfType(System.Collections.IEnumerable,System.Type,System.String,System.Object[])">
+            <summary>
+            Asserts that all items contained in collection are of the type specified by expectedType.
+            </summary>
+            <param name="collection">IEnumerable containing objects to be considered</param>
+            <param name="expectedType">System.Type that all objects in collection must be instances of</param>
+            <param name="message">The message that will be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.AllItemsAreNotNull(System.Collections.IEnumerable)">
+            <summary>
+            Asserts that all items contained in collection are not equal to null.
+            </summary>
+            <param name="collection">IEnumerable containing objects to be considered</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.AllItemsAreNotNull(System.Collections.IEnumerable,System.String)">
+            <summary>
+            Asserts that all items contained in collection are not equal to null.
+            </summary>
+            <param name="collection">IEnumerable containing objects to be considered</param>
+            <param name="message">The message that will be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.AllItemsAreNotNull(System.Collections.IEnumerable,System.String,System.Object[])">
+            <summary>
+            Asserts that all items contained in collection are not equal to null.
+            </summary>
+            <param name="collection">IEnumerable of objects to be considered</param>
+            <param name="message">The message that will be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.AllItemsAreUnique(System.Collections.IEnumerable)">
+            <summary>
+            Ensures that every object contained in collection exists within the collection
+            once and only once.
+            </summary>
+            <param name="collection">IEnumerable of objects to be considered</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.AllItemsAreUnique(System.Collections.IEnumerable,System.String)">
+            <summary>
+            Ensures that every object contained in collection exists within the collection
+            once and only once.
+            </summary>
+            <param name="collection">IEnumerable of objects to be considered</param>
+            <param name="message">The message that will be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.AllItemsAreUnique(System.Collections.IEnumerable,System.String,System.Object[])">
+            <summary>
+            Ensures that every object contained in collection exists within the collection
+            once and only once.
+            </summary>
+            <param name="collection">IEnumerable of objects to be considered</param>
+            <param name="message">The message that will be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.AreEqual(System.Collections.IEnumerable,System.Collections.IEnumerable)">
+            <summary>
+            Asserts that expected and actual are exactly equal.  The collections must have the same count, 
+            and contain the exact same objects in the same order.
+            </summary>
+            <param name="expected">The first IEnumerable of objects to be considered</param>
+            <param name="actual">The second IEnumerable of objects to be considered</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.AreEqual(System.Collections.IEnumerable,System.Collections.IEnumerable,System.Collections.IComparer)">
+            <summary>
+            Asserts that expected and actual are exactly equal.  The collections must have the same count, 
+            and contain the exact same objects in the same order.
+            If comparer is not null then it will be used to compare the objects.
+            </summary>
+            <param name="expected">The first IEnumerable of objects to be considered</param>
+            <param name="actual">The second IEnumerable of objects to be considered</param>
+            <param name="comparer">The IComparer to use in comparing objects from each IEnumerable</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.AreEqual(System.Collections.IEnumerable,System.Collections.IEnumerable,System.String)">
+            <summary>
+            Asserts that expected and actual are exactly equal.  The collections must have the same count, 
+            and contain the exact same objects in the same order.
+            </summary>
+            <param name="expected">The first IEnumerable of objects to be considered</param>
+            <param name="actual">The second IEnumerable of objects to be considered</param>
+            <param name="message">The message that will be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.AreEqual(System.Collections.IEnumerable,System.Collections.IEnumerable,System.Collections.IComparer,System.String)">
+            <summary>
+            Asserts that expected and actual are exactly equal.  The collections must have the same count, 
+            and contain the exact same objects in the same order.
+            If comparer is not null then it will be used to compare the objects.
+            </summary>
+            <param name="expected">The first IEnumerable of objects to be considered</param>
+            <param name="actual">The second IEnumerable of objects to be considered</param>
+            <param name="comparer">The IComparer to use in comparing objects from each IEnumerable</param>
+            <param name="message">The message that will be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.AreEqual(System.Collections.IEnumerable,System.Collections.IEnumerable,System.String,System.Object[])">
+            <summary>
+            Asserts that expected and actual are exactly equal.  The collections must have the same count, 
+            and contain the exact same objects in the same order.
+            </summary>
+            <param name="expected">The first IEnumerable of objects to be considered</param>
+            <param name="actual">The second IEnumerable of objects to be considered</param>
+            <param name="message">The message that will be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.AreEqual(System.Collections.IEnumerable,System.Collections.IEnumerable,System.Collections.IComparer,System.String,System.Object[])">
+            <summary>
+            Asserts that expected and actual are exactly equal.  The collections must have the same count, 
+            and contain the exact same objects in the same order.
+            If comparer is not null then it will be used to compare the objects.
+            </summary>
+            <param name="expected">The first IEnumerable of objects to be considered</param>
+            <param name="actual">The second IEnumerable of objects to be considered</param>
+            <param name="comparer">The IComparer to use in comparing objects from each IEnumerable</param>
+            <param name="message">The message that will be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.AreEquivalent(System.Collections.IEnumerable,System.Collections.IEnumerable)">
+            <summary>
+            Asserts that expected and actual are equivalent, containing the same objects but the match may be in any order.
+            </summary>
+            <param name="expected">The first IEnumerable of objects to be considered</param>
+            <param name="actual">The second IEnumerable of objects to be considered</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.AreEquivalent(System.Collections.IEnumerable,System.Collections.IEnumerable,System.String)">
+            <summary>
+            Asserts that expected and actual are equivalent, containing the same objects but the match may be in any order.
+            </summary>
+            <param name="expected">The first IEnumerable of objects to be considered</param>
+            <param name="actual">The second IEnumerable of objects to be considered</param>
+            <param name="message">The message that will be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.AreEquivalent(System.Collections.IEnumerable,System.Collections.IEnumerable,System.String,System.Object[])">
+            <summary>
+            Asserts that expected and actual are equivalent, containing the same objects but the match may be in any order.
+            </summary>
+            <param name="expected">The first IEnumerable of objects to be considered</param>
+            <param name="actual">The second IEnumerable of objects to be considered</param>
+            <param name="message">The message that will be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.AreNotEqual(System.Collections.IEnumerable,System.Collections.IEnumerable)">
+            <summary>
+            Asserts that expected and actual are not exactly equal.
+            </summary>
+            <param name="expected">The first IEnumerable of objects to be considered</param>
+            <param name="actual">The second IEnumerable of objects to be considered</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.AreNotEqual(System.Collections.IEnumerable,System.Collections.IEnumerable,System.Collections.IComparer)">
+            <summary>
+            Asserts that expected and actual are not exactly equal.
+            If comparer is not null then it will be used to compare the objects.
+            </summary>
+            <param name="expected">The first IEnumerable of objects to be considered</param>
+            <param name="actual">The second IEnumerable of objects to be considered</param>
+            <param name="comparer">The IComparer to use in comparing objects from each IEnumerable</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.AreNotEqual(System.Collections.IEnumerable,System.Collections.IEnumerable,System.String)">
+            <summary>
+            Asserts that expected and actual are not exactly equal.
+            </summary>
+            <param name="expected">The first IEnumerable of objects to be considered</param>
+            <param name="actual">The second IEnumerable of objects to be considered</param>
+            <param name="message">The message that will be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.AreNotEqual(System.Collections.IEnumerable,System.Collections.IEnumerable,System.Collections.IComparer,System.String)">
+            <summary>
+            Asserts that expected and actual are not exactly equal.
+            If comparer is not null then it will be used to compare the objects.
+            </summary>
+            <param name="expected">The first IEnumerable of objects to be considered</param>
+            <param name="actual">The second IEnumerable of objects to be considered</param>
+            <param name="comparer">The IComparer to use in comparing objects from each IEnumerable</param>
+            <param name="message">The message that will be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.AreNotEqual(System.Collections.IEnumerable,System.Collections.IEnumerable,System.String,System.Object[])">
+            <summary>
+            Asserts that expected and actual are not exactly equal.
+            </summary>
+            <param name="expected">The first IEnumerable of objects to be considered</param>
+            <param name="actual">The second IEnumerable of objects to be considered</param>
+            <param name="message">The message that will be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.AreNotEqual(System.Collections.IEnumerable,System.Collections.IEnumerable,System.Collections.IComparer,System.String,System.Object[])">
+            <summary>
+            Asserts that expected and actual are not exactly equal.
+            If comparer is not null then it will be used to compare the objects.
+            </summary>
+            <param name="expected">The first IEnumerable of objects to be considered</param>
+            <param name="actual">The second IEnumerable of objects to be considered</param>
+            <param name="comparer">The IComparer to use in comparing objects from each IEnumerable</param>
+            <param name="message">The message that will be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.AreNotEquivalent(System.Collections.IEnumerable,System.Collections.IEnumerable)">
+            <summary>
+            Asserts that expected and actual are not equivalent.
+            </summary>
+            <param name="expected">The first IEnumerable of objects to be considered</param>
+            <param name="actual">The second IEnumerable of objects to be considered</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.AreNotEquivalent(System.Collections.IEnumerable,System.Collections.IEnumerable,System.String)">
+            <summary>
+            Asserts that expected and actual are not equivalent.
+            </summary>
+            <param name="expected">The first IEnumerable of objects to be considered</param>
+            <param name="actual">The second IEnumerable of objects to be considered</param>
+            <param name="message">The message that will be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.AreNotEquivalent(System.Collections.IEnumerable,System.Collections.IEnumerable,System.String,System.Object[])">
+            <summary>
+            Asserts that expected and actual are not equivalent.
+            </summary>
+            <param name="expected">The first IEnumerable of objects to be considered</param>
+            <param name="actual">The second IEnumerable of objects to be considered</param>
+            <param name="message">The message that will be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.Contains(System.Collections.IEnumerable,System.Object)">
+            <summary>
+            Asserts that collection contains actual as an item.
+            </summary>
+            <param name="collection">IEnumerable of objects to be considered</param>
+            <param name="actual">Object to be found within collection</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.Contains(System.Collections.IEnumerable,System.Object,System.String)">
+            <summary>
+            Asserts that collection contains actual as an item.
+            </summary>
+            <param name="collection">IEnumerable of objects to be considered</param>
+            <param name="actual">Object to be found within collection</param>
+            <param name="message">The message that will be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.Contains(System.Collections.IEnumerable,System.Object,System.String,System.Object[])">
+            <summary>
+            Asserts that collection contains actual as an item.
+            </summary>
+            <param name="collection">IEnumerable of objects to be considered</param>
+            <param name="actual">Object to be found within collection</param>
+            <param name="message">The message that will be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.DoesNotContain(System.Collections.IEnumerable,System.Object)">
+            <summary>
+            Asserts that collection does not contain actual as an item.
+            </summary>
+            <param name="collection">IEnumerable of objects to be considered</param>
+            <param name="actual">Object that cannot exist within collection</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.DoesNotContain(System.Collections.IEnumerable,System.Object,System.String)">
+            <summary>
+            Asserts that collection does not contain actual as an item.
+            </summary>
+            <param name="collection">IEnumerable of objects to be considered</param>
+            <param name="actual">Object that cannot exist within collection</param>
+            <param name="message">The message that will be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.DoesNotContain(System.Collections.IEnumerable,System.Object,System.String,System.Object[])">
+            <summary>
+            Asserts that collection does not contain actual as an item.
+            </summary>
+            <param name="collection">IEnumerable of objects to be considered</param>
+            <param name="actual">Object that cannot exist within collection</param>
+            <param name="message">The message that will be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.IsNotSubsetOf(System.Collections.IEnumerable,System.Collections.IEnumerable)">
+            <summary>
+            Asserts that the superset does not contain the subset
+            </summary>
+            <param name="subset">The IEnumerable subset to be considered</param>
+            <param name="superset">The IEnumerable superset to be considered</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.IsNotSubsetOf(System.Collections.IEnumerable,System.Collections.IEnumerable,System.String)">
+            <summary>
+            Asserts that the superset does not contain the subset
+            </summary>
+            <param name="subset">The IEnumerable subset to be considered</param>
+            <param name="superset">The IEnumerable superset to be considered</param>
+            <param name="message">The message that will be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.IsNotSubsetOf(System.Collections.IEnumerable,System.Collections.IEnumerable,System.String,System.Object[])">
+            <summary>
+            Asserts that the superset does not contain the subset
+            </summary>
+            <param name="subset">The IEnumerable subset to be considered</param>
+            <param name="superset">The IEnumerable superset to be considered</param>
+            <param name="message">The message that will be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.IsSubsetOf(System.Collections.IEnumerable,System.Collections.IEnumerable)">
+            <summary>
+            Asserts that the superset contains the subset.
+            </summary>
+            <param name="subset">The IEnumerable subset to be considered</param>
+            <param name="superset">The IEnumerable superset to be considered</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.IsSubsetOf(System.Collections.IEnumerable,System.Collections.IEnumerable,System.String)">
+            <summary>
+            Asserts that the superset contains the subset.
+            </summary>
+            <param name="subset">The IEnumerable subset to be considered</param>
+            <param name="superset">The IEnumerable superset to be considered</param>
+            <param name="message">The message that will be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.IsSubsetOf(System.Collections.IEnumerable,System.Collections.IEnumerable,System.String,System.Object[])">
+            <summary>
+            Asserts that the superset contains the subset.
+            </summary>
+            <param name="subset">The IEnumerable subset to be considered</param>
+            <param name="superset">The IEnumerable superset to be considered</param>
+            <param name="message">The message that will be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.IsEmpty(System.Collections.IEnumerable,System.String,System.Object[])">
+            <summary>
+            Assert that an array, list or other collection is empty
+            </summary>
+            <param name="collection">An array, list or other collection implementing IEnumerable</param>
+            <param name="message">The message to be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.IsEmpty(System.Collections.IEnumerable,System.String)">
+            <summary>
+            Assert that an array, list or other collection is empty
+            </summary>
+            <param name="collection">An array, list or other collection implementing IEnumerable</param>
+            <param name="message">The message to be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.IsEmpty(System.Collections.IEnumerable)">
+            <summary>
+            Assert that an array,list or other collection is empty
+            </summary>
+            <param name="collection">An array, list or other collection implementing IEnumerable</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.IsNotEmpty(System.Collections.IEnumerable,System.String,System.Object[])">
+            <summary>
+            Assert that an array, list or other collection is empty
+            </summary>
+            <param name="collection">An array, list or other collection implementing IEnumerable</param>
+            <param name="message">The message to be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.IsNotEmpty(System.Collections.IEnumerable,System.String)">
+            <summary>
+            Assert that an array, list or other collection is empty
+            </summary>
+            <param name="collection">An array, list or other collection implementing IEnumerable</param>
+            <param name="message">The message to be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.IsNotEmpty(System.Collections.IEnumerable)">
+            <summary>
+            Assert that an array,list or other collection is empty
+            </summary>
+            <param name="collection">An array, list or other collection implementing IEnumerable</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.IsOrdered(System.Collections.IEnumerable,System.String,System.Object[])">
+            <summary>
+            Assert that an array, list or other collection is ordered
+            </summary>
+            <param name="collection">An array, list or other collection implementing IEnumerable</param>
+            <param name="message">The message to be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.IsOrdered(System.Collections.IEnumerable,System.String)">
+            <summary>
+            Assert that an array, list or other collection is ordered
+            </summary>
+            <param name="collection">An array, list or other collection implementing IEnumerable</param>
+            <param name="message">The message to be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.IsOrdered(System.Collections.IEnumerable)">
+            <summary>
+            Assert that an array, list or other collection is ordered
+            </summary>
+            <param name="collection">An array, list or other collection implementing IEnumerable</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.IsOrdered(System.Collections.IEnumerable,System.Collections.IComparer,System.String,System.Object[])">
+            <summary>
+            Assert that an array, list or other collection is ordered
+            </summary>
+            <param name="collection">An array, list or other collection implementing IEnumerable</param>
+            <param name="comparer">A custom comparer to perform the comparisons</param>
+            <param name="message">The message to be displayed on failure</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.IsOrdered(System.Collections.IEnumerable,System.Collections.IComparer,System.String)">
+            <summary>
+            Assert that an array, list or other collection is ordered
+            </summary>
+            <param name="collection">An array, list or other collection implementing IEnumerable</param>
+            <param name="comparer">A custom comparer to perform the comparisons</param>
+            <param name="message">The message to be displayed on failure</param>
+        </member>
+        <member name="M:NUnit.Framework.CollectionAssert.IsOrdered(System.Collections.IEnumerable,System.Collections.IComparer)">
+            <summary>
+            Assert that an array, list or other collection is ordered
+            </summary>
+            <param name="collection">An array, list or other collection implementing IEnumerable</param>
+            <param name="comparer">A custom comparer to perform the comparisons</param>
+        </member>
+        <member name="T:NUnit.Framework.Contains">
+            <summary>
+            Helper class with properties and methods that supply
+            a number of constraints used in Asserts.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Contains.Item(System.Object)">
+            <summary>
+            Returns a new CollectionContainsConstraint checking for the
+            presence of a particular object in the collection.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Contains.Substring(System.String)">
+            <summary>
+            Returns a constraint that succeeds if the actual
+            value contains the substring supplied as an argument.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.DirectoryAssert">
+            <summary>
+            Summary description for DirectoryAssert
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.Equals(System.Object,System.Object)">
+            <summary>
+            The Equals method throws an AssertionException. This is done 
+            to make sure there is no mistake by calling this function.
+            </summary>
+            <param name="a"></param>
+            <param name="b"></param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.ReferenceEquals(System.Object,System.Object)">
+            <summary>
+            override the default ReferenceEquals to throw an AssertionException. This 
+            implementation makes sure there is no mistake in calling this function 
+            as part of Assert. 
+            </summary>
+            <param name="a"></param>
+            <param name="b"></param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.#ctor">
+            <summary>
+            We don't actually want any instances of this object, but some people
+            like to inherit from it to add other static methods. Hence, the
+            protected constructor disallows any instances of this object. 
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.AreEqual(System.IO.DirectoryInfo,System.IO.DirectoryInfo,System.String,System.Object[])">
+            <summary>
+            Verifies that two directories are equal.  Two directories are considered
+            equal if both are null, or if both have the same value byte for byte.
+            If they are not equal an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">A directory containing the value that is expected</param>
+            <param name="actual">A directory containing the actual value</param>
+            <param name="message">The message to display if directories are not equal</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.AreEqual(System.IO.DirectoryInfo,System.IO.DirectoryInfo,System.String)">
+            <summary>
+            Verifies that two directories are equal.  Two directories are considered
+            equal if both are null, or if both have the same value byte for byte.
+            If they are not equal an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">A directory containing the value that is expected</param>
+            <param name="actual">A directory containing the actual value</param>
+            <param name="message">The message to display if directories are not equal</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.AreEqual(System.IO.DirectoryInfo,System.IO.DirectoryInfo)">
+            <summary>
+            Verifies that two directories are equal.  Two directories are considered
+            equal if both are null, or if both have the same value byte for byte.
+            If they are not equal an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">A directory containing the value that is expected</param>
+            <param name="actual">A directory containing the actual value</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.AreEqual(System.String,System.String,System.String,System.Object[])">
+            <summary>
+            Verifies that two directories are equal.  Two directories are considered
+            equal if both are null, or if both have the same value byte for byte.
+            If they are not equal an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">A directory path string containing the value that is expected</param>
+            <param name="actual">A directory path string containing the actual value</param>
+            <param name="message">The message to display if directories are not equal</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.AreEqual(System.String,System.String,System.String)">
+            <summary>
+            Verifies that two directories are equal.  Two directories are considered
+            equal if both are null, or if both have the same value byte for byte.
+            If they are not equal an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">A directory path string containing the value that is expected</param>
+            <param name="actual">A directory path string containing the actual value</param>
+            <param name="message">The message to display if directories are not equal</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.AreEqual(System.String,System.String)">
+            <summary>
+            Verifies that two directories are equal.  Two directories are considered
+            equal if both are null, or if both have the same value byte for byte.
+            If they are not equal an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">A directory path string containing the value that is expected</param>
+            <param name="actual">A directory path string containing the actual value</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.AreNotEqual(System.IO.DirectoryInfo,System.IO.DirectoryInfo,System.String,System.Object[])">
+            <summary>
+            Asserts that two directories are not equal. If they are equal
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">A directory containing the value that is expected</param>
+            <param name="actual">A directory containing the actual value</param>
+            <param name="message">The message to display if directories are not equal</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.AreNotEqual(System.IO.DirectoryInfo,System.IO.DirectoryInfo,System.String)">
+            <summary>
+            Asserts that two directories are not equal. If they are equal
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">A directory containing the value that is expected</param>
+            <param name="actual">A directory containing the actual value</param>
+            <param name="message">The message to display if directories are not equal</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.AreNotEqual(System.IO.DirectoryInfo,System.IO.DirectoryInfo)">
+            <summary>
+            Asserts that two directories are not equal. If they are equal
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">A directory containing the value that is expected</param>
+            <param name="actual">A directory containing the actual value</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.AreNotEqual(System.String,System.String,System.String,System.Object[])">
+            <summary>
+            Asserts that two directories are not equal. If they are equal
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">A directory path string containing the value that is expected</param>
+            <param name="actual">A directory path string containing the actual value</param>
+            <param name="message">The message to display if directories are equal</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.AreNotEqual(System.String,System.String,System.String)">
+            <summary>
+            Asserts that two directories are not equal. If they are equal
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">A directory path string containing the value that is expected</param>
+            <param name="actual">A directory path string containing the actual value</param>
+            <param name="message">The message to display if directories are equal</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.AreNotEqual(System.String,System.String)">
+            <summary>
+            Asserts that two directories are not equal. If they are equal
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">A directory path string containing the value that is expected</param>
+            <param name="actual">A directory path string containing the actual value</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.IsEmpty(System.IO.DirectoryInfo,System.String,System.Object[])">
+            <summary>
+            Asserts that the directory is empty. If it is not empty
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="directory">A directory to search</param>
+            <param name="message">The message to display if directories are not equal</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.IsEmpty(System.IO.DirectoryInfo,System.String)">
+            <summary>
+            Asserts that the directory is empty. If it is not empty
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="directory">A directory to search</param>
+            <param name="message">The message to display if directories are not equal</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.IsEmpty(System.IO.DirectoryInfo)">
+            <summary>
+            Asserts that the directory is empty. If it is not empty
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="directory">A directory to search</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.IsEmpty(System.String,System.String,System.Object[])">
+            <summary>
+            Asserts that the directory is empty. If it is not empty
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="directory">A directory to search</param>
+            <param name="message">The message to display if directories are not equal</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.IsEmpty(System.String,System.String)">
+            <summary>
+            Asserts that the directory is empty. If it is not empty
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="directory">A directory to search</param>
+            <param name="message">The message to display if directories are not equal</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.IsEmpty(System.String)">
+            <summary>
+            Asserts that the directory is empty. If it is not empty
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="directory">A directory to search</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.IsNotEmpty(System.IO.DirectoryInfo,System.String,System.Object[])">
+            <summary>
+            Asserts that the directory is not empty. If it is empty
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="directory">A directory to search</param>
+            <param name="message">The message to display if directories are not equal</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.IsNotEmpty(System.IO.DirectoryInfo,System.String)">
+            <summary>
+            Asserts that the directory is not empty. If it is empty
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="directory">A directory to search</param>
+            <param name="message">The message to display if directories are not equal</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.IsNotEmpty(System.IO.DirectoryInfo)">
+            <summary>
+            Asserts that the directory is not empty. If it is empty
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="directory">A directory to search</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.IsNotEmpty(System.String,System.String,System.Object[])">
+            <summary>
+            Asserts that the directory is not empty. If it is empty
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="directory">A directory to search</param>
+            <param name="message">The message to display if directories are not equal</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.IsNotEmpty(System.String,System.String)">
+            <summary>
+            Asserts that the directory is not empty. If it is empty
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="directory">A directory to search</param>
+            <param name="message">The message to display if directories are not equal</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.IsNotEmpty(System.String)">
+            <summary>
+            Asserts that the directory is not empty. If it is empty
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="directory">A directory to search</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.IsWithin(System.IO.DirectoryInfo,System.IO.DirectoryInfo,System.String,System.Object[])">
+            <summary>
+            Asserts that path contains actual as a subdirectory or
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="directory">A directory to search</param>
+            <param name="actual">sub-directory asserted to exist under directory</param>
+            <param name="message">The message to display if directory is not within the path</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.IsWithin(System.IO.DirectoryInfo,System.IO.DirectoryInfo,System.String)">
+            <summary>
+            Asserts that path contains actual as a subdirectory or
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="directory">A directory to search</param>
+            <param name="actual">sub-directory asserted to exist under directory</param>
+            <param name="message">The message to display if directory is not within the path</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.IsWithin(System.IO.DirectoryInfo,System.IO.DirectoryInfo)">
+            <summary>
+            Asserts that path contains actual as a subdirectory or
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="directory">A directory to search</param>
+            <param name="actual">sub-directory asserted to exist under directory</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.IsWithin(System.String,System.String,System.String,System.Object[])">
+            <summary>
+            Asserts that path contains actual as a subdirectory or
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="directory">A directory to search</param>
+            <param name="actual">sub-directory asserted to exist under directory</param>
+            <param name="message">The message to display if directory is not within the path</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.IsWithin(System.String,System.String,System.String)">
+            <summary>
+            Asserts that path contains actual as a subdirectory or
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="directory">A directory to search</param>
+            <param name="actual">sub-directory asserted to exist under directory</param>
+            <param name="message">The message to display if directory is not within the path</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.IsWithin(System.String,System.String)">
+            <summary>
+            Asserts that path contains actual as a subdirectory or
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="directory">A directory to search</param>
+            <param name="actual">sub-directory asserted to exist under directory</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.IsNotWithin(System.IO.DirectoryInfo,System.IO.DirectoryInfo,System.String,System.Object[])">
+            <summary>
+            Asserts that path does not contain actual as a subdirectory or
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="directory">A directory to search</param>
+            <param name="actual">sub-directory asserted to exist under directory</param>
+            <param name="message">The message to display if directory is not within the path</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.IsNotWithin(System.IO.DirectoryInfo,System.IO.DirectoryInfo,System.String)">
+            <summary>
+            Asserts that path does not contain actual as a subdirectory or
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="directory">A directory to search</param>
+            <param name="actual">sub-directory asserted to exist under directory</param>
+            <param name="message">The message to display if directory is not within the path</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.IsNotWithin(System.IO.DirectoryInfo,System.IO.DirectoryInfo)">
+            <summary>
+            Asserts that path does not contain actual as a subdirectory or
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="directory">A directory to search</param>
+            <param name="actual">sub-directory asserted to exist under directory</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.IsNotWithin(System.String,System.String,System.String,System.Object[])">
+            <summary>
+            Asserts that path does not contain actual as a subdirectory or
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="directory">A directory to search</param>
+            <param name="actual">sub-directory asserted to exist under directory</param>
+            <param name="message">The message to display if directory is not within the path</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.IsNotWithin(System.String,System.String,System.String)">
+            <summary>
+            Asserts that path does not contain actual as a subdirectory or
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="directory">A directory to search</param>
+            <param name="actual">sub-directory asserted to exist under directory</param>
+            <param name="message">The message to display if directory is not within the path</param>
+        </member>
+        <member name="M:NUnit.Framework.DirectoryAssert.IsNotWithin(System.String,System.String)">
+            <summary>
+            Asserts that path does not contain actual as a subdirectory or
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="directory">A directory to search</param>
+            <param name="actual">sub-directory asserted to exist under directory</param>
+        </member>
+        <member name="T:NUnit.Framework.FileAssert">
+            <summary>
+            Summary description for FileAssert.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.FileAssert.Equals(System.Object,System.Object)">
+            <summary>
+            The Equals method throws an AssertionException. This is done 
+            to make sure there is no mistake by calling this function.
+            </summary>
+            <param name="a"></param>
+            <param name="b"></param>
+        </member>
+        <member name="M:NUnit.Framework.FileAssert.ReferenceEquals(System.Object,System.Object)">
+            <summary>
+            override the default ReferenceEquals to throw an AssertionException. This 
+            implementation makes sure there is no mistake in calling this function 
+            as part of Assert. 
+            </summary>
+            <param name="a"></param>
+            <param name="b"></param>
+        </member>
+        <member name="M:NUnit.Framework.FileAssert.#ctor">
+            <summary>
+            We don't actually want any instances of this object, but some people
+            like to inherit from it to add other static methods. Hence, the
+            protected constructor disallows any instances of this object. 
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.FileAssert.AreEqual(System.IO.Stream,System.IO.Stream,System.String,System.Object[])">
+            <summary>
+            Verifies that two Streams are equal.  Two Streams are considered
+            equal if both are null, or if both have the same value byte for byte.
+            If they are not equal an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected Stream</param>
+            <param name="actual">The actual Stream</param>
+            <param name="message">The message to display if Streams are not equal</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.FileAssert.AreEqual(System.IO.Stream,System.IO.Stream,System.String)">
+            <summary>
+            Verifies that two Streams are equal.  Two Streams are considered
+            equal if both are null, or if both have the same value byte for byte.
+            If they are not equal an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected Stream</param>
+            <param name="actual">The actual Stream</param>
+            <param name="message">The message to display if objects are not equal</param>
+        </member>
+        <member name="M:NUnit.Framework.FileAssert.AreEqual(System.IO.Stream,System.IO.Stream)">
+            <summary>
+            Verifies that two Streams are equal.  Two Streams are considered
+            equal if both are null, or if both have the same value byte for byte.
+            If they are not equal an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected Stream</param>
+            <param name="actual">The actual Stream</param>
+        </member>
+        <member name="M:NUnit.Framework.FileAssert.AreEqual(System.IO.FileInfo,System.IO.FileInfo,System.String,System.Object[])">
+            <summary>
+            Verifies that two files are equal.  Two files are considered
+            equal if both are null, or if both have the same value byte for byte.
+            If they are not equal an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">A file containing the value that is expected</param>
+            <param name="actual">A file containing the actual value</param>
+            <param name="message">The message to display if Streams are not equal</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.FileAssert.AreEqual(System.IO.FileInfo,System.IO.FileInfo,System.String)">
+            <summary>
+            Verifies that two files are equal.  Two files are considered
+            equal if both are null, or if both have the same value byte for byte.
+            If they are not equal an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">A file containing the value that is expected</param>
+            <param name="actual">A file containing the actual value</param>
+            <param name="message">The message to display if objects are not equal</param>
+        </member>
+        <member name="M:NUnit.Framework.FileAssert.AreEqual(System.IO.FileInfo,System.IO.FileInfo)">
+            <summary>
+            Verifies that two files are equal.  Two files are considered
+            equal if both are null, or if both have the same value byte for byte.
+            If they are not equal an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">A file containing the value that is expected</param>
+            <param name="actual">A file containing the actual value</param>
+        </member>
+        <member name="M:NUnit.Framework.FileAssert.AreEqual(System.String,System.String,System.String,System.Object[])">
+            <summary>
+            Verifies that two files are equal.  Two files are considered
+            equal if both are null, or if both have the same value byte for byte.
+            If they are not equal an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The path to a file containing the value that is expected</param>
+            <param name="actual">The path to a file containing the actual value</param>
+            <param name="message">The message to display if Streams are not equal</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.FileAssert.AreEqual(System.String,System.String,System.String)">
+            <summary>
+            Verifies that two files are equal.  Two files are considered
+            equal if both are null, or if both have the same value byte for byte.
+            If they are not equal an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The path to a file containing the value that is expected</param>
+            <param name="actual">The path to a file containing the actual value</param>
+            <param name="message">The message to display if objects are not equal</param>
+        </member>
+        <member name="M:NUnit.Framework.FileAssert.AreEqual(System.String,System.String)">
+            <summary>
+            Verifies that two files are equal.  Two files are considered
+            equal if both are null, or if both have the same value byte for byte.
+            If they are not equal an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The path to a file containing the value that is expected</param>
+            <param name="actual">The path to a file containing the actual value</param>
+        </member>
+        <member name="M:NUnit.Framework.FileAssert.AreNotEqual(System.IO.Stream,System.IO.Stream,System.String,System.Object[])">
+            <summary>
+            Asserts that two Streams are not equal. If they are equal
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected Stream</param>
+            <param name="actual">The actual Stream</param>
+            <param name="message">The message to be displayed when the two Stream are the same.</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.FileAssert.AreNotEqual(System.IO.Stream,System.IO.Stream,System.String)">
+            <summary>
+            Asserts that two Streams are not equal. If they are equal
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected Stream</param>
+            <param name="actual">The actual Stream</param>
+            <param name="message">The message to be displayed when the Streams are the same.</param>
+        </member>
+        <member name="M:NUnit.Framework.FileAssert.AreNotEqual(System.IO.Stream,System.IO.Stream)">
+            <summary>
+            Asserts that two Streams are not equal. If they are equal
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The expected Stream</param>
+            <param name="actual">The actual Stream</param>
+        </member>
+        <member name="M:NUnit.Framework.FileAssert.AreNotEqual(System.IO.FileInfo,System.IO.FileInfo,System.String,System.Object[])">
+            <summary>
+            Asserts that two files are not equal. If they are equal
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">A file containing the value that is expected</param>
+            <param name="actual">A file containing the actual value</param>
+            <param name="message">The message to display if Streams are not equal</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.FileAssert.AreNotEqual(System.IO.FileInfo,System.IO.FileInfo,System.String)">
+            <summary>
+            Asserts that two files are not equal. If they are equal
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">A file containing the value that is expected</param>
+            <param name="actual">A file containing the actual value</param>
+            <param name="message">The message to display if objects are not equal</param>
+        </member>
+        <member name="M:NUnit.Framework.FileAssert.AreNotEqual(System.IO.FileInfo,System.IO.FileInfo)">
+            <summary>
+            Asserts that two files are not equal. If they are equal
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">A file containing the value that is expected</param>
+            <param name="actual">A file containing the actual value</param>
+        </member>
+        <member name="M:NUnit.Framework.FileAssert.AreNotEqual(System.String,System.String,System.String,System.Object[])">
+            <summary>
+            Asserts that two files are not equal. If they are equal
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The path to a file containing the value that is expected</param>
+            <param name="actual">The path to a file containing the actual value</param>
+            <param name="message">The message to display if Streams are not equal</param>
+            <param name="args">Arguments to be used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.FileAssert.AreNotEqual(System.String,System.String,System.String)">
+            <summary>
+            Asserts that two files are not equal. If they are equal
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The path to a file containing the value that is expected</param>
+            <param name="actual">The path to a file containing the actual value</param>
+            <param name="message">The message to display if objects are not equal</param>
+        </member>
+        <member name="M:NUnit.Framework.FileAssert.AreNotEqual(System.String,System.String)">
+            <summary>
+            Asserts that two files are not equal. If they are equal
+            an <see cref="T:NUnit.Framework.AssertionException"/> is thrown.
+            </summary>
+            <param name="expected">The path to a file containing the value that is expected</param>
+            <param name="actual">The path to a file containing the actual value</param>
+        </member>
+        <member name="T:NUnit.Framework.GlobalSettings">
+            <summary>
+            GlobalSettings is a place for setting default values used
+            by the framework in performing asserts.
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.GlobalSettings.DefaultFloatingPointTolerance">
+            <summary>
+            Default tolerance for floating point equality
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Guard">
+            <summary>
+            Class used to guard against unexpected argument values
+            by throwing an appropriate exception.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Guard.ArgumentNotNull(System.Object,System.String)">
+            <summary>
+            Throws an exception if an argument is null
+            </summary>
+            <param name="value">The value to be tested</param>
+            <param name="name">The name of the argument</param>
+        </member>
+        <member name="M:NUnit.Framework.Guard.ArgumentNotNullOrEmpty(System.String,System.String)">
+            <summary>
+            Throws an exception if a string argument is null or empty
+            </summary>
+            <param name="value">The value to be tested</param>
+            <param name="name">The name of the argument</param>
+        </member>
+        <member name="T:NUnit.Framework.Has">
+            <summary>
+            Helper class with properties and methods that supply
+            a number of constraints used in Asserts.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Has.Exactly(System.Int32)">
+            <summary>
+            Returns a ConstraintExpression, which will apply
+            the following constraint to all members of a collection,
+            succeeding only if a specified number of them succeed.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Has.Property(System.String)">
+            <summary>
+            Returns a new PropertyConstraintExpression, which will either
+            test for the existence of the named property on the object
+            being tested or apply any following constraint to that property.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Has.Attribute(System.Type)">
+            <summary>
+            Returns a new AttributeConstraint checking for the
+            presence of a particular attribute on an object.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Has.Attribute``1">
+            <summary>
+            Returns a new AttributeConstraint checking for the
+            presence of a particular attribute on an object.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Has.Member(System.Object)">
+            <summary>
+            Returns a new CollectionContainsConstraint checking for the
+            presence of a particular object in the collection.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Has.No">
+            <summary>
+            Returns a ConstraintExpression that negates any
+            following constraint.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Has.All">
+            <summary>
+            Returns a ConstraintExpression, which will apply
+            the following constraint to all members of a collection,
+            succeeding if all of them succeed.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Has.Some">
+            <summary>
+            Returns a ConstraintExpression, which will apply
+            the following constraint to all members of a collection,
+            succeeding if at least one of them succeeds.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Has.None">
+            <summary>
+            Returns a ConstraintExpression, which will apply
+            the following constraint to all members of a collection,
+            succeeding if all of them fail.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Has.Length">
+            <summary>
+            Returns a new ConstraintExpression, which will apply the following
+            constraint to the Length property of the object being tested.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Has.Count">
+            <summary>
+            Returns a new ConstraintExpression, which will apply the following
+            constraint to the Count property of the object being tested.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Has.Message">
+            <summary>
+            Returns a new ConstraintExpression, which will apply the following
+            constraint to the Message property of the object being tested.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Has.InnerException">
+            <summary>
+            Returns a new ConstraintExpression, which will apply the following
+            constraint to the InnerException property of the object being tested.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.IExpectException">
+            <summary>
+            Interface implemented by a user fixture in order to
+            validate any expected exceptions. It is only called
+            for test methods marked with the ExpectedException
+            attribute.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.IExpectException.HandleException(System.Exception)">
+            <summary>
+            Method to handle an expected exception
+            </summary>
+            <param name="ex">The exception to be handled</param>
+        </member>
+        <member name="T:NUnit.Framework.Is">
+            <summary>
+            Helper class with properties and methods that supply
+            a number of constraints used in Asserts.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Is.EqualTo(System.Object)">
+            <summary>
+            Returns a constraint that tests two items for equality
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Is.SameAs(System.Object)">
+            <summary>
+            Returns a constraint that tests that two references are the same object
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Is.GreaterThan(System.Object)">
+            <summary>
+            Returns a constraint that tests whether the
+            actual value is greater than the suppled argument
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Is.GreaterThanOrEqualTo(System.Object)">
+            <summary>
+            Returns a constraint that tests whether the
+            actual value is greater than or equal to the suppled argument
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Is.AtLeast(System.Object)">
+            <summary>
+            Returns a constraint that tests whether the
+            actual value is greater than or equal to the suppled argument
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Is.LessThan(System.Object)">
+            <summary>
+            Returns a constraint that tests whether the
+            actual value is less than the suppled argument
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Is.LessThanOrEqualTo(System.Object)">
+            <summary>
+            Returns a constraint that tests whether the
+            actual value is less than or equal to the suppled argument
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Is.AtMost(System.Object)">
+            <summary>
+            Returns a constraint that tests whether the
+            actual value is less than or equal to the suppled argument
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Is.TypeOf(System.Type)">
+            <summary>
+            Returns a constraint that tests whether the actual
+            value is of the exact type supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Is.TypeOf``1">
+            <summary>
+            Returns a constraint that tests whether the actual
+            value is of the exact type supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Is.InstanceOf(System.Type)">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is of the type supplied as an argument or a derived type.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Is.InstanceOf``1">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is of the type supplied as an argument or a derived type.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Is.InstanceOfType(System.Type)">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is of the type supplied as an argument or a derived type.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Is.InstanceOfType``1">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is of the type supplied as an argument or a derived type.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Is.AssignableFrom(System.Type)">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is assignable from the type supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Is.AssignableFrom``1">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is assignable from the type supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Is.AssignableTo(System.Type)">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is assignable from the type supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Is.AssignableTo``1">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is assignable from the type supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Is.EquivalentTo(System.Collections.IEnumerable)">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is a collection containing the same elements as the 
+            collection supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Is.SubsetOf(System.Collections.IEnumerable)">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is a subset of the collection supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Is.StringContaining(System.String)">
+            <summary>
+            Returns a constraint that succeeds if the actual
+            value contains the substring supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Is.StringStarting(System.String)">
+            <summary>
+            Returns a constraint that succeeds if the actual
+            value starts with the substring supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Is.StringEnding(System.String)">
+            <summary>
+            Returns a constraint that succeeds if the actual
+            value ends with the substring supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Is.StringMatching(System.String)">
+            <summary>
+            Returns a constraint that succeeds if the actual
+            value matches the regular expression supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Is.SamePath(System.String)">
+            <summary>
+            Returns a constraint that tests whether the path provided 
+            is the same as an expected path after canonicalization.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Is.SubPath(System.String)">
+            <summary>
+            Returns a constraint that tests whether the path provided 
+            is under an expected path after canonicalization.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Is.SamePathOrUnder(System.String)">
+            <summary>
+            Returns a constraint that tests whether the path provided 
+            is the same path or under an expected path after canonicalization.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Is.InRange``1(``0,``0)">
+            <summary>
+            Returns a constraint that tests whether the actual value falls 
+            within a specified range.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Is.Not">
+            <summary>
+            Returns a ConstraintExpression that negates any
+            following constraint.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Is.All">
+            <summary>
+            Returns a ConstraintExpression, which will apply
+            the following constraint to all members of a collection,
+            succeeding if all of them succeed.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Is.Null">
+            <summary>
+            Returns a constraint that tests for null
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Is.True">
+            <summary>
+            Returns a constraint that tests for True
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Is.False">
+            <summary>
+            Returns a constraint that tests for False
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Is.Positive">
+            <summary>
+            Returns a constraint that tests for a positive value
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Is.Negative">
+            <summary>
+            Returns a constraint that tests for a negative value
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Is.NaN">
+            <summary>
+            Returns a constraint that tests for NaN
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Is.Empty">
+            <summary>
+            Returns a constraint that tests for empty
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Is.Unique">
+            <summary>
+            Returns a constraint that tests whether a collection 
+            contains all unique items.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Is.BinarySerializable">
+            <summary>
+            Returns a constraint that tests whether an object graph is serializable in binary format.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Is.XmlSerializable">
+            <summary>
+            Returns a constraint that tests whether an object graph is serializable in xml format.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Is.Ordered">
+            <summary>
+            Returns a constraint that tests whether a collection is ordered
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.ITestCaseData">
+            <summary>
+            The ITestCaseData interface is implemented by a class
+            that is able to return complete testcases for use by
+            a parameterized test method.
+            
+            NOTE: This interface is used in both the framework
+            and the core, even though that results in two different
+            types. However, sharing the source code guarantees that
+            the various implementations will be compatible and that
+            the core is able to reflect successfully over the
+            framework implementations of ITestCaseData.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.ITestCaseData.Arguments">
+            <summary>
+            Gets the argument list to be provided to the test
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.ITestCaseData.Result">
+            <summary>
+            Gets the expected result
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.ITestCaseData.HasExpectedResult">
+            <summary>
+            Indicates whether a result has been specified.
+            This is necessary because the result may be
+            null, so it's value cannot be checked.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.ITestCaseData.ExpectedException">
+            <summary>
+             Gets the expected exception Type
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.ITestCaseData.ExpectedExceptionName">
+            <summary>
+            Gets the FullName of the expected exception
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.ITestCaseData.TestName">
+            <summary>
+            Gets the name to be used for the test
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.ITestCaseData.Description">
+            <summary>
+            Gets the description of the test
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.ITestCaseData.Ignored">
+            <summary>
+            Gets a value indicating whether this <see cref="T:NUnit.Framework.ITestCaseData"/> is ignored.
+            </summary>
+            <value><c>true</c> if ignored; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:NUnit.Framework.ITestCaseData.Explicit">
+            <summary>
+            Gets a value indicating whether this <see cref="T:NUnit.Framework.ITestCaseData"/> is explicit.
+            </summary>
+            <value><c>true</c> if explicit; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:NUnit.Framework.ITestCaseData.IgnoreReason">
+            <summary>
+            Gets the ignore reason.
+            </summary>
+            <value>The ignore reason.</value>
+        </member>
+        <member name="T:NUnit.Framework.Iz">
+            <summary>
+            The Iz class is a synonym for Is intended for use in VB,
+            which regards Is as a keyword.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.List">
+            <summary>
+            The List class is a helper class with properties and methods
+            that supply a number of constraints used with lists and collections.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.List.Map(System.Collections.ICollection)">
+            <summary>
+            List.Map returns a ListMapper, which can be used to map
+            the original collection to another collection.
+            </summary>
+            <param name="actual"></param>
+            <returns></returns>
+        </member>
+        <member name="T:NUnit.Framework.ListMapper">
+            <summary>
+            ListMapper is used to transform a collection used as an actual argument
+            producing another collection to be used in the assertion.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.ListMapper.#ctor(System.Collections.ICollection)">
+            <summary>
+            Construct a ListMapper based on a collection
+            </summary>
+            <param name="original">The collection to be transformed</param>
+        </member>
+        <member name="M:NUnit.Framework.ListMapper.Property(System.String)">
+            <summary>
+            Produces a collection containing all the values of a property
+            </summary>
+            <param name="name">The collection of property values</param>
+            <returns></returns>
+        </member>
+        <member name="T:NUnit.Framework.Randomizer">
+            <summary>
+            Randomizer returns a set of random values in a repeatable
+            way, to allow re-running of tests if necessary.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Randomizer.GetRandomizer(System.Reflection.MemberInfo)">
+            <summary>
+            Get a randomizer for a particular member, returning
+            one that has already been created if it exists.
+            This ensures that the same values are generated
+            each time the tests are reloaded.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Randomizer.GetRandomizer(System.Reflection.ParameterInfo)">
+            <summary>
+            Get a randomizer for a particular parameter, returning
+            one that has already been created if it exists.
+            This ensures that the same values are generated
+            each time the tests are reloaded.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Randomizer.#ctor">
+            <summary>
+            Construct a randomizer using a random seed
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Randomizer.#ctor(System.Int32)">
+            <summary>
+            Construct a randomizer using a specified seed
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Randomizer.GetDoubles(System.Int32)">
+            <summary>
+            Return an array of random doubles between 0.0 and 1.0.
+            </summary>
+            <param name="count"></param>
+            <returns></returns>
+        </member>
+        <member name="M:NUnit.Framework.Randomizer.GetDoubles(System.Double,System.Double,System.Int32)">
+            <summary>
+            Return an array of random doubles with values in a specified range.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Randomizer.GetInts(System.Int32,System.Int32,System.Int32)">
+            <summary>
+            Return an array of random ints with values in a specified range.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Randomizer.RandomSeed">
+            <summary>
+            Get a random seed for use in creating a randomizer.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.SpecialValue">
+            <summary>
+            The SpecialValue enum is used to represent TestCase arguments
+            that cannot be used as arguments to an Attribute.
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.SpecialValue.Null">
+            <summary>
+            Null represents a null value, which cannot be used as an 
+            argument to an attribute under .NET 1.x
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.StringAssert">
+            <summary>
+            Basic Asserts on strings.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.Equals(System.Object,System.Object)">
+            <summary>
+            The Equals method throws an AssertionException. This is done 
+            to make sure there is no mistake by calling this function.
+            </summary>
+            <param name="a"></param>
+            <param name="b"></param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.ReferenceEquals(System.Object,System.Object)">
+            <summary>
+            override the default ReferenceEquals to throw an AssertionException. This 
+            implementation makes sure there is no mistake in calling this function 
+            as part of Assert. 
+            </summary>
+            <param name="a"></param>
+            <param name="b"></param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.Contains(System.String,System.String,System.String,System.Object[])">
+            <summary>
+            Asserts that a string is found within another string.
+            </summary>
+            <param name="expected">The expected string</param>
+            <param name="actual">The string to be examined</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Arguments used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.Contains(System.String,System.String,System.String)">
+            <summary>
+            Asserts that a string is found within another string.
+            </summary>
+            <param name="expected">The expected string</param>
+            <param name="actual">The string to be examined</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.Contains(System.String,System.String)">
+            <summary>
+            Asserts that a string is found within another string.
+            </summary>
+            <param name="expected">The expected string</param>
+            <param name="actual">The string to be examined</param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.DoesNotContain(System.String,System.String,System.String,System.Object[])">
+            <summary>
+            Asserts that a string is not found within another string.
+            </summary>
+            <param name="expected">The expected string</param>
+            <param name="actual">The string to be examined</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Arguments used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.DoesNotContain(System.String,System.String,System.String)">
+            <summary>
+            Asserts that a string is found within another string.
+            </summary>
+            <param name="expected">The expected string</param>
+            <param name="actual">The string to be examined</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.DoesNotContain(System.String,System.String)">
+            <summary>
+            Asserts that a string is found within another string.
+            </summary>
+            <param name="expected">The expected string</param>
+            <param name="actual">The string to be examined</param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.StartsWith(System.String,System.String,System.String,System.Object[])">
+            <summary>
+            Asserts that a string starts with another string.
+            </summary>
+            <param name="expected">The expected string</param>
+            <param name="actual">The string to be examined</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Arguments used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.StartsWith(System.String,System.String,System.String)">
+            <summary>
+            Asserts that a string starts with another string.
+            </summary>
+            <param name="expected">The expected string</param>
+            <param name="actual">The string to be examined</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.StartsWith(System.String,System.String)">
+            <summary>
+            Asserts that a string starts with another string.
+            </summary>
+            <param name="expected">The expected string</param>
+            <param name="actual">The string to be examined</param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.DoesNotStartWith(System.String,System.String,System.String,System.Object[])">
+            <summary>
+            Asserts that a string does not start with another string.
+            </summary>
+            <param name="expected">The expected string</param>
+            <param name="actual">The string to be examined</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Arguments used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.DoesNotStartWith(System.String,System.String,System.String)">
+            <summary>
+            Asserts that a string does not start with another string.
+            </summary>
+            <param name="expected">The expected string</param>
+            <param name="actual">The string to be examined</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.DoesNotStartWith(System.String,System.String)">
+            <summary>
+            Asserts that a string does not start with another string.
+            </summary>
+            <param name="expected">The expected string</param>
+            <param name="actual">The string to be examined</param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.EndsWith(System.String,System.String,System.String,System.Object[])">
+            <summary>
+            Asserts that a string ends with another string.
+            </summary>
+            <param name="expected">The expected string</param>
+            <param name="actual">The string to be examined</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Arguments used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.EndsWith(System.String,System.String,System.String)">
+            <summary>
+            Asserts that a string ends with another string.
+            </summary>
+            <param name="expected">The expected string</param>
+            <param name="actual">The string to be examined</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.EndsWith(System.String,System.String)">
+            <summary>
+            Asserts that a string ends with another string.
+            </summary>
+            <param name="expected">The expected string</param>
+            <param name="actual">The string to be examined</param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.DoesNotEndWith(System.String,System.String,System.String,System.Object[])">
+            <summary>
+            Asserts that a string does not end with another string.
+            </summary>
+            <param name="expected">The expected string</param>
+            <param name="actual">The string to be examined</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Arguments used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.DoesNotEndWith(System.String,System.String,System.String)">
+            <summary>
+            Asserts that a string does not end with another string.
+            </summary>
+            <param name="expected">The expected string</param>
+            <param name="actual">The string to be examined</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.DoesNotEndWith(System.String,System.String)">
+            <summary>
+            Asserts that a string does not end with another string.
+            </summary>
+            <param name="expected">The expected string</param>
+            <param name="actual">The string to be examined</param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.AreEqualIgnoringCase(System.String,System.String,System.String,System.Object[])">
+            <summary>
+            Asserts that two strings are equal, without regard to case.
+            </summary>
+            <param name="expected">The expected string</param>
+            <param name="actual">The actual string</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Arguments used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.AreEqualIgnoringCase(System.String,System.String,System.String)">
+            <summary>
+            Asserts that two strings are equal, without regard to case.
+            </summary>
+            <param name="expected">The expected string</param>
+            <param name="actual">The actual string</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.AreEqualIgnoringCase(System.String,System.String)">
+            <summary>
+            Asserts that two strings are equal, without regard to case.
+            </summary>
+            <param name="expected">The expected string</param>
+            <param name="actual">The actual string</param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.AreNotEqualIgnoringCase(System.String,System.String,System.String,System.Object[])">
+            <summary>
+            Asserts that two strings are not equal, without regard to case.
+            </summary>
+            <param name="expected">The expected string</param>
+            <param name="actual">The actual string</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Arguments used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.AreNotEqualIgnoringCase(System.String,System.String,System.String)">
+            <summary>
+            Asserts that two strings are Notequal, without regard to case.
+            </summary>
+            <param name="expected">The expected string</param>
+            <param name="actual">The actual string</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.AreNotEqualIgnoringCase(System.String,System.String)">
+            <summary>
+            Asserts that two strings are not equal, without regard to case.
+            </summary>
+            <param name="expected">The expected string</param>
+            <param name="actual">The actual string</param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.IsMatch(System.String,System.String,System.String,System.Object[])">
+            <summary>
+            Asserts that a string matches an expected regular expression pattern.
+            </summary>
+            <param name="pattern">The regex pattern to be matched</param>
+            <param name="actual">The actual string</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Arguments used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.IsMatch(System.String,System.String,System.String)">
+            <summary>
+            Asserts that a string matches an expected regular expression pattern.
+            </summary>
+            <param name="pattern">The regex pattern to be matched</param>
+            <param name="actual">The actual string</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.IsMatch(System.String,System.String)">
+            <summary>
+            Asserts that a string matches an expected regular expression pattern.
+            </summary>
+            <param name="pattern">The regex pattern to be matched</param>
+            <param name="actual">The actual string</param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.DoesNotMatch(System.String,System.String,System.String,System.Object[])">
+            <summary>
+            Asserts that a string does not match an expected regular expression pattern.
+            </summary>
+            <param name="pattern">The regex pattern to be used</param>
+            <param name="actual">The actual string</param>
+            <param name="message">The message to display in case of failure</param>
+            <param name="args">Arguments used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.DoesNotMatch(System.String,System.String,System.String)">
+            <summary>
+            Asserts that a string does not match an expected regular expression pattern.
+            </summary>
+            <param name="pattern">The regex pattern to be used</param>
+            <param name="actual">The actual string</param>
+            <param name="message">The message to display in case of failure</param>
+        </member>
+        <member name="M:NUnit.Framework.StringAssert.DoesNotMatch(System.String,System.String)">
+            <summary>
+            Asserts that a string does not match an expected regular expression pattern.
+            </summary>
+            <param name="pattern">The regex pattern to be used</param>
+            <param name="actual">The actual string</param>
+        </member>
+        <member name="T:NUnit.Framework.TestCaseData">
+            <summary>
+            The TestCaseData class represents a set of arguments
+            and other parameter info to be used for a parameterized
+            test case. It provides a number of instance modifiers
+            for use in initializing the test case.
+            
+            Note: Instance modifiers are getters that return
+            the same instance after modifying it's state.
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.TestCaseData.arguments">
+            <summary>
+            The argument list to be provided to the test
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.TestCaseData.expectedResult">
+            <summary>
+            The expected result to be returned
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.TestCaseData.hasExpectedResult">
+            <summary>
+            Set to true if this has an expected result
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.TestCaseData.expectedExceptionType">
+            <summary>
+             The expected exception Type
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.TestCaseData.expectedExceptionName">
+            <summary>
+            The FullName of the expected exception
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.TestCaseData.testName">
+            <summary>
+            The name to be used for the test
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.TestCaseData.description">
+            <summary>
+            The description of the test
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.TestCaseData.properties">
+            <summary>
+            A dictionary of properties, used to add information
+            to tests without requiring the class to change.
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.TestCaseData.isIgnored">
+            <summary>
+            If true, indicates that the test case is to be ignored
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.TestCaseData.isExplicit">
+            <summary>
+            If true, indicates that the test case is marked explicit
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.TestCaseData.ignoreReason">
+            <summary>
+            The reason for ignoring a test case
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.TestCaseData.#ctor(System.Object[])">
+            <summary>
+            Initializes a new instance of the <see cref="T:TestCaseData"/> class.
+            </summary>
+            <param name="args">The arguments.</param>
+        </member>
+        <member name="M:NUnit.Framework.TestCaseData.#ctor(System.Object)">
+            <summary>
+            Initializes a new instance of the <see cref="T:TestCaseData"/> class.
+            </summary>
+            <param name="arg">The argument.</param>
+        </member>
+        <member name="M:NUnit.Framework.TestCaseData.#ctor(System.Object,System.Object)">
+            <summary>
+            Initializes a new instance of the <see cref="T:TestCaseData"/> class.
+            </summary>
+            <param name="arg1">The first argument.</param>
+            <param name="arg2">The second argument.</param>
+        </member>
+        <member name="M:NUnit.Framework.TestCaseData.#ctor(System.Object,System.Object,System.Object)">
+            <summary>
+            Initializes a new instance of the <see cref="T:TestCaseData"/> class.
+            </summary>
+            <param name="arg1">The first argument.</param>
+            <param name="arg2">The second argument.</param>
+            <param name="arg3">The third argument.</param>
+        </member>
+        <member name="M:NUnit.Framework.TestCaseData.Returns(System.Object)">
+            <summary>
+            Sets the expected result for the test
+            </summary>
+            <param name="result">The expected result</param>
+            <returns>A modified TestCaseData</returns>
+        </member>
+        <member name="M:NUnit.Framework.TestCaseData.Throws(System.Type)">
+            <summary>
+            Sets the expected exception type for the test
+            </summary>
+            <param name="exceptionType">Type of the expected exception.</param>
+            <returns>The modified TestCaseData instance</returns>
+        </member>
+        <member name="M:NUnit.Framework.TestCaseData.Throws(System.String)">
+            <summary>
+            Sets the expected exception type for the test
+            </summary>
+            <param name="exceptionName">FullName of the expected exception.</param>
+            <returns>The modified TestCaseData instance</returns>
+        </member>
+        <member name="M:NUnit.Framework.TestCaseData.SetName(System.String)">
+            <summary>
+            Sets the name of the test case
+            </summary>
+            <returns>The modified TestCaseData instance</returns>
+        </member>
+        <member name="M:NUnit.Framework.TestCaseData.SetDescription(System.String)">
+            <summary>
+            Sets the description for the test case
+            being constructed.
+            </summary>
+            <param name="description">The description.</param>
+            <returns>The modified TestCaseData instance.</returns>
+        </member>
+        <member name="M:NUnit.Framework.TestCaseData.SetCategory(System.String)">
+            <summary>
+            Applies a category to the test
+            </summary>
+            <param name="category"></param>
+            <returns></returns>
+        </member>
+        <member name="M:NUnit.Framework.TestCaseData.SetProperty(System.String,System.String)">
+            <summary>
+            Applies a named property to the test
+            </summary>
+            <param name="propName"></param>
+            <param name="propValue"></param>
+            <returns></returns>
+        </member>
+        <member name="M:NUnit.Framework.TestCaseData.SetProperty(System.String,System.Int32)">
+            <summary>
+            Applies a named property to the test
+            </summary>
+            <param name="propName"></param>
+            <param name="propValue"></param>
+            <returns></returns>
+        </member>
+        <member name="M:NUnit.Framework.TestCaseData.SetProperty(System.String,System.Double)">
+            <summary>
+            Applies a named property to the test
+            </summary>
+            <param name="propName"></param>
+            <param name="propValue"></param>
+            <returns></returns>
+        </member>
+        <member name="M:NUnit.Framework.TestCaseData.Ignore">
+            <summary>
+            Ignores this TestCase.
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:NUnit.Framework.TestCaseData.Ignore(System.String)">
+            <summary>
+            Ignores this TestCase, specifying the reason.
+            </summary>
+            <param name="reason">The reason.</param>
+            <returns></returns>
+        </member>
+        <member name="M:NUnit.Framework.TestCaseData.MakeExplicit">
+            <summary>
+            Marks this TestCase as Explicit
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:NUnit.Framework.TestCaseData.MakeExplicit(System.String)">
+            <summary>
+            Marks this TestCase as Explicit, specifying the reason.
+            </summary>
+            <param name="reason">The reason.</param>
+            <returns></returns>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseData.Arguments">
+            <summary>
+            Gets the argument list to be provided to the test
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseData.Result">
+            <summary>
+            Gets the expected result
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseData.HasExpectedResult">
+            <summary>
+            Returns true if the result has been set
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseData.ExpectedException">
+            <summary>
+             Gets the expected exception Type
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseData.ExpectedExceptionName">
+            <summary>
+            Gets the FullName of the expected exception
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseData.TestName">
+            <summary>
+            Gets the name to be used for the test
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseData.Description">
+            <summary>
+            Gets the description of the test
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseData.Ignored">
+            <summary>
+            Gets a value indicating whether this <see cref="T:NUnit.Framework.ITestCaseData"/> is ignored.
+            </summary>
+            <value><c>true</c> if ignored; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseData.Explicit">
+            <summary>
+            Gets a value indicating whether this <see cref="T:NUnit.Framework.ITestCaseData"/> is explicit.
+            </summary>
+            <value><c>true</c> if explicit; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseData.IgnoreReason">
+            <summary>
+            Gets the ignore reason.
+            </summary>
+            <value>The ignore reason.</value>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseData.Categories">
+            <summary>
+            Gets a list of categories associated with this test.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseData.Properties">
+            <summary>
+            Gets the property dictionary for this test
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.TestContext">
+            <summary>
+            Provide the context information of the current test
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.TestContext.#ctor(System.Collections.IDictionary)">
+            <summary>
+            Constructs a TestContext using the provided context dictionary
+            </summary>
+            <param name="context">A context dictionary</param>
+        </member>
+        <member name="P:NUnit.Framework.TestContext.CurrentContext">
+            <summary>
+            Get the current test context. This is created
+            as needed. The user may save the context for
+            use within a test, but it should not be used
+            outside the test for which it is created.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestContext.Test">
+            <summary>
+            Gets a TestAdapter representing the currently executing test in this context.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestContext.Result">
+            <summary>
+            Gets a ResultAdapter representing the current result for the test 
+            executing in this context.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestContext.TestDirectory">
+            <summary>
+            Gets the directory containing the current test assembly.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestContext.WorkDirectory">
+            <summary>
+            Gets the directory to be used for outputing files created
+            by this test run.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.TestContext.TestAdapter">
+            <summary>
+            TestAdapter adapts a Test for consumption by
+            the user test code.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.TestContext.TestAdapter.#ctor(System.Collections.IDictionary)">
+            <summary>
+            Constructs a TestAdapter for this context
+            </summary>
+            <param name="context">The context dictionary</param>
+        </member>
+        <member name="P:NUnit.Framework.TestContext.TestAdapter.Name">
+            <summary>
+            The name of the test.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestContext.TestAdapter.FullName">
+            <summary>
+            The FullName of the test
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestContext.TestAdapter.Properties">
+            <summary>
+            The properties of the test.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.TestContext.ResultAdapter">
+            <summary>
+            ResultAdapter adapts a TestResult for consumption by
+            the user test code.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.TestContext.ResultAdapter.#ctor(System.Collections.IDictionary)">
+            <summary>
+            Construct a ResultAdapter for a context
+            </summary>
+            <param name="context">The context holding the result</param>
+        </member>
+        <member name="P:NUnit.Framework.TestContext.ResultAdapter.State">
+            <summary>
+            The TestState of current test. This maps to the ResultState
+            used in nunit.core and is subject to change in the future.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestContext.ResultAdapter.Status">
+            <summary>
+            The TestStatus of current test. This enum will be used
+            in future versions of NUnit and so is to be preferred
+            to the TestState value.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.TestDetails">
+            <summary>
+            Provides details about a test
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.TestDetails.#ctor(System.Object,System.Reflection.MethodInfo,System.String,System.String,System.Boolean)">
+            <summary>
+             Creates an instance of TestDetails
+            </summary>
+            <param name="fixture">The fixture that the test is a member of, if available.</param>
+            <param name="method">The method that implements the test, if available.</param>
+            <param name="fullName">The full name of the test.</param>
+            <param name="type">A string representing the type of test, e.g. "Test Case".</param>
+            <param name="isSuite">Indicates if the test represents a suite of tests.</param>
+        </member>
+        <member name="P:NUnit.Framework.TestDetails.Fixture">
+            <summary>
+             The fixture that the test is a member of, if available.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestDetails.Method">
+            <summary>
+            The method that implements the test, if available.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestDetails.FullName">
+            <summary>
+            The full name of the test.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestDetails.Type">
+            <summary>
+            A string representing the type of test, e.g. "Test Case".
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestDetails.IsSuite">
+            <summary>
+            Indicates if the test represents a suite of tests.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.TestState">
+            <summary>
+            The ResultState enum indicates the result of running a test
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.TestState.Inconclusive">
+            <summary>
+            The result is inconclusive
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.TestState.NotRunnable">
+            <summary>
+            The test was not runnable.
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.TestState.Skipped">
+            <summary>
+            The test has been skipped. 
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.TestState.Ignored">
+            <summary>
+            The test has been ignored.
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.TestState.Success">
+            <summary>
+            The test succeeded
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.TestState.Failure">
+            <summary>
+            The test failed
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.TestState.Error">
+            <summary>
+            The test encountered an unexpected exception
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.TestState.Cancelled">
+            <summary>
+            The test was cancelled by the user
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.TestStatus">
+            <summary>
+            The TestStatus enum indicates the result of running a test
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.TestStatus.Inconclusive">
+            <summary>
+            The test was inconclusive
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.TestStatus.Skipped">
+            <summary>
+            The test has skipped 
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.TestStatus.Passed">
+            <summary>
+            The test succeeded
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.TestStatus.Failed">
+            <summary>
+            The test failed
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Text">
+            <summary>
+            Helper class with static methods used to supply constraints
+            that operate on strings.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Text.Contains(System.String)">
+            <summary>
+            Returns a constraint that succeeds if the actual
+            value contains the substring supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Text.DoesNotContain(System.String)">
+            <summary>
+            Returns a constraint that fails if the actual
+            value contains the substring supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Text.StartsWith(System.String)">
+            <summary>
+            Returns a constraint that succeeds if the actual
+            value starts with the substring supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Text.DoesNotStartWith(System.String)">
+            <summary>
+            Returns a constraint that fails if the actual
+            value starts with the substring supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Text.EndsWith(System.String)">
+            <summary>
+            Returns a constraint that succeeds if the actual
+            value ends with the substring supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Text.DoesNotEndWith(System.String)">
+            <summary>
+            Returns a constraint that fails if the actual
+            value ends with the substring supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Text.Matches(System.String)">
+            <summary>
+            Returns a constraint that succeeds if the actual
+            value matches the Regex pattern supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Text.DoesNotMatch(System.String)">
+            <summary>
+            Returns a constraint that fails if the actual
+            value matches the pattern supplied as an argument.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Text.All">
+            <summary>
+            Returns a ConstraintExpression, which will apply
+            the following constraint to all members of a collection,
+            succeeding if all of them succeed.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.TextMessageWriter">
+            <summary>
+            TextMessageWriter writes constraint descriptions and messages
+            in displayable form as a text stream. It tailors the display
+            of individual message components to form the standard message
+            format of NUnit assertion failure messages.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.MessageWriter">
+            <summary>
+            MessageWriter is the abstract base for classes that write
+            constraint descriptions and messages in some form. The
+            class has separate methods for writing various components
+            of a message, allowing implementations to tailor the
+            presentation as needed.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.MessageWriter.#ctor">
+            <summary>
+            Construct a MessageWriter given a culture
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.MessageWriter.WriteMessageLine(System.String,System.Object[])">
+            <summary>
+            Method to write single line  message with optional args, usually
+            written to precede the general failure message.
+            </summary>
+            <param name="message">The message to be written</param>
+            <param name="args">Any arguments used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.MessageWriter.WriteMessageLine(System.Int32,System.String,System.Object[])">
+            <summary>
+            Method to write single line  message with optional args, usually
+            written to precede the general failure message, at a givel 
+            indentation level.
+            </summary>
+            <param name="level">The indentation level of the message</param>
+            <param name="message">The message to be written</param>
+            <param name="args">Any arguments used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.MessageWriter.DisplayDifferences(NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            Display Expected and Actual lines for a constraint. This
+            is called by MessageWriter's default implementation of 
+            WriteMessageTo and provides the generic two-line display. 
+            </summary>
+            <param name="constraint">The constraint that failed</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.MessageWriter.DisplayDifferences(System.Object,System.Object)">
+            <summary>
+            Display Expected and Actual lines for given values. This
+            method may be called by constraints that need more control over
+            the display of actual and expected values than is provided
+            by the default implementation.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value causing the failure</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.MessageWriter.DisplayDifferences(System.Object,System.Object,NUnit.Framework.Constraints.Tolerance)">
+            <summary>
+            Display Expected and Actual lines for given values, including
+            a tolerance value on the Expected line.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value causing the failure</param>
+            <param name="tolerance">The tolerance within which the test was made</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.MessageWriter.DisplayStringDifferences(System.String,System.String,System.Int32,System.Boolean,System.Boolean)">
+            <summary>
+            Display the expected and actual string values on separate lines.
+            If the mismatch parameter is >=0, an additional line is displayed
+            line containing a caret that points to the mismatch point.
+            </summary>
+            <param name="expected">The expected string value</param>
+            <param name="actual">The actual string value</param>
+            <param name="mismatch">The point at which the strings don't match or -1</param>
+            <param name="ignoreCase">If true, case is ignored in locating the point where the strings differ</param>
+            <param name="clipping">If true, the strings should be clipped to fit the line</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.MessageWriter.WriteConnector(System.String)">
+            <summary>
+            Writes the text for a connector.
+            </summary>
+            <param name="connector">The connector.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.MessageWriter.WritePredicate(System.String)">
+            <summary>
+            Writes the text for a predicate.
+            </summary>
+            <param name="predicate">The predicate.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.MessageWriter.WriteExpectedValue(System.Object)">
+            <summary>
+            Writes the text for an expected value.
+            </summary>
+            <param name="expected">The expected value.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.MessageWriter.WriteModifier(System.String)">
+            <summary>
+            Writes the text for a modifier
+            </summary>
+            <param name="modifier">The modifier.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.MessageWriter.WriteActualValue(System.Object)">
+            <summary>
+            Writes the text for an actual value.
+            </summary>
+            <param name="actual">The actual value.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.MessageWriter.WriteValue(System.Object)">
+            <summary>
+            Writes the text for a generalized value.
+            </summary>
+            <param name="val">The value.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.MessageWriter.WriteCollectionElements(System.Collections.IEnumerable,System.Int32,System.Int32)">
+            <summary>
+            Writes the text for a collection value,
+            starting at a particular point, to a max length
+            </summary>
+            <param name="collection">The collection containing elements to write.</param>
+            <param name="start">The starting point of the elements to write</param>
+            <param name="max">The maximum number of elements to write</param>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.MessageWriter.MaxLineLength">
+            <summary>
+            Abstract method to get the max line length
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.TextMessageWriter.Pfx_Expected">
+            <summary>
+            Prefix used for the expected value line of a message
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.TextMessageWriter.Pfx_Actual">
+            <summary>
+            Prefix used for the actual value line of a message
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.TextMessageWriter.PrefixLength">
+            <summary>
+            Length of a message prefix
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.TextMessageWriter.#ctor">
+            <summary>
+            Construct a TextMessageWriter
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.TextMessageWriter.#ctor(System.String,System.Object[])">
+            <summary>
+            Construct a TextMessageWriter, specifying a user message
+            and optional formatting arguments.
+            </summary>
+            <param name="userMessage"></param>
+            <param name="args"></param>
+        </member>
+        <member name="M:NUnit.Framework.TextMessageWriter.WriteMessageLine(System.Int32,System.String,System.Object[])">
+            <summary>
+            Method to write single line  message with optional args, usually
+            written to precede the general failure message, at a givel 
+            indentation level.
+            </summary>
+            <param name="level">The indentation level of the message</param>
+            <param name="message">The message to be written</param>
+            <param name="args">Any arguments used in formatting the message</param>
+        </member>
+        <member name="M:NUnit.Framework.TextMessageWriter.DisplayDifferences(NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            Display Expected and Actual lines for a constraint. This
+            is called by MessageWriter's default implementation of 
+            WriteMessageTo and provides the generic two-line display. 
+            </summary>
+            <param name="constraint">The constraint that failed</param>
+        </member>
+        <member name="M:NUnit.Framework.TextMessageWriter.DisplayDifferences(System.Object,System.Object)">
+            <summary>
+            Display Expected and Actual lines for given values. This
+            method may be called by constraints that need more control over
+            the display of actual and expected values than is provided
+            by the default implementation.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value causing the failure</param>
+        </member>
+        <member name="M:NUnit.Framework.TextMessageWriter.DisplayDifferences(System.Object,System.Object,NUnit.Framework.Constraints.Tolerance)">
+            <summary>
+            Display Expected and Actual lines for given values, including
+            a tolerance value on the expected line.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value causing the failure</param>
+            <param name="tolerance">The tolerance within which the test was made</param>
+        </member>
+        <member name="M:NUnit.Framework.TextMessageWriter.DisplayStringDifferences(System.String,System.String,System.Int32,System.Boolean,System.Boolean)">
+            <summary>
+            Display the expected and actual string values on separate lines.
+            If the mismatch parameter is >=0, an additional line is displayed
+            line containing a caret that points to the mismatch point.
+            </summary>
+            <param name="expected">The expected string value</param>
+            <param name="actual">The actual string value</param>
+            <param name="mismatch">The point at which the strings don't match or -1</param>
+            <param name="ignoreCase">If true, case is ignored in string comparisons</param>
+            <param name="clipping">If true, clip the strings to fit the max line length</param>
+        </member>
+        <member name="M:NUnit.Framework.TextMessageWriter.WriteConnector(System.String)">
+            <summary>
+            Writes the text for a connector.
+            </summary>
+            <param name="connector">The connector.</param>
+        </member>
+        <member name="M:NUnit.Framework.TextMessageWriter.WritePredicate(System.String)">
+            <summary>
+            Writes the text for a predicate.
+            </summary>
+            <param name="predicate">The predicate.</param>
+        </member>
+        <member name="M:NUnit.Framework.TextMessageWriter.WriteModifier(System.String)">
+            <summary>
+            Write the text for a modifier.
+            </summary>
+            <param name="modifier">The modifier.</param>
+        </member>
+        <member name="M:NUnit.Framework.TextMessageWriter.WriteExpectedValue(System.Object)">
+            <summary>
+            Writes the text for an expected value.
+            </summary>
+            <param name="expected">The expected value.</param>
+        </member>
+        <member name="M:NUnit.Framework.TextMessageWriter.WriteActualValue(System.Object)">
+            <summary>
+            Writes the text for an actual value.
+            </summary>
+            <param name="actual">The actual value.</param>
+        </member>
+        <member name="M:NUnit.Framework.TextMessageWriter.WriteValue(System.Object)">
+            <summary>
+            Writes the text for a generalized value.
+            </summary>
+            <param name="val">The value.</param>
+        </member>
+        <member name="M:NUnit.Framework.TextMessageWriter.WriteCollectionElements(System.Collections.IEnumerable,System.Int32,System.Int32)">
+            <summary>
+            Writes the text for a collection value,
+            starting at a particular point, to a max length
+            </summary>
+            <param name="collection">The collection containing elements to write.</param>
+            <param name="start">The starting point of the elements to write</param>
+            <param name="max">The maximum number of elements to write</param>
+        </member>
+        <member name="M:NUnit.Framework.TextMessageWriter.WriteExpectedLine(NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            Write the generic 'Expected' line for a constraint
+            </summary>
+            <param name="constraint">The constraint that failed</param>
+        </member>
+        <member name="M:NUnit.Framework.TextMessageWriter.WriteExpectedLine(System.Object)">
+            <summary>
+            Write the generic 'Expected' line for a given value
+            </summary>
+            <param name="expected">The expected value</param>
+        </member>
+        <member name="M:NUnit.Framework.TextMessageWriter.WriteExpectedLine(System.Object,NUnit.Framework.Constraints.Tolerance)">
+            <summary>
+            Write the generic 'Expected' line for a given value
+            and tolerance.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="tolerance">The tolerance within which the test was made</param>
+        </member>
+        <member name="M:NUnit.Framework.TextMessageWriter.WriteActualLine(NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            Write the generic 'Actual' line for a constraint
+            </summary>
+            <param name="constraint">The constraint for which the actual value is to be written</param>
+        </member>
+        <member name="M:NUnit.Framework.TextMessageWriter.WriteActualLine(System.Object)">
+            <summary>
+            Write the generic 'Actual' line for a given value
+            </summary>
+            <param name="actual">The actual value causing a failure</param>
+        </member>
+        <member name="P:NUnit.Framework.TextMessageWriter.MaxLineLength">
+            <summary>
+            Gets or sets the maximum line length for this writer
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Throws">
+            <summary>
+            Helper class with properties and methods that supply
+            constraints that operate on exceptions.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Throws.TypeOf(System.Type)">
+            <summary>
+            Creates a constraint specifying the exact type of exception expected
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Throws.TypeOf``1">
+            <summary>
+            Creates a constraint specifying the exact type of exception expected
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Throws.InstanceOf(System.Type)">
+            <summary>
+            Creates a constraint specifying the type of exception expected
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Throws.InstanceOf``1">
+            <summary>
+            Creates a constraint specifying the type of exception expected
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Throws.Exception">
+            <summary>
+            Creates a constraint specifying an expected exception
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Throws.InnerException">
+            <summary>
+            Creates a constraint specifying an exception with a given InnerException
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Throws.TargetInvocationException">
+            <summary>
+            Creates a constraint specifying an expected TargetInvocationException
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Throws.ArgumentException">
+            <summary>
+            Creates a constraint specifying an expected TargetInvocationException
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Throws.InvalidOperationException">
+            <summary>
+            Creates a constraint specifying an expected TargetInvocationException
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Throws.Nothing">
+            <summary>
+            Creates a constraint specifying that no exception is thrown
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.CategoryAttribute">
+            <summary>
+            Attribute used to apply a category to a test
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.CategoryAttribute.categoryName">
+            <summary>
+            The name of the category
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.CategoryAttribute.#ctor(System.String)">
+            <summary>
+            Construct attribute for a given category based on
+            a name. The name may not contain the characters ',',
+            '+', '-' or '!'. However, this is not checked in the
+            constructor since it would cause an error to arise at
+            as the test was loaded without giving a clear indication
+            of where the problem is located. The error is handled
+            in NUnitFramework.cs by marking the test as not
+            runnable.
+            </summary>
+            <param name="name">The name of the category</param>
+        </member>
+        <member name="M:NUnit.Framework.CategoryAttribute.#ctor">
+            <summary>
+            Protected constructor uses the Type name as the name
+            of the category.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.CategoryAttribute.Name">
+            <summary>
+            The name of the category
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.DatapointAttribute">
+            <summary>
+            Used to mark a field for use as a datapoint when executing a theory
+            within the same fixture that requires an argument of the field's Type.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.DatapointsAttribute">
+            <summary>
+            Used to mark an array as containing a set of datapoints to be used
+            executing a theory within the same fixture that requires an argument 
+            of the Type of the array elements.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.DescriptionAttribute">
+            <summary>
+            Attribute used to provide descriptive text about a 
+            test case or fixture.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.DescriptionAttribute.#ctor(System.String)">
+            <summary>
+            Construct the attribute
+            </summary>
+            <param name="description">Text describing the test</param>
+        </member>
+        <member name="P:NUnit.Framework.DescriptionAttribute.Description">
+            <summary>
+            Gets the test description
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.MessageMatch">
+            <summary>
+            Enumeration indicating how the expected message parameter is to be used
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.MessageMatch.Exact">
+            Expect an exact match
+        </member>
+        <member name="F:NUnit.Framework.MessageMatch.Contains">
+            Expect a message containing the parameter string
+        </member>
+        <member name="F:NUnit.Framework.MessageMatch.Regex">
+            Match the regular expression provided as a parameter
+        </member>
+        <member name="F:NUnit.Framework.MessageMatch.StartsWith">
+            Expect a message that starts with the parameter string
+        </member>
+        <member name="T:NUnit.Framework.ExpectedExceptionAttribute">
+            <summary>
+            ExpectedExceptionAttribute
+            </summary>
+            
+        </member>
+        <member name="M:NUnit.Framework.ExpectedExceptionAttribute.#ctor">
+            <summary>
+            Constructor for a non-specific exception
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.ExpectedExceptionAttribute.#ctor(System.Type)">
+            <summary>
+            Constructor for a given type of exception
+            </summary>
+            <param name="exceptionType">The type of the expected exception</param>
+        </member>
+        <member name="M:NUnit.Framework.ExpectedExceptionAttribute.#ctor(System.String)">
+            <summary>
+            Constructor for a given exception name
+            </summary>
+            <param name="exceptionName">The full name of the expected exception</param>
+        </member>
+        <member name="P:NUnit.Framework.ExpectedExceptionAttribute.ExpectedException">
+            <summary>
+            Gets or sets the expected exception type
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.ExpectedExceptionAttribute.ExpectedExceptionName">
+            <summary>
+            Gets or sets the full Type name of the expected exception
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.ExpectedExceptionAttribute.ExpectedMessage">
+            <summary>
+            Gets or sets the expected message text
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.ExpectedExceptionAttribute.UserMessage">
+            <summary>
+            Gets or sets the user message displayed in case of failure
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.ExpectedExceptionAttribute.MatchType">
+            <summary>
+             Gets or sets the type of match to be performed on the expected message
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.ExpectedExceptionAttribute.Handler">
+            <summary>
+             Gets the name of a method to be used as an exception handler
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.ExplicitAttribute">
+            <summary>
+            ExplicitAttribute marks a test or test fixture so that it will
+            only be run if explicitly executed from the gui or command line
+            or if it is included by use of a filter. The test will not be
+            run simply because an enclosing suite is run.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.ExplicitAttribute.#ctor">
+            <summary>
+            Default constructor
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.ExplicitAttribute.#ctor(System.String)">
+            <summary>
+            Constructor with a reason
+            </summary>
+            <param name="reason">The reason test is marked explicit</param>
+        </member>
+        <member name="P:NUnit.Framework.ExplicitAttribute.Reason">
+            <summary>
+            The reason test is marked explicit
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.IgnoreAttribute">
+            <summary>
+            Attribute used to mark a test that is to be ignored.
+            Ignored tests result in a warning message when the
+            tests are run.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.IgnoreAttribute.#ctor">
+            <summary>
+            Constructs the attribute without giving a reason 
+            for ignoring the test.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.IgnoreAttribute.#ctor(System.String)">
+            <summary>
+            Constructs the attribute giving a reason for ignoring the test
+            </summary>
+            <param name="reason">The reason for ignoring the test</param>
+        </member>
+        <member name="P:NUnit.Framework.IgnoreAttribute.Reason">
+            <summary>
+            The reason for ignoring a test
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.IncludeExcludeAttribute">
+            <summary>
+            Abstract base for Attributes that are used to include tests
+            in the test run based on environmental settings.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.IncludeExcludeAttribute.#ctor">
+            <summary>
+            Constructor with no included items specified, for use
+            with named property syntax.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.IncludeExcludeAttribute.#ctor(System.String)">
+            <summary>
+            Constructor taking one or more included items
+            </summary>
+            <param name="include">Comma-delimited list of included items</param>
+        </member>
+        <member name="P:NUnit.Framework.IncludeExcludeAttribute.Include">
+            <summary>
+            Name of the item that is needed in order for
+            a test to run. Multiple itemss may be given,
+            separated by a comma.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.IncludeExcludeAttribute.Exclude">
+            <summary>
+            Name of the item to be excluded. Multiple items
+            may be given, separated by a comma.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.IncludeExcludeAttribute.Reason">
+            <summary>
+            The reason for including or excluding the test
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.PlatformAttribute">
+            <summary>
+            PlatformAttribute is used to mark a test fixture or an
+            individual method as applying to a particular platform only.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.PlatformAttribute.#ctor">
+            <summary>
+            Constructor with no platforms specified, for use
+            with named property syntax.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.PlatformAttribute.#ctor(System.String)">
+            <summary>
+            Constructor taking one or more platforms
+            </summary>
+            <param name="platforms">Comma-deliminted list of platforms</param>
+        </member>
+        <member name="T:NUnit.Framework.CultureAttribute">
+            <summary>
+            CultureAttribute is used to mark a test fixture or an
+            individual method as applying to a particular Culture only.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.CultureAttribute.#ctor">
+            <summary>
+            Constructor with no cultures specified, for use
+            with named property syntax.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.CultureAttribute.#ctor(System.String)">
+            <summary>
+            Constructor taking one or more cultures
+            </summary>
+            <param name="cultures">Comma-deliminted list of cultures</param>
+        </member>
+        <member name="T:NUnit.Framework.CombinatorialAttribute">
+            <summary>
+            Marks a test to use a combinatorial join of any argument data 
+            provided. NUnit will create a test case for every combination of 
+            the arguments provided. This can result in a large number of test
+            cases and so should be used judiciously. This is the default join
+            type, so the attribute need not be used except as documentation.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.PropertyAttribute">
+            <summary>
+            PropertyAttribute is used to attach information to a test as a name/value pair..
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.PropertyAttribute.#ctor(System.String,System.String)">
+            <summary>
+            Construct a PropertyAttribute with a name and string value
+            </summary>
+            <param name="propertyName">The name of the property</param>
+            <param name="propertyValue">The property value</param>
+        </member>
+        <member name="M:NUnit.Framework.PropertyAttribute.#ctor(System.String,System.Int32)">
+            <summary>
+            Construct a PropertyAttribute with a name and int value
+            </summary>
+            <param name="propertyName">The name of the property</param>
+            <param name="propertyValue">The property value</param>
+        </member>
+        <member name="M:NUnit.Framework.PropertyAttribute.#ctor(System.String,System.Double)">
+            <summary>
+            Construct a PropertyAttribute with a name and double value
+            </summary>
+            <param name="propertyName">The name of the property</param>
+            <param name="propertyValue">The property value</param>
+        </member>
+        <member name="M:NUnit.Framework.PropertyAttribute.#ctor">
+            <summary>
+            Constructor for derived classes that set the
+            property dictionary directly.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.PropertyAttribute.#ctor(System.Object)">
+            <summary>
+            Constructor for use by derived classes that use the
+            name of the type as the property name. Derived classes
+            must ensure that the Type of the property value is
+            a standard type supported by the BCL. Any custom
+            types will cause a serialization Exception when
+            in the client.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.PropertyAttribute.Properties">
+            <summary>
+            Gets the property dictionary for this attribute
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.CombinatorialAttribute.#ctor">
+            <summary>
+            Default constructor
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.PairwiseAttribute">
+            <summary>
+            Marks a test to use pairwise join of any argument data provided. 
+            NUnit will attempt too excercise every pair of argument values at 
+            least once, using as small a number of test cases as it can. With
+            only two arguments, this is the same as a combinatorial join.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.PairwiseAttribute.#ctor">
+            <summary>
+            Default constructor
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.SequentialAttribute">
+            <summary>
+            Marks a test to use a sequential join of any argument data
+            provided. NUnit will use arguements for each parameter in
+            sequence, generating test cases up to the largest number
+            of argument values provided and using null for any arguments
+            for which it runs out of values. Normally, this should be
+            used with the same number of arguments for each parameter.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.SequentialAttribute.#ctor">
+            <summary>
+            Default constructor
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.MaxTimeAttribute">
+            <summary>
+            Summary description for MaxTimeAttribute.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.MaxTimeAttribute.#ctor(System.Int32)">
+            <summary>
+            Construct a MaxTimeAttribute, given a time in milliseconds.
+            </summary>
+            <param name="milliseconds">The maximum elapsed time in milliseconds</param>
+        </member>
+        <member name="T:NUnit.Framework.RandomAttribute">
+            <summary>
+            RandomAttribute is used to supply a set of random values
+            to a single parameter of a parameterized test.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.ValuesAttribute">
+            <summary>
+            ValuesAttribute is used to provide literal arguments for
+            an individual parameter of a test.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.ParameterDataAttribute">
+            <summary>
+            Abstract base class for attributes that apply to parameters 
+            and supply data for the parameter.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.ParameterDataAttribute.GetData(System.Reflection.ParameterInfo)">
+            <summary>
+            Gets the data to be provided to the specified parameter
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.ValuesAttribute.data">
+            <summary>
+            The collection of data to be returned. Must
+            be set by any derived attribute classes.
+            We use an object[] so that the individual
+            elements may have their type changed in GetData
+            if necessary.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.ValuesAttribute.#ctor(System.Object)">
+            <summary>
+            Construct with one argument
+            </summary>
+            <param name="arg1"></param>
+        </member>
+        <member name="M:NUnit.Framework.ValuesAttribute.#ctor(System.Object,System.Object)">
+            <summary>
+            Construct with two arguments
+            </summary>
+            <param name="arg1"></param>
+            <param name="arg2"></param>
+        </member>
+        <member name="M:NUnit.Framework.ValuesAttribute.#ctor(System.Object,System.Object,System.Object)">
+            <summary>
+            Construct with three arguments
+            </summary>
+            <param name="arg1"></param>
+            <param name="arg2"></param>
+            <param name="arg3"></param>
+        </member>
+        <member name="M:NUnit.Framework.ValuesAttribute.#ctor(System.Object[])">
+            <summary>
+            Construct with an array of arguments
+            </summary>
+            <param name="args"></param>
+        </member>
+        <member name="M:NUnit.Framework.ValuesAttribute.GetData(System.Reflection.ParameterInfo)">
+            <summary>
+            Get the collection of values to be used as arguments
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.RandomAttribute.#ctor(System.Int32)">
+            <summary>
+            Construct a set of doubles from 0.0 to 1.0,
+            specifying only the count.
+            </summary>
+            <param name="count"></param>
+        </member>
+        <member name="M:NUnit.Framework.RandomAttribute.#ctor(System.Double,System.Double,System.Int32)">
+            <summary>
+            Construct a set of doubles from min to max
+            </summary>
+            <param name="min"></param>
+            <param name="max"></param>
+            <param name="count"></param>
+        </member>
+        <member name="M:NUnit.Framework.RandomAttribute.#ctor(System.Int32,System.Int32,System.Int32)">
+            <summary>
+            Construct a set of ints from min to max
+            </summary>
+            <param name="min"></param>
+            <param name="max"></param>
+            <param name="count"></param>
+        </member>
+        <member name="M:NUnit.Framework.RandomAttribute.GetData(System.Reflection.ParameterInfo)">
+            <summary>
+            Get the collection of values to be used as arguments
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.RangeAttribute">
+            <summary>
+            RangeAttribute is used to supply a range of values to an
+            individual parameter of a parameterized test.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.RangeAttribute.#ctor(System.Int32,System.Int32)">
+            <summary>
+            Construct a range of ints using default step of 1
+            </summary>
+            <param name="from"></param>
+            <param name="to"></param>
+        </member>
+        <member name="M:NUnit.Framework.RangeAttribute.#ctor(System.Int32,System.Int32,System.Int32)">
+            <summary>
+            Construct a range of ints specifying the step size 
+            </summary>
+            <param name="from"></param>
+            <param name="to"></param>
+            <param name="step"></param>
+        </member>
+        <member name="M:NUnit.Framework.RangeAttribute.#ctor(System.Int64,System.Int64,System.Int64)">
+            <summary>
+            Construct a range of longs
+            </summary>
+            <param name="from"></param>
+            <param name="to"></param>
+            <param name="step"></param>
+        </member>
+        <member name="M:NUnit.Framework.RangeAttribute.#ctor(System.Double,System.Double,System.Double)">
+            <summary>
+            Construct a range of doubles
+            </summary>
+            <param name="from"></param>
+            <param name="to"></param>
+            <param name="step"></param>
+        </member>
+        <member name="M:NUnit.Framework.RangeAttribute.#ctor(System.Single,System.Single,System.Single)">
+            <summary>
+            Construct a range of floats
+            </summary>
+            <param name="from"></param>
+            <param name="to"></param>
+            <param name="step"></param>
+        </member>
+        <member name="T:NUnit.Framework.RepeatAttribute">
+            <summary>
+            RepeatAttribute may be applied to test case in order
+            to run it multiple times.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.RepeatAttribute.#ctor(System.Int32)">
+            <summary>
+            Construct a RepeatAttribute
+            </summary>
+            <param name="count">The number of times to run the test</param>
+        </member>
+        <member name="T:NUnit.Framework.RequiredAddinAttribute">
+            <summary>
+            RequiredAddinAttribute may be used to indicate the names of any addins
+            that must be present in order to run some or all of the tests in an
+            assembly. If the addin is not loaded, the entire assembly is marked
+            as NotRunnable.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.RequiredAddinAttribute.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:RequiredAddinAttribute"/> class.
+            </summary>
+            <param name="requiredAddin">The required addin.</param>
+        </member>
+        <member name="P:NUnit.Framework.RequiredAddinAttribute.RequiredAddin">
+            <summary>
+            Gets the name of required addin.
+            </summary>
+            <value>The required addin name.</value>
+        </member>
+        <member name="T:NUnit.Framework.SetCultureAttribute">
+            <summary>
+            Summary description for SetCultureAttribute.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.SetCultureAttribute.#ctor(System.String)">
+            <summary>
+            Construct given the name of a culture
+            </summary>
+            <param name="culture"></param>
+        </member>
+        <member name="T:NUnit.Framework.SetUICultureAttribute">
+            <summary>
+            Summary description for SetUICultureAttribute.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.SetUICultureAttribute.#ctor(System.String)">
+            <summary>
+            Construct given the name of a culture
+            </summary>
+            <param name="culture"></param>
+        </member>
+        <member name="T:NUnit.Framework.SetUpAttribute">
+            <summary>
+            SetUpAttribute is used in a TestFixture to identify a method
+            that is called immediately before each test is run. It is 
+            also used in a SetUpFixture to identify the method that is
+            called once, before any of the subordinate tests are run.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.SetUpFixtureAttribute">
+            <summary>
+            Attribute used to mark a class that contains one-time SetUp 
+            and/or TearDown methods that apply to all the tests in a
+            namespace or an assembly.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.SuiteAttribute">
+            <summary>
+            Attribute used to mark a static (shared in VB) property
+            that returns a list of tests.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.TearDownAttribute">
+            <summary>
+            Attribute used in a TestFixture to identify a method that is 
+            called immediately after each test is run. It is also used
+            in a SetUpFixture to identify the method that is called once,
+            after all subordinate tests have run. In either case, the method 
+            is guaranteed to be called, even if an exception is thrown.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.TestActionAttribute">
+            <summary>
+            Provide actions to execute before and after tests.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.ITestAction">
+            <summary>
+            When implemented by an attribute, this interface implemented to provide actions to execute before and after tests.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.ITestAction.BeforeTest(NUnit.Framework.TestDetails)">
+            <summary>
+            Executed before each test is run
+            </summary>
+            <param name="testDetails">Provides details about the test that is going to be run.</param>
+        </member>
+        <member name="M:NUnit.Framework.ITestAction.AfterTest(NUnit.Framework.TestDetails)">
+            <summary>
+            Executed after each test is run
+            </summary>
+            <param name="testDetails">Provides details about the test that has just been run.</param>
+        </member>
+        <member name="P:NUnit.Framework.ITestAction.Targets">
+            <summary>
+            Provides the target for the action attribute
+            </summary>
+            <returns>The target for the action attribute</returns>
+        </member>
+        <member name="M:NUnit.Framework.TestActionAttribute.BeforeTest(NUnit.Framework.TestDetails)">
+            <summary>
+            Method called before each test
+            </summary>
+            <param name="testDetails">Info about the test to be run</param>
+        </member>
+        <member name="M:NUnit.Framework.TestActionAttribute.AfterTest(NUnit.Framework.TestDetails)">
+            <summary>
+            Method called after each test
+            </summary>
+            <param name="testDetails">Info about the test that was just run</param>
+        </member>
+        <member name="P:NUnit.Framework.TestActionAttribute.Targets">
+            <summary>
+            Gets or sets the ActionTargets for this attribute
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.TestAttribute">
+            <summary>
+            Adding this attribute to a method within a <seealso cref="T:NUnit.Framework.TestFixtureAttribute"/> 
+            class makes the method callable from the NUnit test runner. There is a property 
+            called Description which is optional which you can provide a more detailed test
+            description. This class cannot be inherited.
+            </summary>
+            
+            <example>
+            [TestFixture]
+            public class Fixture
+            {
+              [Test]
+              public void MethodToTest()
+              {}
+              
+              [Test(Description = "more detailed description")]
+              publc void TestDescriptionMethod()
+              {}
+            }
+            </example>
+            
+        </member>
+        <member name="P:NUnit.Framework.TestAttribute.Description">
+            <summary>
+            Descriptive text for this test
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.TestCaseAttribute">
+            <summary>
+            TestCaseAttribute is used to mark parameterized test cases
+            and provide them with their arguments.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.TestCaseAttribute.#ctor(System.Object[])">
+            <summary>
+            Construct a TestCaseAttribute with a list of arguments.
+            This constructor is not CLS-Compliant
+            </summary>
+            <param name="arguments"></param>
+        </member>
+        <member name="M:NUnit.Framework.TestCaseAttribute.#ctor(System.Object)">
+            <summary>
+            Construct a TestCaseAttribute with a single argument
+            </summary>
+            <param name="arg"></param>
+        </member>
+        <member name="M:NUnit.Framework.TestCaseAttribute.#ctor(System.Object,System.Object)">
+            <summary>
+            Construct a TestCaseAttribute with a two arguments
+            </summary>
+            <param name="arg1"></param>
+            <param name="arg2"></param>
+        </member>
+        <member name="M:NUnit.Framework.TestCaseAttribute.#ctor(System.Object,System.Object,System.Object)">
+            <summary>
+            Construct a TestCaseAttribute with a three arguments
+            </summary>
+            <param name="arg1"></param>
+            <param name="arg2"></param>
+            <param name="arg3"></param>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseAttribute.Arguments">
+            <summary>
+            Gets the list of arguments to a test case
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseAttribute.Result">
+            <summary>
+            Gets or sets the expected result. Use
+            ExpectedResult by preference.
+            </summary>
+            <value>The result.</value>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseAttribute.ExpectedResult">
+            <summary>
+            Gets or sets the expected result.
+            </summary>
+            <value>The result.</value>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseAttribute.HasExpectedResult">
+            <summary>
+            Gets a flag indicating whether an expected
+            result has been set.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseAttribute.Categories">
+            <summary>
+            Gets a list of categories associated with this test;
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseAttribute.Category">
+            <summary>
+            Gets or sets the category associated with this test.
+            May be a single category or a comma-separated list.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseAttribute.ExpectedException">
+            <summary>
+            Gets or sets the expected exception.
+            </summary>
+            <value>The expected exception.</value>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseAttribute.ExpectedExceptionName">
+            <summary>
+            Gets or sets the name the expected exception.
+            </summary>
+            <value>The expected name of the exception.</value>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseAttribute.ExpectedMessage">
+            <summary>
+            Gets or sets the expected message of the expected exception
+            </summary>
+            <value>The expected message of the exception.</value>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseAttribute.MatchType">
+            <summary>
+             Gets or sets the type of match to be performed on the expected message
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseAttribute.Description">
+            <summary>
+            Gets or sets the description.
+            </summary>
+            <value>The description.</value>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseAttribute.TestName">
+            <summary>
+            Gets or sets the name of the test.
+            </summary>
+            <value>The name of the test.</value>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseAttribute.Ignore">
+            <summary>
+            Gets or sets the ignored status of the test
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseAttribute.Ignored">
+            <summary>
+            Gets or sets the ignored status of the test
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseAttribute.Explicit">
+            <summary>
+            Gets or sets the explicit status of the test
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseAttribute.Reason">
+            <summary>
+            Gets or sets the reason for not running the test
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseAttribute.IgnoreReason">
+            <summary>
+            Gets or sets the reason for not running the test.
+            Set has the side effect of marking the test as ignored.
+            </summary>
+            <value>The ignore reason.</value>
+        </member>
+        <member name="T:NUnit.Framework.TestCaseSourceAttribute">
+            <summary>
+            FactoryAttribute indicates the source to be used to
+            provide test cases for a test method.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.TestCaseSourceAttribute.#ctor(System.String)">
+            <summary>
+            Construct with the name of the data source, which must
+            be a property, field or method of the test class itself.
+            </summary>
+            <param name="sourceName">An array of the names of the factories that will provide data</param>
+        </member>
+        <member name="M:NUnit.Framework.TestCaseSourceAttribute.#ctor(System.Type)">
+            <summary>
+            Construct with a Type, which must implement IEnumerable
+            </summary>
+            <param name="sourceType">The Type that will provide data</param>
+        </member>
+        <member name="M:NUnit.Framework.TestCaseSourceAttribute.#ctor(System.Type,System.String)">
+            <summary>
+            Construct with a Type and name.
+            that don't support params arrays.
+            </summary>
+            <param name="sourceType">The Type that will provide data</param>
+            <param name="sourceName">The name of the method, property or field that will provide data</param>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseSourceAttribute.SourceName">
+            <summary>
+            The name of a the method, property or fiend to be used as a source
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseSourceAttribute.SourceType">
+            <summary>
+            A Type to be used as a source
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestCaseSourceAttribute.Category">
+            <summary>
+            Gets or sets the category associated with this test.
+            May be a single category or a comma-separated list.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.TestFixtureAttribute">
+            <example>
+            [TestFixture]
+            public class ExampleClass 
+            {}
+            </example>
+        </member>
+        <member name="M:NUnit.Framework.TestFixtureAttribute.#ctor">
+            <summary>
+            Default constructor
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.TestFixtureAttribute.#ctor(System.Object[])">
+            <summary>
+            Construct with a object[] representing a set of arguments. 
+            In .NET 2.0, the arguments may later be separated into
+            type arguments and constructor arguments.
+            </summary>
+            <param name="arguments"></param>
+        </member>
+        <member name="P:NUnit.Framework.TestFixtureAttribute.Description">
+            <summary>
+            Descriptive text for this fixture
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestFixtureAttribute.Category">
+            <summary>
+            Gets and sets the category for this fixture.
+            May be a comma-separated list of categories.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestFixtureAttribute.Categories">
+            <summary>
+            Gets a list of categories for this fixture
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestFixtureAttribute.Arguments">
+            <summary>
+            The arguments originally provided to the attribute
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.TestFixtureAttribute.Ignore">
+            <summary>
+            Gets or sets a value indicating whether this <see cref="T:NUnit.Framework.TestFixtureAttribute"/> should be ignored.
+            </summary>
+            <value><c>true</c> if ignore; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:NUnit.Framework.TestFixtureAttribute.IgnoreReason">
+            <summary>
+            Gets or sets the ignore reason. May set Ignored as a side effect.
+            </summary>
+            <value>The ignore reason.</value>
+        </member>
+        <member name="P:NUnit.Framework.TestFixtureAttribute.TypeArgs">
+            <summary>
+            Get or set the type arguments. If not set
+            explicitly, any leading arguments that are
+            Types are taken as type arguments.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.TestFixtureSetUpAttribute">
+            <summary>
+            Attribute used to identify a method that is 
+            called before any tests in a fixture are run.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.TestFixtureTearDownAttribute">
+            <summary>
+            Attribute used to identify a method that is called after
+            all the tests in a fixture have run. The method is 
+            guaranteed to be called, even if an exception is thrown.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.TheoryAttribute">
+            <summary>
+            Adding this attribute to a method within a <seealso cref="T:NUnit.Framework.TestFixtureAttribute"/> 
+            class makes the method callable from the NUnit test runner. There is a property 
+            called Description which is optional which you can provide a more detailed test
+            description. This class cannot be inherited.
+            </summary>
+            
+            <example>
+            [TestFixture]
+            public class Fixture
+            {
+              [Test]
+              public void MethodToTest()
+              {}
+              
+              [Test(Description = "more detailed description")]
+              publc void TestDescriptionMethod()
+              {}
+            }
+            </example>
+            
+        </member>
+        <member name="T:NUnit.Framework.TimeoutAttribute">
+            <summary>
+            Used on a method, marks the test with a timeout value in milliseconds. 
+            The test will be run in a separate thread and is cancelled if the timeout 
+            is exceeded. Used on a method or assembly, sets the default timeout 
+            for all contained test methods.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.TimeoutAttribute.#ctor(System.Int32)">
+            <summary>
+            Construct a TimeoutAttribute given a time in milliseconds
+            </summary>
+            <param name="timeout">The timeout value in milliseconds</param>
+        </member>
+        <member name="T:NUnit.Framework.RequiresSTAAttribute">
+            <summary>
+            Marks a test that must run in the STA, causing it
+            to run in a separate thread if necessary.
+            
+            On methods, you may also use STAThreadAttribute
+            to serve the same purpose.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.RequiresSTAAttribute.#ctor">
+            <summary>
+            Construct a RequiresSTAAttribute
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.RequiresMTAAttribute">
+            <summary>
+            Marks a test that must run in the MTA, causing it
+            to run in a separate thread if necessary.
+            
+            On methods, you may also use MTAThreadAttribute
+            to serve the same purpose.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.RequiresMTAAttribute.#ctor">
+            <summary>
+            Construct a RequiresMTAAttribute
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.RequiresThreadAttribute">
+            <summary>
+            Marks a test that must run on a separate thread.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.RequiresThreadAttribute.#ctor">
+            <summary>
+            Construct a RequiresThreadAttribute
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.RequiresThreadAttribute.#ctor(System.Threading.ApartmentState)">
+            <summary>
+            Construct a RequiresThreadAttribute, specifying the apartment
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.ValueSourceAttribute">
+            <summary>
+            ValueSourceAttribute indicates the source to be used to
+            provide data for one parameter of a test method.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.ValueSourceAttribute.#ctor(System.String)">
+            <summary>
+            Construct with the name of the factory - for use with languages
+            that don't support params arrays.
+            </summary>
+            <param name="sourceName">The name of the data source to be used</param>
+        </member>
+        <member name="M:NUnit.Framework.ValueSourceAttribute.#ctor(System.Type,System.String)">
+            <summary>
+            Construct with a Type and name - for use with languages
+            that don't support params arrays.
+            </summary>
+            <param name="sourceType">The Type that will provide data</param>
+            <param name="sourceName">The name of the method, property or field that will provide data</param>
+        </member>
+        <member name="P:NUnit.Framework.ValueSourceAttribute.SourceName">
+            <summary>
+            The name of a the method, property or fiend to be used as a source
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.ValueSourceAttribute.SourceType">
+            <summary>
+            A Type to be used as a source
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.AllItemsConstraint">
+            <summary>
+            AllItemsConstraint applies another constraint to each
+            item in a collection, succeeding if they all succeed.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.PrefixConstraint">
+            <summary>
+            Abstract base class used for prefixes
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.Constraint">
+            <summary>
+            The Constraint class is the base of all built-in constraints
+            within NUnit. It provides the operator overloads used to combine 
+            constraints.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.IResolveConstraint">
+            <summary>
+            The IConstraintExpression interface is implemented by all
+            complete and resolvable constraints and expressions.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.IResolveConstraint.Resolve">
+            <summary>
+            Return the top-level constraint for this expression
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.Constraint.UNSET">
+            <summary>
+            Static UnsetObject used to detect derived constraints
+            failing to set the actual value.
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.Constraint.actual">
+            <summary>
+            The actual value being tested against a constraint
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.Constraint.displayName">
+            <summary>
+            The display name of this Constraint for use by ToString()
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.Constraint.argcnt">
+            <summary>
+            Argument fields used by ToString();
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.Constraint.builder">
+            <summary>
+            The builder holding this constraint
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.Constraint.#ctor">
+            <summary>
+            Construct a constraint with no arguments
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.Constraint.#ctor(System.Object)">
+            <summary>
+            Construct a constraint with one argument
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.Constraint.#ctor(System.Object,System.Object)">
+            <summary>
+            Construct a constraint with two arguments
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.Constraint.SetBuilder(NUnit.Framework.Constraints.ConstraintBuilder)">
+            <summary>
+            Sets the ConstraintBuilder holding this constraint
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.Constraint.WriteMessageTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the failure message to the MessageWriter provided
+            as an argument. The default implementation simply passes
+            the constraint and the actual value to the writer, which
+            then displays the constraint description and the value.
+            
+            Constraints that need to provide additional details,
+            such as where the error occured can override this.
+            </summary>
+            <param name="writer">The MessageWriter on which to display the message</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.Constraint.Matches(System.Object)">
+            <summary>
+            Test whether the constraint is satisfied by a given value
+            </summary>
+            <param name="actual">The value to be tested</param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.Constraint.Matches``1(NUnit.Framework.Constraints.ActualValueDelegate{``0})">
+            <summary>
+            Test whether the constraint is satisfied by an
+            ActualValueDelegate that returns the value to be tested.
+            The default implementation simply evaluates the delegate
+            but derived classes may override it to provide for delayed 
+            processing.
+            </summary>
+            <param name="del">An <see cref="T:NUnit.Framework.Constraints.ActualValueDelegate`1"/></param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.Constraint.Matches``1(``0@)">
+            <summary>
+            Test whether the constraint is satisfied by a given reference.
+            The default implementation simply dereferences the value but
+            derived classes may override it to provide for delayed processing.
+            </summary>
+            <param name="actual">A reference to the value to be tested</param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.Constraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a MessageWriter
+            </summary>
+            <param name="writer">The writer on which the description is displayed</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.Constraint.WriteActualValueTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the actual value for a failing constraint test to a
+            MessageWriter. The default implementation simply writes
+            the raw value of actual, leaving it to the writer to
+            perform any formatting.
+            </summary>
+            <param name="writer">The writer on which the actual value is displayed</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.Constraint.ToString">
+            <summary>
+            Default override of ToString returns the constraint DisplayName
+            followed by any arguments within angle brackets.
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.Constraint.GetStringRepresentation">
+            <summary>
+            Returns the string representation of this constraint
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.Constraint.op_BitwiseAnd(NUnit.Framework.Constraints.Constraint,NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            This operator creates a constraint that is satisfied only if both 
+            argument constraints are satisfied.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.Constraint.op_BitwiseOr(NUnit.Framework.Constraints.Constraint,NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            This operator creates a constraint that is satisfied if either 
+            of the argument constraints is satisfied.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.Constraint.op_LogicalNot(NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            This operator creates a constraint that is satisfied if the 
+            argument constraint is not satisfied.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.Constraint.After(System.Int32)">
+            <summary>
+            Returns a DelayedConstraint with the specified delay time.
+            </summary>
+            <param name="delayInMilliseconds">The delay in milliseconds.</param>
+            <returns></returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.Constraint.After(System.Int32,System.Int32)">
+            <summary>
+            Returns a DelayedConstraint with the specified delay time
+            and polling interval.
+            </summary>
+            <param name="delayInMilliseconds">The delay in milliseconds.</param>
+            <param name="pollingInterval">The interval at which to test the constraint.</param>
+            <returns></returns>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.Constraint.DisplayName">
+            <summary>
+            The display name of this Constraint for use by ToString().
+            The default value is the name of the constraint with
+            trailing "Constraint" removed. Derived classes may set
+            this to another name in their constructors.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.Constraint.And">
+            <summary>
+            Returns a ConstraintExpression by appending And
+            to the current constraint.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.Constraint.With">
+            <summary>
+            Returns a ConstraintExpression by appending And
+            to the current constraint.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.Constraint.Or">
+            <summary>
+            Returns a ConstraintExpression by appending Or
+            to the current constraint.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.Constraint.UnsetObject">
+            <summary>
+            Class used to detect any derived constraints
+            that fail to set the actual value in their
+            Matches override.
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.PrefixConstraint.baseConstraint">
+            <summary>
+            The base constraint
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.PrefixConstraint.#ctor(NUnit.Framework.Constraints.IResolveConstraint)">
+            <summary>
+            Construct given a base constraint
+            </summary>
+            <param name="resolvable"></param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.AllItemsConstraint.#ctor(NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            Construct an AllItemsConstraint on top of an existing constraint
+            </summary>
+            <param name="itemConstraint"></param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.AllItemsConstraint.Matches(System.Object)">
+            <summary>
+            Apply the item constraint to each item in the collection,
+            failing if any item fails.
+            </summary>
+            <param name="actual"></param>
+            <returns></returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.AllItemsConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write a description of this constraint to a MessageWriter
+            </summary>
+            <param name="writer"></param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.AndConstraint">
+            <summary>
+            AndConstraint succeeds only if both members succeed.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.BinaryConstraint">
+            <summary>
+            BinaryConstraint is the abstract base of all constraints
+            that combine two other constraints in some fashion.
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.BinaryConstraint.left">
+            <summary>
+            The first constraint being combined
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.BinaryConstraint.right">
+            <summary>
+            The second constraint being combined
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.BinaryConstraint.#ctor(NUnit.Framework.Constraints.Constraint,NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            Construct a BinaryConstraint from two other constraints
+            </summary>
+            <param name="left">The first constraint</param>
+            <param name="right">The second constraint</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.AndConstraint.#ctor(NUnit.Framework.Constraints.Constraint,NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            Create an AndConstraint from two other constraints
+            </summary>
+            <param name="left">The first constraint</param>
+            <param name="right">The second constraint</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.AndConstraint.Matches(System.Object)">
+            <summary>
+            Apply both member constraints to an actual value, succeeding 
+            succeeding only if both of them succeed.
+            </summary>
+            <param name="actual">The actual value</param>
+            <returns>True if the constraints both succeeded</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.AndConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write a description for this contraint to a MessageWriter
+            </summary>
+            <param name="writer">The MessageWriter to receive the description</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.AndConstraint.WriteActualValueTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the actual value for a failing constraint test to a
+            MessageWriter. The default implementation simply writes
+            the raw value of actual, leaving it to the writer to
+            perform any formatting.
+            </summary>
+            <param name="writer">The writer on which the actual value is displayed</param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.AssignableFromConstraint">
+            <summary>
+            AssignableFromConstraint is used to test that an object
+            can be assigned from a given Type.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.TypeConstraint">
+            <summary>
+            TypeConstraint is the abstract base for constraints
+            that take a Type as their expected value.
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.TypeConstraint.expectedType">
+            <summary>
+            The expected Type used by the constraint
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.TypeConstraint.#ctor(System.Type)">
+            <summary>
+            Construct a TypeConstraint for a given Type
+            </summary>
+            <param name="type"></param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.TypeConstraint.WriteActualValueTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the actual value for a failing constraint test to a
+            MessageWriter. TypeConstraints override this method to write
+            the name of the type.
+            </summary>
+            <param name="writer">The writer on which the actual value is displayed</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.AssignableFromConstraint.#ctor(System.Type)">
+            <summary>
+            Construct an AssignableFromConstraint for the type provided
+            </summary>
+            <param name="type"></param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.AssignableFromConstraint.Matches(System.Object)">
+            <summary>
+            Test whether an object can be assigned from the specified type
+            </summary>
+            <param name="actual">The object to be tested</param>
+            <returns>True if the object can be assigned a value of the expected Type, otherwise false.</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.AssignableFromConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write a description of this constraint to a MessageWriter
+            </summary>
+            <param name="writer">The MessageWriter to use</param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.AssignableToConstraint">
+            <summary>
+            AssignableToConstraint is used to test that an object
+            can be assigned to a given Type.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.AssignableToConstraint.#ctor(System.Type)">
+            <summary>
+            Construct an AssignableToConstraint for the type provided
+            </summary>
+            <param name="type"></param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.AssignableToConstraint.Matches(System.Object)">
+            <summary>
+            Test whether an object can be assigned to the specified type
+            </summary>
+            <param name="actual">The object to be tested</param>
+            <returns>True if the object can be assigned a value of the expected Type, otherwise false.</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.AssignableToConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write a description of this constraint to a MessageWriter
+            </summary>
+            <param name="writer">The MessageWriter to use</param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.AttributeConstraint">
+            <summary>
+            AttributeConstraint tests that a specified attribute is present
+            on a Type or other provider and that the value of the attribute
+            satisfies some other constraint.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.AttributeConstraint.#ctor(System.Type,NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            Constructs an AttributeConstraint for a specified attriute
+            Type and base constraint.
+            </summary>
+            <param name="type"></param>
+            <param name="baseConstraint"></param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.AttributeConstraint.Matches(System.Object)">
+            <summary>
+            Determines whether the Type or other provider has the 
+            expected attribute and if its value matches the
+            additional constraint specified.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.AttributeConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Writes a description of the attribute to the specified writer.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.AttributeConstraint.WriteActualValueTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Writes the actual value supplied to the specified writer.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.AttributeConstraint.GetStringRepresentation">
+            <summary>
+            Returns a string representation of the constraint.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.AttributeExistsConstraint">
+            <summary>
+            AttributeExistsConstraint tests for the presence of a
+            specified attribute on  a Type.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.AttributeExistsConstraint.#ctor(System.Type)">
+            <summary>
+            Constructs an AttributeExistsConstraint for a specific attribute Type
+            </summary>
+            <param name="type"></param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.AttributeExistsConstraint.Matches(System.Object)">
+            <summary>
+            Tests whether the object provides the expected attribute.
+            </summary>
+            <param name="actual">A Type, MethodInfo, or other ICustomAttributeProvider</param>
+            <returns>True if the expected attribute is present, otherwise false</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.AttributeExistsConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Writes the description of the constraint to the specified writer
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.BasicConstraint">
+            <summary>
+            BasicConstraint is the abstract base for constraints that
+            perform a simple comparison to a constant value.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.BasicConstraint.#ctor(System.Object,System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:BasicConstraint"/> class.
+            </summary>
+            <param name="expected">The expected.</param>
+            <param name="description">The description.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.BasicConstraint.Matches(System.Object)">
+            <summary>
+            Test whether the constraint is satisfied by a given value
+            </summary>
+            <param name="actual">The value to be tested</param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.BasicConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a MessageWriter
+            </summary>
+            <param name="writer">The writer on which the description is displayed</param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.BinarySerializableConstraint">
+            <summary>
+            BinarySerializableConstraint tests whether 
+            an object is serializable in binary format.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.BinarySerializableConstraint.Matches(System.Object)">
+            <summary>
+            Test whether the constraint is satisfied by a given value
+            </summary>
+            <param name="actual">The value to be tested</param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.BinarySerializableConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a MessageWriter
+            </summary>
+            <param name="writer">The writer on which the description is displayed</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.BinarySerializableConstraint.WriteActualValueTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the actual value for a failing constraint test to a
+            MessageWriter. The default implementation simply writes
+            the raw value of actual, leaving it to the writer to
+            perform any formatting.
+            </summary>
+            <param name="writer">The writer on which the actual value is displayed</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.BinarySerializableConstraint.GetStringRepresentation">
+            <summary>
+            Returns the string representation
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.CollectionConstraint">
+            <summary>
+            CollectionConstraint is the abstract base class for
+            constraints that operate on collections.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionConstraint.#ctor">
+            <summary>
+            Construct an empty CollectionConstraint
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionConstraint.#ctor(System.Object)">
+            <summary>
+            Construct a CollectionConstraint
+            </summary>
+            <param name="arg"></param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionConstraint.IsEmpty(System.Collections.IEnumerable)">
+            <summary>
+            Determines whether the specified enumerable is empty.
+            </summary>
+            <param name="enumerable">The enumerable.</param>
+            <returns>
+            	<c>true</c> if the specified enumerable is empty; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionConstraint.Matches(System.Object)">
+            <summary>
+            Test whether the constraint is satisfied by a given value
+            </summary>
+            <param name="actual">The value to be tested</param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionConstraint.doMatch(System.Collections.IEnumerable)">
+            <summary>
+            Protected method to be implemented by derived classes
+            </summary>
+            <param name="collection"></param>
+            <returns></returns>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.CollectionContainsConstraint">
+            <summary>
+            CollectionContainsConstraint is used to test whether a collection
+            contains an expected object as a member.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.CollectionItemsEqualConstraint">
+            <summary>
+            CollectionItemsEqualConstraint is the abstract base class for all
+            collection constraints that apply some notion of item equality
+            as a part of their operation.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionItemsEqualConstraint.#ctor">
+            <summary>
+            Construct an empty CollectionConstraint
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionItemsEqualConstraint.#ctor(System.Object)">
+            <summary>
+            Construct a CollectionConstraint
+            </summary>
+            <param name="arg"></param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionItemsEqualConstraint.Using(NUnit.Framework.Constraints.EqualityAdapter)">
+            <summary>
+            Flag the constraint to use the supplied EqualityAdapter.
+            NOTE: For internal use only.
+            </summary>
+            <param name="adapter">The EqualityAdapter to use.</param>
+            <returns>Self.</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionItemsEqualConstraint.Using(System.Collections.IComparer)">
+            <summary>
+            Flag the constraint to use the supplied IComparer object.
+            </summary>
+            <param name="comparer">The IComparer object to use.</param>
+            <returns>Self.</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionItemsEqualConstraint.Using``1(System.Collections.Generic.IComparer{``0})">
+            <summary>
+            Flag the constraint to use the supplied IComparer object.
+            </summary>
+            <param name="comparer">The IComparer object to use.</param>
+            <returns>Self.</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionItemsEqualConstraint.Using``1(System.Comparison{``0})">
+            <summary>
+            Flag the constraint to use the supplied Comparison object.
+            </summary>
+            <param name="comparer">The IComparer object to use.</param>
+            <returns>Self.</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionItemsEqualConstraint.Using(System.Collections.IEqualityComparer)">
+            <summary>
+            Flag the constraint to use the supplied IEqualityComparer object.
+            </summary>
+            <param name="comparer">The IComparer object to use.</param>
+            <returns>Self.</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionItemsEqualConstraint.Using``1(System.Collections.Generic.IEqualityComparer{``0})">
+            <summary>
+            Flag the constraint to use the supplied IEqualityComparer object.
+            </summary>
+            <param name="comparer">The IComparer object to use.</param>
+            <returns>Self.</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionItemsEqualConstraint.ItemsEqual(System.Object,System.Object)">
+            <summary>
+            Compares two collection members for equality
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionItemsEqualConstraint.Tally(System.Collections.IEnumerable)">
+            <summary>
+            Return a new CollectionTally for use in making tests
+            </summary>
+            <param name="c">The collection to be included in the tally</param>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.CollectionItemsEqualConstraint.IgnoreCase">
+            <summary>
+            Flag the constraint to ignore case and return self.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionContainsConstraint.#ctor(System.Object)">
+            <summary>
+            Construct a CollectionContainsConstraint
+            </summary>
+            <param name="expected"></param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionContainsConstraint.doMatch(System.Collections.IEnumerable)">
+            <summary>
+            Test whether the expected item is contained in the collection
+            </summary>
+            <param name="actual"></param>
+            <returns></returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionContainsConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write a descripton of the constraint to a MessageWriter
+            </summary>
+            <param name="writer"></param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.CollectionEquivalentConstraint">
+            <summary>
+            CollectionEquivalentCOnstraint is used to determine whether two
+            collections are equivalent.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionEquivalentConstraint.#ctor(System.Collections.IEnumerable)">
+            <summary>
+            Construct a CollectionEquivalentConstraint
+            </summary>
+            <param name="expected"></param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionEquivalentConstraint.doMatch(System.Collections.IEnumerable)">
+            <summary>
+            Test whether two collections are equivalent
+            </summary>
+            <param name="actual"></param>
+            <returns></returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionEquivalentConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write a description of this constraint to a MessageWriter
+            </summary>
+            <param name="writer"></param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.CollectionOrderedConstraint">
+            <summary>
+            CollectionOrderedConstraint is used to test whether a collection is ordered.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionOrderedConstraint.#ctor">
+            <summary>
+            Construct a CollectionOrderedConstraint
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionOrderedConstraint.Using(System.Collections.IComparer)">
+            <summary>
+            Modifies the constraint to use an IComparer and returns self.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionOrderedConstraint.Using``1(System.Collections.Generic.IComparer{``0})">
+            <summary>
+            Modifies the constraint to use an IComparer&lt;T&gt; and returns self.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionOrderedConstraint.Using``1(System.Comparison{``0})">
+            <summary>
+            Modifies the constraint to use a Comparison&lt;T&gt; and returns self.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionOrderedConstraint.By(System.String)">
+            <summary>
+            Modifies the constraint to test ordering by the value of
+            a specified property and returns self.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionOrderedConstraint.doMatch(System.Collections.IEnumerable)">
+            <summary>
+            Test whether the collection is ordered
+            </summary>
+            <param name="actual"></param>
+            <returns></returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionOrderedConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write a description of the constraint to a MessageWriter
+            </summary>
+            <param name="writer"></param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionOrderedConstraint.GetStringRepresentation">
+            <summary>
+            Returns the string representation of the constraint.
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.CollectionOrderedConstraint.Descending">
+            <summary>
+             If used performs a reverse comparison
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.CollectionSubsetConstraint">
+            <summary>
+            CollectionSubsetConstraint is used to determine whether
+            one collection is a subset of another
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionSubsetConstraint.#ctor(System.Collections.IEnumerable)">
+            <summary>
+            Construct a CollectionSubsetConstraint
+            </summary>
+            <param name="expected">The collection that the actual value is expected to be a subset of</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionSubsetConstraint.doMatch(System.Collections.IEnumerable)">
+            <summary>
+            Test whether the actual collection is a subset of 
+            the expected collection provided.
+            </summary>
+            <param name="actual"></param>
+            <returns></returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionSubsetConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write a description of this constraint to a MessageWriter
+            </summary>
+            <param name="writer"></param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.CollectionTally">
+            <summary>
+            CollectionTally counts (tallies) the number of
+            occurences of each object in one or more enumerations.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionTally.#ctor(NUnit.Framework.Constraints.NUnitEqualityComparer,System.Collections.IEnumerable)">
+            <summary>
+            Construct a CollectionTally object from a comparer and a collection
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionTally.TryRemove(System.Object)">
+            <summary>
+            Try to remove an object from the tally
+            </summary>
+            <param name="o">The object to remove</param>
+            <returns>True if successful, false if the object was not found</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionTally.TryRemove(System.Collections.IEnumerable)">
+            <summary>
+            Try to remove a set of objects from the tally
+            </summary>
+            <param name="c">The objects to remove</param>
+            <returns>True if successful, false if any object was not found</returns>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.CollectionTally.Count">
+            <summary>
+            The number of objects remaining in the tally
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.ComparisonAdapter">
+            <summary>
+            ComparisonAdapter class centralizes all comparisons of
+            values in NUnit, adapting to the use of any provided
+            IComparer, IComparer&lt;T&gt; or Comparison&lt;T&gt;
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ComparisonAdapter.For(System.Collections.IComparer)">
+            <summary>
+            Returns a ComparisonAdapter that wraps an IComparer
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ComparisonAdapter.For``1(System.Collections.Generic.IComparer{``0})">
+            <summary>
+            Returns a ComparisonAdapter that wraps an IComparer&lt;T&gt;
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ComparisonAdapter.For``1(System.Comparison{``0})">
+            <summary>
+            Returns a ComparisonAdapter that wraps a Comparison&lt;T&gt;
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ComparisonAdapter.Compare(System.Object,System.Object)">
+            <summary>
+            Compares two objects
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ComparisonAdapter.Default">
+            <summary>
+            Gets the default ComparisonAdapter, which wraps an
+            NUnitComparer object.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ComparisonAdapter.ComparerAdapter.#ctor(System.Collections.IComparer)">
+            <summary>
+            Construct a ComparisonAdapter for an IComparer
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ComparisonAdapter.ComparerAdapter.Compare(System.Object,System.Object)">
+            <summary>
+            Compares two objects
+            </summary>
+            <param name="expected"></param>
+            <param name="actual"></param>
+            <returns></returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ComparisonAdapter.DefaultComparisonAdapter.#ctor">
+            <summary>
+            Construct a default ComparisonAdapter
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.ComparisonAdapter.ComparerAdapter`1">
+            <summary>
+            ComparisonAdapter&lt;T&gt; extends ComparisonAdapter and
+            allows use of an IComparer&lt;T&gt; or Comparison&lt;T&gt;
+            to actually perform the comparison.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ComparisonAdapter.ComparerAdapter`1.#ctor(System.Collections.Generic.IComparer{`0})">
+            <summary>
+            Construct a ComparisonAdapter for an IComparer&lt;T&gt;
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ComparisonAdapter.ComparerAdapter`1.Compare(System.Object,System.Object)">
+            <summary>
+            Compare a Type T to an object
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ComparisonAdapter.ComparisonAdapterForComparison`1.#ctor(System.Comparison{`0})">
+            <summary>
+            Construct a ComparisonAdapter for a Comparison&lt;T&gt;
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ComparisonAdapter.ComparisonAdapterForComparison`1.Compare(System.Object,System.Object)">
+            <summary>
+            Compare a Type T to an object
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.ComparisonConstraint">
+            <summary>
+            Abstract base class for constraints that compare values to
+            determine if one is greater than, equal to or less than
+            the other. This class supplies the Using modifiers.
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.ComparisonConstraint.comparer">
+            <summary>
+            ComparisonAdapter to be used in making the comparison
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ComparisonConstraint.#ctor(System.Object)">
+            <summary>
+            Initializes a new instance of the <see cref="T:ComparisonConstraint"/> class.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ComparisonConstraint.#ctor(System.Object,System.Object)">
+            <summary>
+            Initializes a new instance of the <see cref="T:ComparisonConstraint"/> class.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ComparisonConstraint.Using(System.Collections.IComparer)">
+            <summary>
+            Modifies the constraint to use an IComparer and returns self
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ComparisonConstraint.Using``1(System.Collections.Generic.IComparer{``0})">
+            <summary>
+            Modifies the constraint to use an IComparer&lt;T&gt; and returns self
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ComparisonConstraint.Using``1(System.Comparison{``0})">
+            <summary>
+            Modifies the constraint to use a Comparison&lt;T&gt; and returns self
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.ActualValueDelegate`1">
+            <summary>
+            Delegate used to delay evaluation of the actual value
+            to be used in evaluating a constraint
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.ConstraintBuilder">
+            <summary>
+            ConstraintBuilder maintains the stacks that are used in
+            processing a ConstraintExpression. An OperatorStack
+            is used to hold operators that are waiting for their
+            operands to be reognized. a ConstraintStack holds 
+            input constraints as well as the results of each
+            operator applied.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintBuilder.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:ConstraintBuilder"/> class.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintBuilder.Append(NUnit.Framework.Constraints.ConstraintOperator)">
+            <summary>
+            Appends the specified operator to the expression by first
+            reducing the operator stack and then pushing the new
+            operator on the stack.
+            </summary>
+            <param name="op">The operator to push.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintBuilder.Append(NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            Appends the specified constraint to the expresson by pushing
+            it on the constraint stack.
+            </summary>
+            <param name="constraint">The constraint to push.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintBuilder.SetTopOperatorRightContext(System.Object)">
+            <summary>
+            Sets the top operator right context.
+            </summary>
+            <param name="rightContext">The right context.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintBuilder.ReduceOperatorStack(System.Int32)">
+            <summary>
+            Reduces the operator stack until the topmost item
+            precedence is greater than or equal to the target precedence.
+            </summary>
+            <param name="targetPrecedence">The target precedence.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintBuilder.Resolve">
+            <summary>
+            Resolves this instance, returning a Constraint. If the builder
+            is not currently in a resolvable state, an exception is thrown.
+            </summary>
+            <returns>The resolved constraint</returns>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintBuilder.IsResolvable">
+            <summary>
+            Gets a value indicating whether this instance is resolvable.
+            </summary>
+            <value>
+            	<c>true</c> if this instance is resolvable; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.ConstraintBuilder.OperatorStack">
+            <summary>
+            OperatorStack is a type-safe stack for holding ConstraintOperators
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintBuilder.OperatorStack.#ctor(NUnit.Framework.Constraints.ConstraintBuilder)">
+            <summary>
+            Initializes a new instance of the <see cref="T:OperatorStack"/> class.
+            </summary>
+            <param name="builder">The builder.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintBuilder.OperatorStack.Push(NUnit.Framework.Constraints.ConstraintOperator)">
+            <summary>
+            Pushes the specified operator onto the stack.
+            </summary>
+            <param name="op">The op.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintBuilder.OperatorStack.Pop">
+            <summary>
+            Pops the topmost operator from the stack.
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintBuilder.OperatorStack.Empty">
+            <summary>
+            Gets a value indicating whether this <see cref="T:OpStack"/> is empty.
+            </summary>
+            <value><c>true</c> if empty; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintBuilder.OperatorStack.Top">
+            <summary>
+            Gets the topmost operator without modifying the stack.
+            </summary>
+            <value>The top.</value>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.ConstraintBuilder.ConstraintStack">
+            <summary>
+            ConstraintStack is a type-safe stack for holding Constraints
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintBuilder.ConstraintStack.#ctor(NUnit.Framework.Constraints.ConstraintBuilder)">
+            <summary>
+            Initializes a new instance of the <see cref="T:ConstraintStack"/> class.
+            </summary>
+            <param name="builder">The builder.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintBuilder.ConstraintStack.Push(NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            Pushes the specified constraint. As a side effect,
+            the constraint's builder field is set to the 
+            ConstraintBuilder owning this stack.
+            </summary>
+            <param name="constraint">The constraint.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintBuilder.ConstraintStack.Pop">
+            <summary>
+            Pops this topmost constrait from the stack.
+            As a side effect, the constraint's builder
+            field is set to null.
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintBuilder.ConstraintStack.Empty">
+            <summary>
+            Gets a value indicating whether this <see cref="T:ConstraintStack"/> is empty.
+            </summary>
+            <value><c>true</c> if empty; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintBuilder.ConstraintStack.Top">
+            <summary>
+            Gets the topmost constraint without modifying the stack.
+            </summary>
+            <value>The topmost constraint</value>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.ConstraintExpression">
+            <summary>
+            ConstraintExpression represents a compound constraint in the 
+            process of being constructed from a series of syntactic elements.
+            
+            Individual elements are appended to the expression as they are
+            reognized. Once an actual Constraint is appended, the expression
+            returns a resolvable Constraint.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.ConstraintExpressionBase">
+            <summary>
+            ConstraintExpressionBase is the abstract base class for the 
+            ConstraintExpression class, which represents a 
+            compound constraint in the process of being constructed 
+            from a series of syntactic elements.
+            
+            NOTE: ConstraintExpressionBase is separate because the
+            ConstraintExpression class was generated in earlier
+            versions of NUnit. The two classes may be combined
+            in a future version.
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.ConstraintExpressionBase.builder">
+            <summary>
+            The ConstraintBuilder holding the elements recognized so far
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpressionBase.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:ConstraintExpressionBase"/> class.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpressionBase.#ctor(NUnit.Framework.Constraints.ConstraintBuilder)">
+            <summary>
+            Initializes a new instance of the <see cref="T:ConstraintExpressionBase"/> 
+            class passing in a ConstraintBuilder, which may be pre-populated.
+            </summary>
+            <param name="builder">The builder.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpressionBase.ToString">
+            <summary>
+            Returns a string representation of the expression as it
+            currently stands. This should only be used for testing,
+            since it has the side-effect of resolving the expression.
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpressionBase.Append(NUnit.Framework.Constraints.ConstraintOperator)">
+            <summary>
+            Appends an operator to the expression and returns the
+            resulting expression itself.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpressionBase.Append(NUnit.Framework.Constraints.SelfResolvingOperator)">
+            <summary>
+            Appends a self-resolving operator to the expression and
+            returns a new ResolvableConstraintExpression.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpressionBase.Append(NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            Appends a constraint to the expression and returns that
+            constraint, which is associated with the current state
+            of the expression being built.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:ConstraintExpression"/> class.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.#ctor(NUnit.Framework.Constraints.ConstraintBuilder)">
+            <summary>
+            Initializes a new instance of the <see cref="T:ConstraintExpression"/> 
+            class passing in a ConstraintBuilder, which may be pre-populated.
+            </summary>
+            <param name="builder">The builder.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.Exactly(System.Int32)">
+            <summary>
+            Returns a ConstraintExpression, which will apply
+            the following constraint to all members of a collection,
+            succeeding only if a specified number of them succeed.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.Property(System.String)">
+            <summary>
+            Returns a new PropertyConstraintExpression, which will either
+            test for the existence of the named property on the object
+            being tested or apply any following constraint to that property.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.Attribute(System.Type)">
+            <summary>
+            Returns a new AttributeConstraint checking for the
+            presence of a particular attribute on an object.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.Attribute``1">
+            <summary>
+            Returns a new AttributeConstraint checking for the
+            presence of a particular attribute on an object.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.Matches(NUnit.Framework.Constraints.IResolveConstraint)">
+            <summary>
+            Returns the constraint provided as an argument - used to allow custom
+            custom constraints to easily participate in the syntax.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.Matches``1(System.Predicate{``0})">
+            <summary>
+            Returns the constraint provided as an argument - used to allow custom
+            custom constraints to easily participate in the syntax.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.EqualTo(System.Object)">
+            <summary>
+            Returns a constraint that tests two items for equality
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.SameAs(System.Object)">
+            <summary>
+            Returns a constraint that tests that two references are the same object
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.GreaterThan(System.Object)">
+            <summary>
+            Returns a constraint that tests whether the
+            actual value is greater than the suppled argument
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.GreaterThanOrEqualTo(System.Object)">
+            <summary>
+            Returns a constraint that tests whether the
+            actual value is greater than or equal to the suppled argument
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.AtLeast(System.Object)">
+            <summary>
+            Returns a constraint that tests whether the
+            actual value is greater than or equal to the suppled argument
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.LessThan(System.Object)">
+            <summary>
+            Returns a constraint that tests whether the
+            actual value is less than the suppled argument
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.LessThanOrEqualTo(System.Object)">
+            <summary>
+            Returns a constraint that tests whether the
+            actual value is less than or equal to the suppled argument
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.AtMost(System.Object)">
+            <summary>
+            Returns a constraint that tests whether the
+            actual value is less than or equal to the suppled argument
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.TypeOf(System.Type)">
+            <summary>
+            Returns a constraint that tests whether the actual
+            value is of the exact type supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.TypeOf``1">
+            <summary>
+            Returns a constraint that tests whether the actual
+            value is of the exact type supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.InstanceOf(System.Type)">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is of the type supplied as an argument or a derived type.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.InstanceOf``1">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is of the type supplied as an argument or a derived type.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.InstanceOfType(System.Type)">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is of the type supplied as an argument or a derived type.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.InstanceOfType``1">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is of the type supplied as an argument or a derived type.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.AssignableFrom(System.Type)">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is assignable from the type supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.AssignableFrom``1">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is assignable from the type supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.AssignableTo(System.Type)">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is assignable from the type supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.AssignableTo``1">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is assignable from the type supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.EquivalentTo(System.Collections.IEnumerable)">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is a collection containing the same elements as the 
+            collection supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.SubsetOf(System.Collections.IEnumerable)">
+            <summary>
+            Returns a constraint that tests whether the actual value
+            is a subset of the collection supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.Member(System.Object)">
+            <summary>
+            Returns a new CollectionContainsConstraint checking for the
+            presence of a particular object in the collection.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.Contains(System.Object)">
+            <summary>
+            Returns a new CollectionContainsConstraint checking for the
+            presence of a particular object in the collection.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.Contains(System.String)">
+            <summary>
+            Returns a new ContainsConstraint. This constraint
+            will, in turn, make use of the appropriate second-level
+            constraint, depending on the type of the actual argument. 
+            This overload is only used if the item sought is a string,
+            since any other type implies that we are looking for a 
+            collection member.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.StringContaining(System.String)">
+            <summary>
+            Returns a constraint that succeeds if the actual
+            value contains the substring supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.ContainsSubstring(System.String)">
+            <summary>
+            Returns a constraint that succeeds if the actual
+            value contains the substring supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.StartsWith(System.String)">
+            <summary>
+            Returns a constraint that succeeds if the actual
+            value starts with the substring supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.StringStarting(System.String)">
+            <summary>
+            Returns a constraint that succeeds if the actual
+            value starts with the substring supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.EndsWith(System.String)">
+            <summary>
+            Returns a constraint that succeeds if the actual
+            value ends with the substring supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.StringEnding(System.String)">
+            <summary>
+            Returns a constraint that succeeds if the actual
+            value ends with the substring supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.Matches(System.String)">
+            <summary>
+            Returns a constraint that succeeds if the actual
+            value matches the regular expression supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.StringMatching(System.String)">
+            <summary>
+            Returns a constraint that succeeds if the actual
+            value matches the regular expression supplied as an argument.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.SamePath(System.String)">
+            <summary>
+            Returns a constraint that tests whether the path provided 
+            is the same as an expected path after canonicalization.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.SubPath(System.String)">
+            <summary>
+            Returns a constraint that tests whether the path provided 
+            is the same path or under an expected path after canonicalization.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.SamePathOrUnder(System.String)">
+            <summary>
+            Returns a constraint that tests whether the path provided 
+            is the same path or under an expected path after canonicalization.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.InRange``1(``0,``0)">
+            <summary>
+            Returns a constraint that tests whether the actual value falls 
+            within a specified range.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintExpression.Not">
+            <summary>
+            Returns a ConstraintExpression that negates any
+            following constraint.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintExpression.No">
+            <summary>
+            Returns a ConstraintExpression that negates any
+            following constraint.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintExpression.All">
+            <summary>
+            Returns a ConstraintExpression, which will apply
+            the following constraint to all members of a collection,
+            succeeding if all of them succeed.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintExpression.Some">
+            <summary>
+            Returns a ConstraintExpression, which will apply
+            the following constraint to all members of a collection,
+            succeeding if at least one of them succeeds.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintExpression.None">
+            <summary>
+            Returns a ConstraintExpression, which will apply
+            the following constraint to all members of a collection,
+            succeeding if all of them fail.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintExpression.Length">
+            <summary>
+            Returns a new ConstraintExpression, which will apply the following
+            constraint to the Length property of the object being tested.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintExpression.Count">
+            <summary>
+            Returns a new ConstraintExpression, which will apply the following
+            constraint to the Count property of the object being tested.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintExpression.Message">
+            <summary>
+            Returns a new ConstraintExpression, which will apply the following
+            constraint to the Message property of the object being tested.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintExpression.InnerException">
+            <summary>
+            Returns a new ConstraintExpression, which will apply the following
+            constraint to the InnerException property of the object being tested.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintExpression.With">
+            <summary>
+            With is currently a NOP - reserved for future use.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintExpression.Null">
+            <summary>
+            Returns a constraint that tests for null
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintExpression.True">
+            <summary>
+            Returns a constraint that tests for True
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintExpression.False">
+            <summary>
+            Returns a constraint that tests for False
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintExpression.Positive">
+            <summary>
+            Returns a constraint that tests for a positive value
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintExpression.Negative">
+            <summary>
+            Returns a constraint that tests for a negative value
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintExpression.NaN">
+            <summary>
+            Returns a constraint that tests for NaN
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintExpression.Empty">
+            <summary>
+            Returns a constraint that tests for empty
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintExpression.Unique">
+            <summary>
+            Returns a constraint that tests whether a collection 
+            contains all unique items.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintExpression.BinarySerializable">
+            <summary>
+            Returns a constraint that tests whether an object graph is serializable in binary format.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintExpression.XmlSerializable">
+            <summary>
+            Returns a constraint that tests whether an object graph is serializable in xml format.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintExpression.Ordered">
+            <summary>
+            Returns a constraint that tests whether a collection is ordered
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.ContainsConstraint">
+            <summary>
+            ContainsConstraint tests a whether a string contains a substring
+            or a collection contains an object. It postpones the decision of
+            which test to use until the type of the actual argument is known.
+            This allows testing whether a string is contained in a collection
+            or as a substring of another string using the same syntax.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ContainsConstraint.#ctor(System.Object)">
+            <summary>
+            Initializes a new instance of the <see cref="T:NUnit.Framework.Constraints.ContainsConstraint"/> class.
+            </summary>
+            <param name="expected">The expected.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ContainsConstraint.Matches(System.Object)">
+            <summary>
+            Test whether the constraint is satisfied by a given value
+            </summary>
+            <param name="actual">The value to be tested</param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ContainsConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a MessageWriter
+            </summary>
+            <param name="writer">The writer on which the description is displayed</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ContainsConstraint.Using(System.Collections.IComparer)">
+            <summary>
+            Flag the constraint to use the supplied IComparer object.
+            </summary>
+            <param name="comparer">The IComparer object to use.</param>
+            <returns>Self.</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ContainsConstraint.Using``1(System.Collections.Generic.IComparer{``0})">
+            <summary>
+            Flag the constraint to use the supplied IComparer object.
+            </summary>
+            <param name="comparer">The IComparer object to use.</param>
+            <returns>Self.</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ContainsConstraint.Using``1(System.Comparison{``0})">
+            <summary>
+            Flag the constraint to use the supplied Comparison object.
+            </summary>
+            <param name="comparer">The IComparer object to use.</param>
+            <returns>Self.</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ContainsConstraint.Using(System.Collections.IEqualityComparer)">
+            <summary>
+            Flag the constraint to use the supplied IEqualityComparer object.
+            </summary>
+            <param name="comparer">The IComparer object to use.</param>
+            <returns>Self.</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ContainsConstraint.Using``1(System.Collections.Generic.IEqualityComparer{``0})">
+            <summary>
+            Flag the constraint to use the supplied IEqualityComparer object.
+            </summary>
+            <param name="comparer">The IComparer object to use.</param>
+            <returns>Self.</returns>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ContainsConstraint.IgnoreCase">
+            <summary>
+            Flag the constraint to ignore case and return self.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.DelayedConstraint">
+            <summary>
+             Applies a delay to the match so that a match can be evaluated in the future.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.DelayedConstraint.#ctor(NUnit.Framework.Constraints.Constraint,System.Int32)">
+            <summary>
+             Creates a new DelayedConstraint
+            </summary>
+            <param name="baseConstraint">The inner constraint two decorate</param>
+            <param name="delayInMilliseconds">The time interval after which the match is performed</param>
+            <exception cref="T:System.InvalidOperationException">If the value of <paramref name="delayInMilliseconds"/> is less than 0</exception>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.DelayedConstraint.#ctor(NUnit.Framework.Constraints.Constraint,System.Int32,System.Int32)">
+            <summary>
+             Creates a new DelayedConstraint
+            </summary>
+            <param name="baseConstraint">The inner constraint two decorate</param>
+            <param name="delayInMilliseconds">The time interval after which the match is performed</param>
+            <param name="pollingInterval">The time interval used for polling</param>
+            <exception cref="T:System.InvalidOperationException">If the value of <paramref name="delayInMilliseconds"/> is less than 0</exception>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.DelayedConstraint.Matches(System.Object)">
+            <summary>
+            Test whether the constraint is satisfied by a given value
+            </summary>
+            <param name="actual">The value to be tested</param>
+            <returns>True for if the base constraint fails, false if it succeeds</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.DelayedConstraint.Matches``1(NUnit.Framework.Constraints.ActualValueDelegate{``0})">
+            <summary>
+            Test whether the constraint is satisfied by a delegate
+            </summary>
+            <param name="del">The delegate whose value is to be tested</param>
+            <returns>True for if the base constraint fails, false if it succeeds</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.DelayedConstraint.Matches``1(``0@)">
+            <summary>
+            Test whether the constraint is satisfied by a given reference.
+            Overridden to wait for the specified delay period before
+            calling the base constraint with the dereferenced value.
+            </summary>
+            <param name="actual">A reference to the value to be tested</param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.DelayedConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a MessageWriter
+            </summary>
+            <param name="writer">The writer on which the description is displayed</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.DelayedConstraint.WriteActualValueTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the actual value for a failing constraint test to a MessageWriter.
+            </summary>
+            <param name="writer">The writer on which the actual value is displayed</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.DelayedConstraint.GetStringRepresentation">
+            <summary>
+            Returns the string representation of the constraint.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.EmptyCollectionConstraint">
+            <summary>
+            EmptyCollectionConstraint tests whether a collection is empty. 
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EmptyCollectionConstraint.doMatch(System.Collections.IEnumerable)">
+            <summary>
+            Check that the collection is empty
+            </summary>
+            <param name="collection"></param>
+            <returns></returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EmptyCollectionConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a MessageWriter
+            </summary>
+            <param name="writer"></param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.EmptyConstraint">
+            <summary>
+            EmptyConstraint tests a whether a string or collection is empty,
+            postponing the decision about which test is applied until the
+            type of the actual argument is known.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EmptyConstraint.Matches(System.Object)">
+            <summary>
+            Test whether the constraint is satisfied by a given value
+            </summary>
+            <param name="actual">The value to be tested</param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EmptyConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a MessageWriter
+            </summary>
+            <param name="writer">The writer on which the description is displayed</param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.EmptyDirectoryConstraint">
+            <summary>
+            EmptyDirectoryConstraint is used to test that a directory is empty
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EmptyDirectoryConstraint.Matches(System.Object)">
+            <summary>
+            Test whether the constraint is satisfied by a given value
+            </summary>
+            <param name="actual">The value to be tested</param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EmptyDirectoryConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a MessageWriter
+            </summary>
+            <param name="writer">The writer on which the description is displayed</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EmptyDirectoryConstraint.WriteActualValueTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the actual value for a failing constraint test to a
+            MessageWriter. The default implementation simply writes
+            the raw value of actual, leaving it to the writer to
+            perform any formatting.
+            </summary>
+            <param name="writer">The writer on which the actual value is displayed</param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.EmptyStringConstraint">
+            <summary>
+            EmptyStringConstraint tests whether a string is empty.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EmptyStringConstraint.Matches(System.Object)">
+            <summary>
+            Test whether the constraint is satisfied by a given value
+            </summary>
+            <param name="actual">The value to be tested</param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EmptyStringConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a MessageWriter
+            </summary>
+            <param name="writer">The writer on which the description is displayed</param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.EndsWithConstraint">
+            <summary>
+            EndsWithConstraint can test whether a string ends
+            with an expected substring.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.StringConstraint">
+            <summary>
+            StringConstraint is the abstract base for constraints
+            that operate on strings. It supports the IgnoreCase
+            modifier for string operations.
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.StringConstraint.expected">
+            <summary>
+            The expected value
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.StringConstraint.caseInsensitive">
+            <summary>
+            Indicates whether tests should be case-insensitive
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.StringConstraint.#ctor(System.String)">
+            <summary>
+            Constructs a StringConstraint given an expected value
+            </summary>
+            <param name="expected">The expected value</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.StringConstraint.Matches(System.Object)">
+            <summary>
+            Test whether the constraint is satisfied by a given value
+            </summary>
+            <param name="actual">The value to be tested</param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.StringConstraint.Matches(System.String)">
+            <summary>
+            Test whether the constraint is satisfied by a given string
+            </summary>
+            <param name="actual">The string to be tested</param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.StringConstraint.IgnoreCase">
+            <summary>
+            Modify the constraint to ignore case in matching.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EndsWithConstraint.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:EndsWithConstraint"/> class.
+            </summary>
+            <param name="expected">The expected string</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EndsWithConstraint.Matches(System.String)">
+            <summary>
+            Test whether the constraint is matched by the actual value.
+            This is a template method, which calls the IsMatch method
+            of the derived class.
+            </summary>
+            <param name="actual"></param>
+            <returns></returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EndsWithConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a MessageWriter
+            </summary>
+            <param name="writer">The writer on which the description is displayed</param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.EqualConstraint">
+            <summary>
+            EqualConstraint is able to compare an actual value with the
+            expected value provided in its constructor. Two objects are 
+            considered equal if both are null, or if both have the same 
+            value. NUnit has special semantics for some object types.
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.EqualConstraint.clipStrings">
+            <summary>
+            If true, strings in error messages will be clipped
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.EqualConstraint.comparer">
+            <summary>
+            NUnitEqualityComparer used to test equality.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EqualConstraint.#ctor(System.Object)">
+            <summary>
+            Initializes a new instance of the <see cref="T:NUnit.Framework.Constraints.EqualConstraint"/> class.
+            </summary>
+            <param name="expected">The expected value.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EqualConstraint.Within(System.Object)">
+            <summary>
+            Flag the constraint to use a tolerance when determining equality.
+            </summary>
+            <param name="amount">Tolerance value to be used</param>
+            <returns>Self.</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EqualConstraint.Comparer(System.Collections.IComparer)">
+            <summary>
+            Flag the constraint to use the supplied IComparer object.
+            </summary>
+            <param name="comparer">The IComparer object to use.</param>
+            <returns>Self.</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EqualConstraint.Using(System.Collections.IComparer)">
+            <summary>
+            Flag the constraint to use the supplied IComparer object.
+            </summary>
+            <param name="comparer">The IComparer object to use.</param>
+            <returns>Self.</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EqualConstraint.Using``1(System.Collections.Generic.IComparer{``0})">
+            <summary>
+            Flag the constraint to use the supplied IComparer object.
+            </summary>
+            <param name="comparer">The IComparer object to use.</param>
+            <returns>Self.</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EqualConstraint.Using``1(System.Comparison{``0})">
+            <summary>
+            Flag the constraint to use the supplied Comparison object.
+            </summary>
+            <param name="comparer">The IComparer object to use.</param>
+            <returns>Self.</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EqualConstraint.Using(System.Collections.IEqualityComparer)">
+            <summary>
+            Flag the constraint to use the supplied IEqualityComparer object.
+            </summary>
+            <param name="comparer">The IComparer object to use.</param>
+            <returns>Self.</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EqualConstraint.Using``1(System.Collections.Generic.IEqualityComparer{``0})">
+            <summary>
+            Flag the constraint to use the supplied IEqualityComparer object.
+            </summary>
+            <param name="comparer">The IComparer object to use.</param>
+            <returns>Self.</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EqualConstraint.Matches(System.Object)">
+            <summary>
+            Test whether the constraint is satisfied by a given value
+            </summary>
+            <param name="actual">The value to be tested</param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EqualConstraint.WriteMessageTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write a failure message. Overridden to provide custom 
+            failure messages for EqualConstraint.
+            </summary>
+            <param name="writer">The MessageWriter to write to</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EqualConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write description of this constraint
+            </summary>
+            <param name="writer">The MessageWriter to write to</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EqualConstraint.DisplayCollectionDifferences(NUnit.Framework.Constraints.MessageWriter,System.Collections.ICollection,System.Collections.ICollection,System.Int32)">
+            <summary>
+            Display the failure information for two collections that did not match.
+            </summary>
+            <param name="writer">The MessageWriter on which to display</param>
+            <param name="expected">The expected collection.</param>
+            <param name="actual">The actual collection</param>
+            <param name="depth">The depth of this failure in a set of nested collections</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EqualConstraint.DisplayTypesAndSizes(NUnit.Framework.Constraints.MessageWriter,System.Collections.IEnumerable,System.Collections.IEnumerable,System.Int32)">
+            <summary>
+            Displays a single line showing the types and sizes of the expected
+            and actual enumerations, collections or arrays. If both are identical, 
+            the value is only shown once.
+            </summary>
+            <param name="writer">The MessageWriter on which to display</param>
+            <param name="expected">The expected collection or array</param>
+            <param name="actual">The actual collection or array</param>
+            <param name="indent">The indentation level for the message line</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EqualConstraint.DisplayFailurePoint(NUnit.Framework.Constraints.MessageWriter,System.Collections.IEnumerable,System.Collections.IEnumerable,NUnit.Framework.Constraints.FailurePoint,System.Int32)">
+            <summary>
+            Displays a single line showing the point in the expected and actual
+            arrays at which the comparison failed. If the arrays have different
+            structures or dimensions, both values are shown.
+            </summary>
+            <param name="writer">The MessageWriter on which to display</param>
+            <param name="expected">The expected array</param>
+            <param name="actual">The actual array</param>
+            <param name="failurePoint">Index of the failure point in the underlying collections</param>
+            <param name="indent">The indentation level for the message line</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EqualConstraint.DisplayEnumerableDifferences(NUnit.Framework.Constraints.MessageWriter,System.Collections.IEnumerable,System.Collections.IEnumerable,System.Int32)">
+            <summary>
+            Display the failure information for two IEnumerables that did not match.
+            </summary>
+            <param name="writer">The MessageWriter on which to display</param>
+            <param name="expected">The expected enumeration.</param>
+            <param name="actual">The actual enumeration</param>
+            <param name="depth">The depth of this failure in a set of nested collections</param>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.EqualConstraint.IgnoreCase">
+            <summary>
+            Flag the constraint to ignore case and return self.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.EqualConstraint.NoClip">
+            <summary>
+            Flag the constraint to suppress string clipping 
+            and return self.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.EqualConstraint.AsCollection">
+            <summary>
+            Flag the constraint to compare arrays as collections
+            and return self.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.EqualConstraint.Ulps">
+            <summary>
+            Switches the .Within() modifier to interpret its tolerance as
+            a distance in representable values (see remarks).
+            </summary>
+            <returns>Self.</returns>
+            <remarks>
+            Ulp stands for "unit in the last place" and describes the minimum
+            amount a given value can change. For any integers, an ulp is 1 whole
+            digit. For floating point values, the accuracy of which is better
+            for smaller numbers and worse for larger numbers, an ulp depends
+            on the size of the number. Using ulps for comparison of floating
+            point results instead of fixed tolerances is safer because it will
+            automatically compensate for the added inaccuracy of larger numbers.
+            </remarks>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.EqualConstraint.Percent">
+            <summary>
+            Switches the .Within() modifier to interpret its tolerance as
+            a percentage that the actual values is allowed to deviate from
+            the expected value.
+            </summary>
+            <returns>Self</returns>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.EqualConstraint.Days">
+            <summary>
+            Causes the tolerance to be interpreted as a TimeSpan in days.
+            </summary>
+            <returns>Self</returns>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.EqualConstraint.Hours">
+            <summary>
+            Causes the tolerance to be interpreted as a TimeSpan in hours.
+            </summary>
+            <returns>Self</returns>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.EqualConstraint.Minutes">
+            <summary>
+            Causes the tolerance to be interpreted as a TimeSpan in minutes.
+            </summary>
+            <returns>Self</returns>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.EqualConstraint.Seconds">
+            <summary>
+            Causes the tolerance to be interpreted as a TimeSpan in seconds.
+            </summary>
+            <returns>Self</returns>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.EqualConstraint.Milliseconds">
+            <summary>
+            Causes the tolerance to be interpreted as a TimeSpan in milliseconds.
+            </summary>
+            <returns>Self</returns>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.EqualConstraint.Ticks">
+            <summary>
+            Causes the tolerance to be interpreted as a TimeSpan in clock ticks.
+            </summary>
+            <returns>Self</returns>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.EqualityAdapter">
+            <summary>
+            EqualityAdapter class handles all equality comparisons
+            that use an IEqualityComparer, IEqualityComparer&lt;T&gt;
+            or a ComparisonAdapter.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EqualityAdapter.AreEqual(System.Object,System.Object)">
+            <summary>
+            Compares two objects, returning true if they are equal
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EqualityAdapter.CanCompare(System.Object,System.Object)">
+            <summary>
+            Returns true if the two objects can be compared by this adapter.
+            The base adapter cannot handle IEnumerables except for strings.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EqualityAdapter.For(System.Collections.IComparer)">
+            <summary>
+            Returns an EqualityAdapter that wraps an IComparer.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EqualityAdapter.For(System.Collections.IEqualityComparer)">
+            <summary>
+            Returns an EqualityAdapter that wraps an IEqualityComparer.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EqualityAdapter.For``1(System.Collections.Generic.IEqualityComparer{``0})">
+            <summary>
+            Returns an EqualityAdapter that wraps an IEqualityComparer&lt;T&gt;.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EqualityAdapter.For``1(System.Collections.Generic.IComparer{``0})">
+            <summary>
+            Returns an EqualityAdapter that wraps an IComparer&lt;T&gt;.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EqualityAdapter.For``1(System.Comparison{``0})">
+            <summary>
+            Returns an EqualityAdapter that wraps a Comparison&lt;T&gt;.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.EqualityAdapter.ComparerAdapter">
+            <summary>
+            EqualityAdapter that wraps an IComparer.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.EqualityAdapter.GenericEqualityAdapter`1.CanCompare(System.Object,System.Object)">
+            <summary>
+            Returns true if the two objects can be compared by this adapter.
+            Generic adapter requires objects of the specified type.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.EqualityAdapter.ComparerAdapter`1">
+            <summary>
+            EqualityAdapter that wraps an IComparer.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.EqualityAdapterList">
+            <summary>
+            EqualityAdapterList represents a list of EqualityAdapters
+            in a common class across platforms.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.ExactCountConstraint">
+            <summary>
+            ExactCountConstraint applies another constraint to each
+            item in a collection, succeeding only if a specified
+            number of items succeed.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ExactCountConstraint.#ctor(System.Int32,NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            Construct an ExactCountConstraint on top of an existing constraint
+            </summary>
+            <param name="expectedCount"></param>
+            <param name="itemConstraint"></param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ExactCountConstraint.Matches(System.Object)">
+            <summary>
+            Apply the item constraint to each item in the collection,
+            succeeding only if the expected number of items pass.
+            </summary>
+            <param name="actual"></param>
+            <returns></returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ExactCountConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write a description of this constraint to a MessageWriter
+            </summary>
+            <param name="writer"></param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.ExactTypeConstraint">
+            <summary>
+            ExactTypeConstraint is used to test that an object
+            is of the exact type provided in the constructor
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ExactTypeConstraint.#ctor(System.Type)">
+            <summary>
+            Construct an ExactTypeConstraint for a given Type
+            </summary>
+            <param name="type">The expected Type.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ExactTypeConstraint.Matches(System.Object)">
+            <summary>
+            Test that an object is of the exact type specified
+            </summary>
+            <param name="actual">The actual value.</param>
+            <returns>True if the tested object is of the exact type provided, otherwise false.</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ExactTypeConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the description of this constraint to a MessageWriter
+            </summary>
+            <param name="writer">The MessageWriter to use</param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.ExceptionTypeConstraint">
+            <summary>
+            ExceptionTypeConstraint is a special version of ExactTypeConstraint
+            used to provided detailed info about the exception thrown in
+            an error message.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ExceptionTypeConstraint.#ctor(System.Type)">
+            <summary>
+            Constructs an ExceptionTypeConstraint
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ExceptionTypeConstraint.WriteActualValueTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the actual value for a failing constraint test to a
+            MessageWriter. Overriden to write additional information 
+            in the case of an Exception.
+            </summary>
+            <param name="writer">The MessageWriter to use</param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.FailurePoint">
+            <summary>
+            FailurePoint class represents one point of failure
+            in an equality test.
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.FailurePoint.Position">
+            <summary>
+            The location of the failure
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.FailurePoint.ExpectedValue">
+            <summary>
+            The expected value
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.FailurePoint.ActualValue">
+            <summary>
+            The actual value
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.FailurePoint.ExpectedHasData">
+            <summary>
+            Indicates whether the expected value is valid
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.FailurePoint.ActualHasData">
+            <summary>
+            Indicates whether the actual value is valid
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.FailurePointList">
+            <summary>
+            FailurePointList represents a set of FailurePoints
+            in a cross-platform way.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.FalseConstraint">
+            <summary>
+            FalseConstraint tests that the actual value is false
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.FalseConstraint.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:FalseConstraint"/> class.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.FloatingPointNumerics">
+            <summary>Helper routines for working with floating point numbers</summary>
+            <remarks>
+              <para>
+                The floating point comparison code is based on this excellent article:
+                http://www.cygnus-software.com/papers/comparingfloats/comparingfloats.htm
+              </para>
+              <para>
+                "ULP" means Unit in the Last Place and in the context of this library refers to
+                the distance between two adjacent floating point numbers. IEEE floating point
+                numbers can only represent a finite subset of natural numbers, with greater
+                accuracy for smaller numbers and lower accuracy for very large numbers.
+              </para>
+              <para>
+                If a comparison is allowed "2 ulps" of deviation, that means the values are
+                allowed to deviate by up to 2 adjacent floating point values, which might be
+                as low as 0.0000001 for small numbers or as high as 10.0 for large numbers.
+              </para>
+            </remarks>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.FloatingPointNumerics.AreAlmostEqualUlps(System.Single,System.Single,System.Int32)">
+            <summary>Compares two floating point values for equality</summary>
+            <param name="left">First floating point value to be compared</param>
+            <param name="right">Second floating point value t be compared</param>
+            <param name="maxUlps">
+              Maximum number of representable floating point values that are allowed to
+              be between the left and the right floating point values
+            </param>
+            <returns>True if both numbers are equal or close to being equal</returns>
+            <remarks>
+              <para>
+                Floating point values can only represent a finite subset of natural numbers.
+                For example, the values 2.00000000 and 2.00000024 can be stored in a float,
+                but nothing inbetween them.
+              </para>
+              <para>
+                This comparison will count how many possible floating point values are between
+                the left and the right number. If the number of possible values between both
+                numbers is less than or equal to maxUlps, then the numbers are considered as
+                being equal.
+              </para>
+              <para>
+                Implementation partially follows the code outlined here:
+                http://www.anttirt.net/2007/08/19/proper-floating-point-comparisons/
+              </para>
+            </remarks>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.FloatingPointNumerics.AreAlmostEqualUlps(System.Double,System.Double,System.Int64)">
+            <summary>Compares two double precision floating point values for equality</summary>
+            <param name="left">First double precision floating point value to be compared</param>
+            <param name="right">Second double precision floating point value t be compared</param>
+            <param name="maxUlps">
+              Maximum number of representable double precision floating point values that are
+              allowed to be between the left and the right double precision floating point values
+            </param>
+            <returns>True if both numbers are equal or close to being equal</returns>
+            <remarks>
+              <para>
+                Double precision floating point values can only represent a limited series of
+                natural numbers. For example, the values 2.0000000000000000 and 2.0000000000000004
+                can be stored in a double, but nothing inbetween them.
+              </para>
+              <para>
+                This comparison will count how many possible double precision floating point
+                values are between the left and the right number. If the number of possible
+                values between both numbers is less than or equal to maxUlps, then the numbers
+                are considered as being equal.
+              </para>
+              <para>
+                Implementation partially follows the code outlined here:
+                http://www.anttirt.net/2007/08/19/proper-floating-point-comparisons/
+              </para>
+            </remarks>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.FloatingPointNumerics.ReinterpretAsInt(System.Single)">
+            <summary>
+              Reinterprets the memory contents of a floating point value as an integer value
+            </summary>
+            <param name="value">
+              Floating point value whose memory contents to reinterpret
+            </param>
+            <returns>
+              The memory contents of the floating point value interpreted as an integer
+            </returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.FloatingPointNumerics.ReinterpretAsLong(System.Double)">
+            <summary>
+              Reinterprets the memory contents of a double precision floating point
+              value as an integer value
+            </summary>
+            <param name="value">
+              Double precision floating point value whose memory contents to reinterpret
+            </param>
+            <returns>
+              The memory contents of the double precision floating point value
+              interpreted as an integer
+            </returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.FloatingPointNumerics.ReinterpretAsFloat(System.Int32)">
+            <summary>
+              Reinterprets the memory contents of an integer as a floating point value
+            </summary>
+            <param name="value">Integer value whose memory contents to reinterpret</param>
+            <returns>
+              The memory contents of the integer value interpreted as a floating point value
+            </returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.FloatingPointNumerics.ReinterpretAsDouble(System.Int64)">
+            <summary>
+              Reinterprets the memory contents of an integer value as a double precision
+              floating point value
+            </summary>
+            <param name="value">Integer whose memory contents to reinterpret</param>
+            <returns>
+              The memory contents of the integer interpreted as a double precision
+              floating point value
+            </returns>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.FloatingPointNumerics.FloatIntUnion">
+            <summary>Union of a floating point variable and an integer</summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.FloatingPointNumerics.FloatIntUnion.Float">
+            <summary>The union's value as a floating point variable</summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.FloatingPointNumerics.FloatIntUnion.Int">
+            <summary>The union's value as an integer</summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.FloatingPointNumerics.FloatIntUnion.UInt">
+            <summary>The union's value as an unsigned integer</summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.FloatingPointNumerics.DoubleLongUnion">
+            <summary>Union of a double precision floating point variable and a long</summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.FloatingPointNumerics.DoubleLongUnion.Double">
+            <summary>The union's value as a double precision floating point variable</summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.FloatingPointNumerics.DoubleLongUnion.Long">
+            <summary>The union's value as a long</summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.FloatingPointNumerics.DoubleLongUnion.ULong">
+            <summary>The union's value as an unsigned long</summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.GreaterThanConstraint">
+            <summary>
+            Tests whether a value is greater than the value supplied to its constructor
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.GreaterThanConstraint.expected">
+            <summary>
+            The value against which a comparison is to be made
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.GreaterThanConstraint.#ctor(System.Object)">
+            <summary>
+            Initializes a new instance of the <see cref="T:GreaterThanConstraint"/> class.
+            </summary>
+            <param name="expected">The expected value.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.GreaterThanConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a MessageWriter
+            </summary>
+            <param name="writer">The writer on which the description is displayed</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.GreaterThanConstraint.Matches(System.Object)">
+            <summary>
+            Test whether the constraint is satisfied by a given value
+            </summary>
+            <param name="actual">The value to be tested</param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.GreaterThanOrEqualConstraint">
+            <summary>
+            Tests whether a value is greater than or equal to the value supplied to its constructor
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.GreaterThanOrEqualConstraint.expected">
+            <summary>
+            The value against which a comparison is to be made
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.GreaterThanOrEqualConstraint.#ctor(System.Object)">
+            <summary>
+            Initializes a new instance of the <see cref="T:GreaterThanOrEqualConstraint"/> class.
+            </summary>
+            <param name="expected">The expected value.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.GreaterThanOrEqualConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a MessageWriter
+            </summary>
+            <param name="writer">The writer on which the description is displayed</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.GreaterThanOrEqualConstraint.Matches(System.Object)">
+            <summary>
+            Test whether the constraint is satisfied by a given value
+            </summary>
+            <param name="actual">The value to be tested</param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.InstanceOfTypeConstraint">
+            <summary>
+            InstanceOfTypeConstraint is used to test that an object
+            is of the same type provided or derived from it.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.InstanceOfTypeConstraint.#ctor(System.Type)">
+            <summary>
+            Construct an InstanceOfTypeConstraint for the type provided
+            </summary>
+            <param name="type">The expected Type</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.InstanceOfTypeConstraint.Matches(System.Object)">
+            <summary>
+            Test whether an object is of the specified type or a derived type
+            </summary>
+            <param name="actual">The object to be tested</param>
+            <returns>True if the object is of the provided type or derives from it, otherwise false.</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.InstanceOfTypeConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write a description of this constraint to a MessageWriter
+            </summary>
+            <param name="writer">The MessageWriter to use</param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.LessThanConstraint">
+            <summary>
+            Tests whether a value is less than the value supplied to its constructor
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.LessThanConstraint.expected">
+            <summary>
+            The value against which a comparison is to be made
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.LessThanConstraint.#ctor(System.Object)">
+            <summary>
+            Initializes a new instance of the <see cref="T:LessThanConstraint"/> class.
+            </summary>
+            <param name="expected">The expected value.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.LessThanConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a MessageWriter
+            </summary>
+            <param name="writer">The writer on which the description is displayed</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.LessThanConstraint.Matches(System.Object)">
+            <summary>
+            Test whether the constraint is satisfied by a given value
+            </summary>
+            <param name="actual">The value to be tested</param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.LessThanOrEqualConstraint">
+            <summary>
+            Tests whether a value is less than or equal to the value supplied to its constructor
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.LessThanOrEqualConstraint.expected">
+            <summary>
+            The value against which a comparison is to be made
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.LessThanOrEqualConstraint.#ctor(System.Object)">
+            <summary>
+            Initializes a new instance of the <see cref="T:LessThanOrEqualConstraint"/> class.
+            </summary>
+            <param name="expected">The expected value.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.LessThanOrEqualConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a MessageWriter
+            </summary>
+            <param name="writer">The writer on which the description is displayed</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.LessThanOrEqualConstraint.Matches(System.Object)">
+            <summary>
+            Test whether the constraint is satisfied by a given value
+            </summary>
+            <param name="actual">The value to be tested</param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.MsgUtils">
+            <summary>
+            Static methods used in creating messages
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.MsgUtils.ELLIPSIS">
+            <summary>
+            Static string used when strings are clipped
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.MsgUtils.GetTypeRepresentation(System.Object)">
+            <summary>
+            Returns the representation of a type as used in NUnitLite.
+            This is the same as Type.ToString() except for arrays,
+            which are displayed with their declared sizes.
+            </summary>
+            <param name="obj"></param>
+            <returns></returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.MsgUtils.EscapeControlChars(System.String)">
+            <summary>
+            Converts any control characters in a string 
+            to their escaped representation.
+            </summary>
+            <param name="s">The string to be converted</param>
+            <returns>The converted string</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.MsgUtils.GetArrayIndicesAsString(System.Int32[])">
+            <summary>
+            Return the a string representation for a set of indices into an array
+            </summary>
+            <param name="indices">Array of indices for which a string is needed</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.MsgUtils.GetArrayIndicesFromCollectionIndex(System.Collections.IEnumerable,System.Int32)">
+            <summary>
+            Get an array of indices representing the point in a enumerable, 
+            collection or array corresponding to a single int index into the 
+            collection.
+            </summary>
+            <param name="collection">The collection to which the indices apply</param>
+            <param name="index">Index in the collection</param>
+            <returns>Array of indices</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.MsgUtils.ClipString(System.String,System.Int32,System.Int32)">
+            <summary>
+            Clip a string to a given length, starting at a particular offset, returning the clipped
+            string with ellipses representing the removed parts
+            </summary>
+            <param name="s">The string to be clipped</param>
+            <param name="maxStringLength">The maximum permitted length of the result string</param>
+            <param name="clipStart">The point at which to start clipping</param>
+            <returns>The clipped string</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.MsgUtils.ClipExpectedAndActual(System.String@,System.String@,System.Int32,System.Int32)">
+            <summary>
+            Clip the expected and actual strings in a coordinated fashion, 
+            so that they may be displayed together.
+            </summary>
+            <param name="expected"></param>
+            <param name="actual"></param>
+            <param name="maxDisplayLength"></param>
+            <param name="mismatch"></param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.MsgUtils.FindMismatchPosition(System.String,System.String,System.Int32,System.Boolean)">
+            <summary>
+            Shows the position two strings start to differ.  Comparison 
+            starts at the start index.
+            </summary>
+            <param name="expected">The expected string</param>
+            <param name="actual">The actual string</param>
+            <param name="istart">The index in the strings at which comparison should start</param>
+            <param name="ignoreCase">Boolean indicating whether case should be ignored</param>
+            <returns>-1 if no mismatch found, or the index where mismatch found</returns>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.NaNConstraint">
+            <summary>
+            NaNConstraint tests that the actual value is a double or float NaN
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.NaNConstraint.Matches(System.Object)">
+            <summary>
+            Test that the actual value is an NaN
+            </summary>
+            <param name="actual"></param>
+            <returns></returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.NaNConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a specified writer
+            </summary>
+            <param name="writer"></param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.NoItemConstraint">
+            <summary>
+            NoItemConstraint applies another constraint to each
+            item in a collection, failing if any of them succeeds.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.NoItemConstraint.#ctor(NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            Construct a NoItemConstraint on top of an existing constraint
+            </summary>
+            <param name="itemConstraint"></param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.NoItemConstraint.Matches(System.Object)">
+            <summary>
+            Apply the item constraint to each item in the collection,
+            failing if any item fails.
+            </summary>
+            <param name="actual"></param>
+            <returns></returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.NoItemConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write a description of this constraint to a MessageWriter
+            </summary>
+            <param name="writer"></param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.NotConstraint">
+            <summary>
+            NotConstraint negates the effect of some other constraint
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.NotConstraint.#ctor(NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            Initializes a new instance of the <see cref="T:NUnit.Framework.Constraints.NotConstraint"/> class.
+            </summary>
+            <param name="baseConstraint">The base constraint to be negated.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.NotConstraint.Matches(System.Object)">
+            <summary>
+            Test whether the constraint is satisfied by a given value
+            </summary>
+            <param name="actual">The value to be tested</param>
+            <returns>True for if the base constraint fails, false if it succeeds</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.NotConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a MessageWriter
+            </summary>
+            <param name="writer">The writer on which the description is displayed</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.NotConstraint.WriteActualValueTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the actual value for a failing constraint test to a MessageWriter.
+            </summary>
+            <param name="writer">The writer on which the actual value is displayed</param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.NullConstraint">
+            <summary>
+            NullConstraint tests that the actual value is null
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.NullConstraint.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:NullConstraint"/> class.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.NullOrEmptyStringConstraint">
+            <summary>
+            NullEmptyStringConstraint tests whether a string is either null or empty.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.NullOrEmptyStringConstraint.#ctor">
+            <summary>
+            Constructs a new NullOrEmptyStringConstraint
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.NullOrEmptyStringConstraint.Matches(System.Object)">
+            <summary>
+            Test whether the constraint is satisfied by a given value
+            </summary>
+            <param name="actual">The value to be tested</param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.NullOrEmptyStringConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a MessageWriter
+            </summary>
+            <param name="writer">The writer on which the description is displayed</param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.Numerics">
+            <summary>
+            The Numerics class contains common operations on numeric values.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.Numerics.IsNumericType(System.Object)">
+            <summary>
+            Checks the type of the object, returning true if
+            the object is a numeric type.
+            </summary>
+            <param name="obj">The object to check</param>
+            <returns>true if the object is a numeric type</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.Numerics.IsFloatingPointNumeric(System.Object)">
+            <summary>
+            Checks the type of the object, returning true if
+            the object is a floating point numeric type.
+            </summary>
+            <param name="obj">The object to check</param>
+            <returns>true if the object is a floating point numeric type</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.Numerics.IsFixedPointNumeric(System.Object)">
+            <summary>
+            Checks the type of the object, returning true if
+            the object is a fixed point numeric type.
+            </summary>
+            <param name="obj">The object to check</param>
+            <returns>true if the object is a fixed point numeric type</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.Numerics.AreEqual(System.Object,System.Object,NUnit.Framework.Constraints.Tolerance@)">
+            <summary>
+            Test two numeric values for equality, performing the usual numeric 
+            conversions and using a provided or default tolerance. If the tolerance 
+            provided is Empty, this method may set it to a default tolerance.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <param name="tolerance">A reference to the tolerance in effect</param>
+            <returns>True if the values are equal</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.Numerics.Compare(System.Object,System.Object)">
+            <summary>
+            Compare two numeric values, performing the usual numeric conversions.
+            </summary>
+            <param name="expected">The expected value</param>
+            <param name="actual">The actual value</param>
+            <returns>The relationship of the values to each other</returns>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.NUnitComparer">
+            <summary>
+            NUnitComparer encapsulates NUnit's default behavior
+            in comparing two objects.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.NUnitComparer.Compare(System.Object,System.Object)">
+            <summary>
+            Compares two objects
+            </summary>
+            <param name="x"></param>
+            <param name="y"></param>
+            <returns></returns>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.NUnitComparer.Default">
+            <summary>
+            Returns the default NUnitComparer.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.NUnitComparer`1">
+            <summary>
+            Generic version of NUnitComparer
+            </summary>
+            <typeparam name="T"></typeparam>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.NUnitComparer`1.Compare(`0,`0)">
+            <summary>
+            Compare two objects of the same type
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.NUnitEqualityComparer">
+            <summary>
+            NUnitEqualityComparer encapsulates NUnit's handling of
+            equality tests between objects.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.INUnitEqualityComparer">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.INUnitEqualityComparer.AreEqual(System.Object,System.Object,NUnit.Framework.Constraints.Tolerance@)">
+            <summary>
+            Compares two objects for equality within a tolerance
+            </summary>
+            <param name="x">The first object to compare</param>
+            <param name="y">The second object to compare</param>
+            <param name="tolerance">The tolerance to use in the comparison</param>
+            <returns></returns>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.NUnitEqualityComparer.caseInsensitive">
+            <summary>
+            If true, all string comparisons will ignore case
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.NUnitEqualityComparer.compareAsCollection">
+            <summary>
+            If true, arrays will be treated as collections, allowing
+            those of different dimensions to be compared
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.NUnitEqualityComparer.externalComparers">
+            <summary>
+            Comparison objects used in comparisons for some constraints.
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.NUnitEqualityComparer.failurePoints">
+            <summary>
+            List of points at which a failure occured.
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.NUnitEqualityComparer.recursionDetector">
+            <summary>
+            RecursionDetector used to check for recursion when
+            evaluating self-referencing enumerables.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.NUnitEqualityComparer.AreEqual(System.Object,System.Object,NUnit.Framework.Constraints.Tolerance@)">
+            <summary>
+            Compares two objects for equality within a tolerance, setting
+            the tolerance to the actual tolerance used if an empty
+            tolerance is supplied.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.NUnitEqualityComparer.ArraysEqual(System.Array,System.Array,NUnit.Framework.Constraints.Tolerance@)">
+            <summary>
+            Helper method to compare two arrays
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.NUnitEqualityComparer.DirectoriesEqual(System.IO.DirectoryInfo,System.IO.DirectoryInfo)">
+            <summary>
+            Method to compare two DirectoryInfo objects
+            </summary>
+            <param name="expected">first directory to compare</param>
+            <param name="actual">second directory to compare</param>
+            <returns>true if equivalent, false if not</returns>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.NUnitEqualityComparer.Default">
+            <summary>
+            Returns the default NUnitEqualityComparer
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.NUnitEqualityComparer.IgnoreCase">
+            <summary>
+            Gets and sets a flag indicating whether case should
+            be ignored in determining equality.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.NUnitEqualityComparer.CompareAsCollection">
+            <summary>
+            Gets and sets a flag indicating that arrays should be
+            compared as collections, without regard to their shape.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.NUnitEqualityComparer.ExternalComparers">
+            <summary>
+            Gets the list of external comparers to be used to
+            test for equality. They are applied to members of
+            collections, in place of NUnit's own logic.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.NUnitEqualityComparer.FailurePoints">
+            <summary>
+            Gets the list of failure points for the last Match performed.
+            The list consists of objects to be interpreted by the caller.
+            This generally means that the caller may only make use of
+            objects it has placed on the list at a particular depthy.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.NUnitEqualityComparer.RecursionDetector">
+            <summary>
+            RecursionDetector detects when a comparison
+            between two enumerables has reached a point
+            where the same objects that were previously
+            compared are again being compared. This allows
+            the caller to stop the comparison if desired.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.NUnitEqualityComparer.RecursionDetector.CheckRecursion(System.Collections.IEnumerable,System.Collections.IEnumerable)">
+            <summary>
+            Check whether two objects have previously
+            been compared, returning true if they have.
+            The two objects are remembered, so that a
+            second call will always return true.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.OrConstraint">
+            <summary>
+            OrConstraint succeeds if either member succeeds
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.OrConstraint.#ctor(NUnit.Framework.Constraints.Constraint,NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            Create an OrConstraint from two other constraints
+            </summary>
+            <param name="left">The first constraint</param>
+            <param name="right">The second constraint</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.OrConstraint.Matches(System.Object)">
+            <summary>
+            Apply the member constraints to an actual value, succeeding 
+            succeeding as soon as one of them succeeds.
+            </summary>
+            <param name="actual">The actual value</param>
+            <returns>True if either constraint succeeded</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.OrConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write a description for this contraint to a MessageWriter
+            </summary>
+            <param name="writer">The MessageWriter to receive the description</param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.PathConstraint">
+            <summary>
+            PathConstraint serves as the abstract base of constraints
+            that operate on paths and provides several helper methods.
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.PathConstraint.expectedPath">
+            <summary>
+            The expected path used in the constraint
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.PathConstraint.caseInsensitive">
+            <summary>
+            Flag indicating whether a caseInsensitive comparison should be made
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.PathConstraint.#ctor(System.String)">
+            <summary>
+            Construct a PathConstraint for a give expected path
+            </summary>
+            <param name="expectedPath">The expected path</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.PathConstraint.Matches(System.Object)">
+            <summary>
+            Test whether the constraint is satisfied by a given value
+            </summary>
+            <param name="actual">The value to be tested</param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.PathConstraint.IsMatch(System.String,System.String)">
+            <summary>
+            Returns true if the expected path and actual path match
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.PathConstraint.GetStringRepresentation">
+            <summary>
+            Returns the string representation of this constraint
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.PathConstraint.Canonicalize(System.String)">
+            <summary>
+            Transform the provided path to its canonical form so that it 
+            may be more easily be compared with other paths.
+            </summary>
+            <param name="path">The original path</param>
+            <returns>The path in canonical form</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.PathConstraint.IsSubPath(System.String,System.String,System.Boolean)">
+            <summary>
+            Test whether one path in canonical form is under another.
+            </summary>
+            <param name="path1">The first path - supposed to be the parent path</param>
+            <param name="path2">The second path - supposed to be the child path</param>
+            <param name="ignoreCase">Indicates whether case should be ignored</param>
+            <returns></returns>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.PathConstraint.IgnoreCase">
+            <summary>
+            Modifies the current instance to be case-insensitve
+            and returns it.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.PathConstraint.RespectCase">
+            <summary>
+            Modifies the current instance to be case-sensitve
+            and returns it.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.PredicateConstraint`1">
+            <summary>
+            Predicate constraint wraps a Predicate in a constraint,
+            returning success if the predicate is true.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.PredicateConstraint`1.#ctor(System.Predicate{`0})">
+            <summary>
+            Construct a PredicateConstraint from a predicate
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.PredicateConstraint`1.Matches(System.Object)">
+            <summary>
+            Determines whether the predicate succeeds when applied
+            to the actual value.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.PredicateConstraint`1.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Writes the description to a MessageWriter
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.PropertyConstraint">
+            <summary>
+            PropertyConstraint extracts a named property and uses
+            its value as the actual value for a chained constraint.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.PropertyConstraint.#ctor(System.String,NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            Initializes a new instance of the <see cref="T:PropertyConstraint"/> class.
+            </summary>
+            <param name="name">The name.</param>
+            <param name="baseConstraint">The constraint to apply to the property.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.PropertyConstraint.Matches(System.Object)">
+            <summary>
+            Test whether the constraint is satisfied by a given value
+            </summary>
+            <param name="actual">The value to be tested</param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.PropertyConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a MessageWriter
+            </summary>
+            <param name="writer">The writer on which the description is displayed</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.PropertyConstraint.WriteActualValueTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the actual value for a failing constraint test to a
+            MessageWriter. The default implementation simply writes
+            the raw value of actual, leaving it to the writer to
+            perform any formatting.
+            </summary>
+            <param name="writer">The writer on which the actual value is displayed</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.PropertyConstraint.GetStringRepresentation">
+            <summary>
+            Returns the string representation of the constraint.
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.PropertyExistsConstraint">
+            <summary>
+            PropertyExistsConstraint tests that a named property
+            exists on the object provided through Match.
+            
+            Originally, PropertyConstraint provided this feature
+            in addition to making optional tests on the vaue
+            of the property. The two constraints are now separate.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.PropertyExistsConstraint.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:PropertyExistConstraint"/> class.
+            </summary>
+            <param name="name">The name of the property.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.PropertyExistsConstraint.Matches(System.Object)">
+            <summary>
+            Test whether the property exists for a given object
+            </summary>
+            <param name="actual">The object to be tested</param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.PropertyExistsConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a MessageWriter
+            </summary>
+            <param name="writer">The writer on which the description is displayed</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.PropertyExistsConstraint.WriteActualValueTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the actual value for a failing constraint test to a
+            MessageWriter.
+            </summary>
+            <param name="writer">The writer on which the actual value is displayed</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.PropertyExistsConstraint.GetStringRepresentation">
+            <summary>
+            Returns the string representation of the constraint.
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.RangeConstraint`1">
+            <summary>
+            RangeConstraint tests whether two values are within a 
+            specified range.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.RangeConstraint`1.#ctor(`0,`0)">
+            <summary>
+            Initializes a new instance of the <see cref="T:RangeConstraint"/> class.
+            </summary>
+            <param name="from">From.</param>
+            <param name="to">To.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.RangeConstraint`1.Matches(System.Object)">
+            <summary>
+            Test whether the constraint is satisfied by a given value
+            </summary>
+            <param name="actual">The value to be tested</param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.RangeConstraint`1.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a MessageWriter
+            </summary>
+            <param name="writer">The writer on which the description is displayed</param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.RegexConstraint">
+            <summary>
+            RegexConstraint can test whether a string matches
+            the pattern provided.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.RegexConstraint.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:RegexConstraint"/> class.
+            </summary>
+            <param name="pattern">The pattern.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.RegexConstraint.Matches(System.String)">
+            <summary>
+            Test whether the constraint is satisfied by a given value
+            </summary>
+            <param name="actual">The value to be tested</param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.RegexConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a MessageWriter
+            </summary>
+            <param name="writer">The writer on which the description is displayed</param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.ResolvableConstraintExpression">
+            <summary>
+            ResolvableConstraintExpression is used to represent a compound
+            constraint being constructed at a point where the last operator
+            may either terminate the expression or may have additional 
+            qualifying constraints added to it. 
+            
+            It is used, for example, for a Property element or for
+            an Exception element, either of which may be optionally
+            followed by constraints that apply to the property or 
+            exception.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ResolvableConstraintExpression.#ctor">
+            <summary>
+            Create a new instance of ResolvableConstraintExpression
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ResolvableConstraintExpression.#ctor(NUnit.Framework.Constraints.ConstraintBuilder)">
+            <summary>
+            Create a new instance of ResolvableConstraintExpression,
+            passing in a pre-populated ConstraintBuilder.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ResolvableConstraintExpression.NUnit#Framework#Constraints#IResolveConstraint#Resolve">
+            <summary>
+            Resolve the current expression to a Constraint
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ResolvableConstraintExpression.op_BitwiseAnd(NUnit.Framework.Constraints.ResolvableConstraintExpression,NUnit.Framework.Constraints.ResolvableConstraintExpression)">
+            <summary>
+            This operator creates a constraint that is satisfied only if both 
+            argument constraints are satisfied.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ResolvableConstraintExpression.op_BitwiseAnd(NUnit.Framework.Constraints.Constraint,NUnit.Framework.Constraints.ResolvableConstraintExpression)">
+            <summary>
+            This operator creates a constraint that is satisfied only if both 
+            argument constraints are satisfied.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ResolvableConstraintExpression.op_BitwiseAnd(NUnit.Framework.Constraints.ResolvableConstraintExpression,NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            This operator creates a constraint that is satisfied only if both 
+            argument constraints are satisfied.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ResolvableConstraintExpression.op_BitwiseOr(NUnit.Framework.Constraints.ResolvableConstraintExpression,NUnit.Framework.Constraints.ResolvableConstraintExpression)">
+            <summary>
+            This operator creates a constraint that is satisfied if either 
+            of the argument constraints is satisfied.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ResolvableConstraintExpression.op_BitwiseOr(NUnit.Framework.Constraints.ResolvableConstraintExpression,NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            This operator creates a constraint that is satisfied if either 
+            of the argument constraints is satisfied.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ResolvableConstraintExpression.op_BitwiseOr(NUnit.Framework.Constraints.Constraint,NUnit.Framework.Constraints.ResolvableConstraintExpression)">
+            <summary>
+            This operator creates a constraint that is satisfied if either 
+            of the argument constraints is satisfied.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ResolvableConstraintExpression.op_LogicalNot(NUnit.Framework.Constraints.ResolvableConstraintExpression)">
+            <summary>
+            This operator creates a constraint that is satisfied if the 
+            argument constraint is not satisfied.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ResolvableConstraintExpression.And">
+            <summary>
+            Appends an And Operator to the expression
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ResolvableConstraintExpression.Or">
+            <summary>
+            Appends an Or operator to the expression.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.ReusableConstraint">
+            <summary>
+            ReusableConstraint wraps a constraint expression after 
+            resolving it so that it can be reused consistently.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ReusableConstraint.#ctor(NUnit.Framework.Constraints.IResolveConstraint)">
+            <summary>
+            Construct a ReusableConstraint from a constraint expression
+            </summary>
+            <param name="c">The expression to be resolved and reused</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ReusableConstraint.op_Implicit(NUnit.Framework.Constraints.Constraint)~NUnit.Framework.Constraints.ReusableConstraint">
+            <summary>
+            Converts a constraint to a ReusableConstraint
+            </summary>
+            <param name="c">The constraint to be converted</param>
+            <returns>A ReusableConstraint</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ReusableConstraint.ToString">
+            <summary>
+            Returns the string representation of the constraint.
+            </summary>
+            <returns>A string representing the constraint</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ReusableConstraint.Resolve">
+            <summary>
+            Resolves the ReusableConstraint by returning the constraint
+            that it originally wrapped.
+            </summary>
+            <returns>A resolved constraint</returns>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.SameAsConstraint">
+            <summary>
+            SameAsConstraint tests whether an object is identical to
+            the object passed to its constructor
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.SameAsConstraint.#ctor(System.Object)">
+            <summary>
+            Initializes a new instance of the <see cref="T:SameAsConstraint"/> class.
+            </summary>
+            <param name="expected">The expected object.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.SameAsConstraint.Matches(System.Object)">
+            <summary>
+            Test whether the constraint is satisfied by a given value
+            </summary>
+            <param name="actual">The value to be tested</param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.SameAsConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a MessageWriter
+            </summary>
+            <param name="writer">The writer on which the description is displayed</param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.SamePathConstraint">
+            <summary>
+            Summary description for SamePathConstraint.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.SamePathConstraint.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:SamePathConstraint"/> class.
+            </summary>
+            <param name="expected">The expected path</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.SamePathConstraint.IsMatch(System.String,System.String)">
+            <summary>
+            Test whether the constraint is satisfied by a given value
+            </summary>
+            <param name="expectedPath">The expected path</param>
+            <param name="actualPath">The actual path</param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.SamePathConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a MessageWriter
+            </summary>
+            <param name="writer">The writer on which the description is displayed</param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.SamePathOrUnderConstraint">
+            <summary>
+            SamePathOrUnderConstraint tests that one path is under another
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.SamePathOrUnderConstraint.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:SamePathOrUnderConstraint"/> class.
+            </summary>
+            <param name="expected">The expected path</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.SamePathOrUnderConstraint.IsMatch(System.String,System.String)">
+            <summary>
+            Test whether the constraint is satisfied by a given value
+            </summary>
+            <param name="expectedPath">The expected path</param>
+            <param name="actualPath">The actual path</param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.SamePathOrUnderConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a MessageWriter
+            </summary>
+            <param name="writer">The writer on which the description is displayed</param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.SomeItemsConstraint">
+            <summary>
+            SomeItemsConstraint applies another constraint to each
+            item in a collection, succeeding if any of them succeeds.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.SomeItemsConstraint.#ctor(NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            Construct a SomeItemsConstraint on top of an existing constraint
+            </summary>
+            <param name="itemConstraint"></param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.SomeItemsConstraint.Matches(System.Object)">
+            <summary>
+            Apply the item constraint to each item in the collection,
+            succeeding if any item succeeds.
+            </summary>
+            <param name="actual"></param>
+            <returns></returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.SomeItemsConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write a description of this constraint to a MessageWriter
+            </summary>
+            <param name="writer"></param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.StartsWithConstraint">
+            <summary>
+            StartsWithConstraint can test whether a string starts
+            with an expected substring.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.StartsWithConstraint.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:StartsWithConstraint"/> class.
+            </summary>
+            <param name="expected">The expected string</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.StartsWithConstraint.Matches(System.String)">
+            <summary>
+            Test whether the constraint is matched by the actual value.
+            This is a template method, which calls the IsMatch method
+            of the derived class.
+            </summary>
+            <param name="actual"></param>
+            <returns></returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.StartsWithConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a MessageWriter
+            </summary>
+            <param name="writer">The writer on which the description is displayed</param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.SubPathConstraint">
+            <summary>
+            SubPathConstraint tests that the actual path is under the expected path
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.SubPathConstraint.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:SubPathConstraint"/> class.
+            </summary>
+            <param name="expected">The expected path</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.SubPathConstraint.IsMatch(System.String,System.String)">
+            <summary>
+            Test whether the constraint is satisfied by a given value
+            </summary>
+            <param name="expectedPath">The expected path</param>
+            <param name="actualPath">The actual path</param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.SubPathConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a MessageWriter
+            </summary>
+            <param name="writer">The writer on which the description is displayed</param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.SubstringConstraint">
+            <summary>
+            SubstringConstraint can test whether a string contains
+            the expected substring.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.SubstringConstraint.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:SubstringConstraint"/> class.
+            </summary>
+            <param name="expected">The expected.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.SubstringConstraint.Matches(System.String)">
+            <summary>
+            Test whether the constraint is satisfied by a given value
+            </summary>
+            <param name="actual">The value to be tested</param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.SubstringConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a MessageWriter
+            </summary>
+            <param name="writer">The writer on which the description is displayed</param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.ThrowsConstraint">
+            <summary>
+            ThrowsConstraint is used to test the exception thrown by 
+            a delegate by applying a constraint to it.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ThrowsConstraint.#ctor(NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            Initializes a new instance of the <see cref="T:NUnit.Framework.Constraints.ThrowsConstraint"/> class,
+            using a constraint to be applied to the exception.
+            </summary>
+            <param name="baseConstraint">A constraint to apply to the caught exception.</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ThrowsConstraint.Matches(System.Object)">
+            <summary>
+            Executes the code of the delegate and captures any exception.
+            If a non-null base constraint was provided, it applies that
+            constraint to the exception.
+            </summary>
+            <param name="actual">A delegate representing the code to be tested</param>
+            <returns>True if an exception is thrown and the constraint succeeds, otherwise false</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ThrowsConstraint.Matches``1(NUnit.Framework.Constraints.ActualValueDelegate{``0})">
+            <summary>
+            Converts an ActualValueDelegate to a TestDelegate
+            before calling the primary overload.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ThrowsConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a MessageWriter
+            </summary>
+            <param name="writer">The writer on which the description is displayed</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ThrowsConstraint.WriteActualValueTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the actual value for a failing constraint test to a
+            MessageWriter. The default implementation simply writes
+            the raw value of actual, leaving it to the writer to
+            perform any formatting.
+            </summary>
+            <param name="writer">The writer on which the actual value is displayed</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ThrowsConstraint.GetStringRepresentation">
+            <summary>
+            Returns the string representation of this constraint
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ThrowsConstraint.ActualException">
+            <summary>
+            Get the actual exception thrown - used by Assert.Throws.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.ThrowsNothingConstraint">
+            <summary>
+            ThrowsNothingConstraint tests that a delegate does not
+            throw an exception.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ThrowsNothingConstraint.Matches(System.Object)">
+            <summary>
+            Test whether the constraint is satisfied by a given value
+            </summary>
+            <param name="actual">The value to be tested</param>
+            <returns>True if no exception is thrown, otherwise false</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ThrowsNothingConstraint.Matches``1(NUnit.Framework.Constraints.ActualValueDelegate{``0})">
+            <summary>
+            Test whether the constraint is satisfied by a given delegate
+            </summary>
+            <param name="del">Delegate returning the value to be tested</param>
+            <returns>True if no exception is thrown, otherwise false</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ThrowsNothingConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a MessageWriter
+            </summary>
+            <param name="writer">The writer on which the description is displayed</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ThrowsNothingConstraint.WriteActualValueTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the actual value for a failing constraint test to a
+            MessageWriter. Overridden in ThrowsNothingConstraint to write 
+            information about the exception that was actually caught.
+            </summary>
+            <param name="writer">The writer on which the actual value is displayed</param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.Tolerance">
+            <summary>
+            The Tolerance class generalizes the notion of a tolerance
+            within which an equality test succeeds. Normally, it is
+            used with numeric types, but it can be used with any
+            type that supports taking a difference between two 
+            objects and comparing that difference to a value.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.Tolerance.#ctor(System.Object)">
+            <summary>
+            Constructs a linear tolerance of a specdified amount
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.Tolerance.#ctor(System.Object,NUnit.Framework.Constraints.ToleranceMode)">
+            <summary>
+            Constructs a tolerance given an amount and ToleranceMode
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.Tolerance.CheckLinearAndNumeric">
+            <summary>
+            Tests that the current Tolerance is linear with a 
+            numeric value, throwing an exception if it is not.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.Tolerance.Empty">
+            <summary>
+            Returns an empty Tolerance object, equivalent to
+            specifying no tolerance. In most cases, it results
+            in an exact match but for floats and doubles a
+            default tolerance may be used.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.Tolerance.Zero">
+            <summary>
+            Returns a zero Tolerance object, equivalent to 
+            specifying an exact match.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.Tolerance.Mode">
+            <summary>
+            Gets the ToleranceMode for the current Tolerance
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.Tolerance.Value">
+            <summary>
+            Gets the value of the current Tolerance instance.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.Tolerance.Percent">
+            <summary>
+            Returns a new tolerance, using the current amount as a percentage.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.Tolerance.Ulps">
+            <summary>
+            Returns a new tolerance, using the current amount in Ulps.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.Tolerance.Days">
+            <summary>
+            Returns a new tolerance with a TimeSpan as the amount, using 
+            the current amount as a number of days.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.Tolerance.Hours">
+            <summary>
+            Returns a new tolerance with a TimeSpan as the amount, using 
+            the current amount as a number of hours.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.Tolerance.Minutes">
+            <summary>
+            Returns a new tolerance with a TimeSpan as the amount, using 
+            the current amount as a number of minutes.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.Tolerance.Seconds">
+            <summary>
+            Returns a new tolerance with a TimeSpan as the amount, using 
+            the current amount as a number of seconds.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.Tolerance.Milliseconds">
+            <summary>
+            Returns a new tolerance with a TimeSpan as the amount, using 
+            the current amount as a number of milliseconds.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.Tolerance.Ticks">
+            <summary>
+            Returns a new tolerance with a TimeSpan as the amount, using 
+            the current amount as a number of clock ticks.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.Tolerance.IsEmpty">
+            <summary>
+            Returns true if the current tolerance is empty.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.ToleranceMode">
+            <summary>
+            Modes in which the tolerance value for a comparison can be interpreted.
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.ToleranceMode.None">
+            <summary>
+            The tolerance was created with a value, without specifying 
+            how the value would be used. This is used to prevent setting
+            the mode more than once and is generally changed to Linear
+            upon execution of the test.
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.ToleranceMode.Linear">
+            <summary>
+            The tolerance is used as a numeric range within which
+            two compared values are considered to be equal.
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.ToleranceMode.Percent">
+            <summary>
+            Interprets the tolerance as the percentage by which
+            the two compared values my deviate from each other.
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.ToleranceMode.Ulps">
+            <summary>
+            Compares two values based in their distance in
+            representable numbers.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.TrueConstraint">
+            <summary>
+            TrueConstraint tests that the actual value is true
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.TrueConstraint.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:TrueConstraint"/> class.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.UniqueItemsConstraint">
+            <summary>
+            UniqueItemsConstraint tests whether all the items in a 
+            collection are unique.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.UniqueItemsConstraint.doMatch(System.Collections.IEnumerable)">
+            <summary>
+            Check that all items are unique.
+            </summary>
+            <param name="actual"></param>
+            <returns></returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.UniqueItemsConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write a description of this constraint to a MessageWriter
+            </summary>
+            <param name="writer"></param>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.XmlSerializableConstraint">
+            <summary>
+            XmlSerializableConstraint tests whether 
+            an object is serializable in XML format.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.XmlSerializableConstraint.Matches(System.Object)">
+            <summary>
+            Test whether the constraint is satisfied by a given value
+            </summary>
+            <param name="actual">The value to be tested</param>
+            <returns>True for success, false for failure</returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.XmlSerializableConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the constraint description to a MessageWriter
+            </summary>
+            <param name="writer">The writer on which the description is displayed</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.XmlSerializableConstraint.WriteActualValueTo(NUnit.Framework.Constraints.MessageWriter)">
+            <summary>
+            Write the actual value for a failing constraint test to a
+            MessageWriter. The default implementation simply writes
+            the raw value of actual, leaving it to the writer to
+            perform any formatting.
+            </summary>
+            <param name="writer">The writer on which the actual value is displayed</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.XmlSerializableConstraint.GetStringRepresentation">
+            <summary>
+            Returns the string representation of this constraint
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.AllOperator">
+            <summary>
+            Represents a constraint that succeeds if all the 
+            members of a collection match a base constraint.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.CollectionOperator">
+            <summary>
+            Abstract base for operators that indicate how to
+            apply a constraint to items in a collection.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.PrefixOperator">
+            <summary>
+            PrefixOperator takes a single constraint and modifies
+            it's action in some way.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.ConstraintOperator">
+            <summary>
+            The ConstraintOperator class is used internally by a
+            ConstraintBuilder to represent an operator that 
+            modifies or combines constraints. 
+            
+            Constraint operators use left and right precedence
+            values to determine whether the top operator on the
+            stack should be reduced before pushing a new operator.
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.ConstraintOperator.left_precedence">
+            <summary>
+            The precedence value used when the operator
+            is about to be pushed to the stack.
+            </summary>
+        </member>
+        <member name="F:NUnit.Framework.Constraints.ConstraintOperator.right_precedence">
+            <summary>
+            The precedence value used when the operator
+            is on the top of the stack.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ConstraintOperator.Reduce(NUnit.Framework.Constraints.ConstraintBuilder.ConstraintStack)">
+            <summary>
+            Reduce produces a constraint from the operator and 
+            any arguments. It takes the arguments from the constraint 
+            stack and pushes the resulting constraint on it.
+            </summary>
+            <param name="stack"></param>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintOperator.LeftContext">
+            <summary>
+            The syntax element preceding this operator
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintOperator.RightContext">
+            <summary>
+            The syntax element folowing this operator
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintOperator.LeftPrecedence">
+            <summary>
+            The precedence value used when the operator
+            is about to be pushed to the stack.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.ConstraintOperator.RightPrecedence">
+            <summary>
+            The precedence value used when the operator
+            is on the top of the stack.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.PrefixOperator.Reduce(NUnit.Framework.Constraints.ConstraintBuilder.ConstraintStack)">
+            <summary>
+            Reduce produces a constraint from the operator and 
+            any arguments. It takes the arguments from the constraint 
+            stack and pushes the resulting constraint on it.
+            </summary>
+            <param name="stack"></param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.PrefixOperator.ApplyPrefix(NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            Returns the constraint created by applying this
+            prefix to another constraint.
+            </summary>
+            <param name="constraint"></param>
+            <returns></returns>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.CollectionOperator.#ctor">
+            <summary>
+            Constructs a CollectionOperator
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.AllOperator.ApplyPrefix(NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            Returns a constraint that will apply the argument
+            to the members of a collection, succeeding if
+            they all succeed.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.AndOperator">
+            <summary>
+            Operator that requires both it's arguments to succeed
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.BinaryOperator">
+            <summary>
+            Abstract base class for all binary operators
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.BinaryOperator.Reduce(NUnit.Framework.Constraints.ConstraintBuilder.ConstraintStack)">
+            <summary>
+            Reduce produces a constraint from the operator and 
+            any arguments. It takes the arguments from the constraint 
+            stack and pushes the resulting constraint on it.
+            </summary>
+            <param name="stack"></param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.BinaryOperator.ApplyOperator(NUnit.Framework.Constraints.Constraint,NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            Abstract method that produces a constraint by applying
+            the operator to its left and right constraint arguments.
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.BinaryOperator.LeftPrecedence">
+            <summary>
+            Gets the left precedence of the operator
+            </summary>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.BinaryOperator.RightPrecedence">
+            <summary>
+            Gets the right precedence of the operator
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.AndOperator.#ctor">
+            <summary>
+            Construct an AndOperator
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.AndOperator.ApplyOperator(NUnit.Framework.Constraints.Constraint,NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            Apply the operator to produce an AndConstraint
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.AttributeOperator">
+            <summary>
+            Operator that tests for the presence of a particular attribute
+            on a type and optionally applies further tests to the attribute.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.SelfResolvingOperator">
+            <summary>
+            Abstract base class for operators that are able to reduce to a 
+            constraint whether or not another syntactic element follows.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.AttributeOperator.#ctor(System.Type)">
+            <summary>
+            Construct an AttributeOperator for a particular Type
+            </summary>
+            <param name="type">The Type of attribute tested</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.AttributeOperator.Reduce(NUnit.Framework.Constraints.ConstraintBuilder.ConstraintStack)">
+            <summary>
+            Reduce produces a constraint from the operator and 
+            any arguments. It takes the arguments from the constraint 
+            stack and pushes the resulting constraint on it.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.ExactCountOperator">
+            <summary>
+            Represents a constraint that succeeds if the specified 
+            count of members of a collection match a base constraint.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ExactCountOperator.#ctor(System.Int32)">
+            <summary>
+            Construct an ExactCountOperator for a specified count
+            </summary>
+            <param name="expectedCount">The expected count</param>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ExactCountOperator.ApplyPrefix(NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            Returns a constraint that will apply the argument
+            to the members of a collection, succeeding if
+            none of them succeed.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.NoneOperator">
+            <summary>
+            Represents a constraint that succeeds if none of the 
+            members of a collection match a base constraint.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.NoneOperator.ApplyPrefix(NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            Returns a constraint that will apply the argument
+            to the members of a collection, succeeding if
+            none of them succeed.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.NotOperator">
+            <summary>
+            Negates the test of the constraint it wraps.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.NotOperator.#ctor">
+            <summary>
+            Constructs a new NotOperator
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.NotOperator.ApplyPrefix(NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            Returns a NotConstraint applied to its argument.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.OrOperator">
+            <summary>
+            Operator that requires at least one of it's arguments to succeed
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.OrOperator.#ctor">
+            <summary>
+            Construct an OrOperator
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.OrOperator.ApplyOperator(NUnit.Framework.Constraints.Constraint,NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            Apply the operator to produce an OrConstraint
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.PropOperator">
+            <summary>
+            Operator used to test for the presence of a named Property
+            on an object and optionally apply further tests to the
+            value of that property.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.PropOperator.#ctor(System.String)">
+            <summary>
+            Constructs a PropOperator for a particular named property
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.PropOperator.Reduce(NUnit.Framework.Constraints.ConstraintBuilder.ConstraintStack)">
+            <summary>
+            Reduce produces a constraint from the operator and 
+            any arguments. It takes the arguments from the constraint 
+            stack and pushes the resulting constraint on it.
+            </summary>
+            <param name="stack"></param>
+        </member>
+        <member name="P:NUnit.Framework.Constraints.PropOperator.Name">
+            <summary>
+            Gets the name of the property to which the operator applies
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.SomeOperator">
+            <summary>
+            Represents a constraint that succeeds if any of the 
+            members of a collection match a base constraint.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.SomeOperator.ApplyPrefix(NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            Returns a constraint that will apply the argument
+            to the members of a collection, succeeding if
+            any of them succeed.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.ThrowsOperator">
+            <summary>
+            Operator that tests that an exception is thrown and
+            optionally applies further tests to the exception.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ThrowsOperator.#ctor">
+            <summary>
+            Construct a ThrowsOperator
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.ThrowsOperator.Reduce(NUnit.Framework.Constraints.ConstraintBuilder.ConstraintStack)">
+            <summary>
+            Reduce produces a constraint from the operator and 
+            any arguments. It takes the arguments from the constraint 
+            stack and pushes the resulting constraint on it.
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.Constraints.WithOperator">
+            <summary>
+            Represents a constraint that simply wraps the
+            constraint provided as an argument, without any
+            further functionality, but which modifes the
+            order of evaluation because of its precedence.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.WithOperator.#ctor">
+            <summary>
+            Constructor for the WithOperator
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.Constraints.WithOperator.ApplyPrefix(NUnit.Framework.Constraints.Constraint)">
+            <summary>
+            Returns a constraint that wraps its argument
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.AssertionException">
+            <summary>
+            Thrown when an assertion failed.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.AssertionException.#ctor(System.String)">
+            <param name="message">The error message that explains 
+            the reason for the exception</param>
+        </member>
+        <member name="M:NUnit.Framework.AssertionException.#ctor(System.String,System.Exception)">
+            <param name="message">The error message that explains 
+            the reason for the exception</param>
+            <param name="inner">The exception that caused the 
+            current exception</param>
+        </member>
+        <member name="M:NUnit.Framework.AssertionException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Serialization Constructor
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.IgnoreException">
+            <summary>
+            Thrown when an assertion failed.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.IgnoreException.#ctor(System.String)">
+            <param name="message"></param>
+        </member>
+        <member name="M:NUnit.Framework.IgnoreException.#ctor(System.String,System.Exception)">
+            <param name="message">The error message that explains 
+            the reason for the exception</param>
+            <param name="inner">The exception that caused the 
+            current exception</param>
+        </member>
+        <member name="M:NUnit.Framework.IgnoreException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Serialization Constructor
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.InconclusiveException">
+            <summary>
+            Thrown when a test executes inconclusively.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.InconclusiveException.#ctor(System.String)">
+            <param name="message">The error message that explains 
+            the reason for the exception</param>
+        </member>
+        <member name="M:NUnit.Framework.InconclusiveException.#ctor(System.String,System.Exception)">
+            <param name="message">The error message that explains 
+            the reason for the exception</param>
+            <param name="inner">The exception that caused the 
+            current exception</param>
+        </member>
+        <member name="M:NUnit.Framework.InconclusiveException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Serialization Constructor
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.SuccessException">
+            <summary>
+            Thrown when an assertion failed.
+            </summary>
+        </member>
+        <member name="M:NUnit.Framework.SuccessException.#ctor(System.String)">
+            <param name="message"></param>
+        </member>
+        <member name="M:NUnit.Framework.SuccessException.#ctor(System.String,System.Exception)">
+            <param name="message">The error message that explains 
+            the reason for the exception</param>
+            <param name="inner">The exception that caused the 
+            current exception</param>
+        </member>
+        <member name="M:NUnit.Framework.SuccessException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Serialization Constructor
+            </summary>
+        </member>
+        <member name="T:NUnit.Framework.INUnitEqualityComparer`1">
+            <summary>
+            
+            </summary>
+            <typeparam name="T"></typeparam>
+        </member>
+        <member name="M:NUnit.Framework.INUnitEqualityComparer`1.AreEqual(`0,`0,NUnit.Framework.Constraints.Tolerance@)">
+            <summary>
+            Compares two objects of a given Type for equality within a tolerance
+            </summary>
+            <param name="x">The first object to compare</param>
+            <param name="y">The second object to compare</param>
+            <param name="tolerance">The tolerance to use in the comparison</param>
+            <returns></returns>
+        </member>
+    </members>
+</doc>
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.4/license.txt b/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.4/license.txt
new file mode 100644
index 00000000000..3b2ad7401fd
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.4/license.txt
@@ -0,0 +1,15 @@
+Copyright © 2002-2014 Charlie Poole
+Copyright © 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov
+Copyright © 2000-2002 Philip A. Craig
+
+This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment (see the following) in the product documentation is required.
+
+Portions Copyright © 2002-2014 Charlie Poole or Copyright © 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov or Copyright © 2000-2002 Philip A. Craig
+
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/packages/repositories.config b/samples/client/petstore/csharp/SwaggerClientTest/packages/repositories.config
new file mode 100644
index 00000000000..ba8d0d576a8
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/packages/repositories.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<repositories>
+  <repository path="../packages.config" />
+</repositories>
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/bin/Newtonsoft.Json.dll b/samples/client/petstore/csharp/bin/Newtonsoft.Json.dll
deleted file mode 100644
index 26fdaffec14..00000000000
Binary files a/samples/client/petstore/csharp/bin/Newtonsoft.Json.dll and /dev/null differ
diff --git a/samples/client/petstore/csharp/bin/RestSharp.dll b/samples/client/petstore/csharp/bin/RestSharp.dll
deleted file mode 100644
index c1da1b588cd..00000000000
Binary files a/samples/client/petstore/csharp/bin/RestSharp.dll and /dev/null differ
diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/PetApi.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/PetApi.cs
deleted file mode 100644
index 44cd63d4fc7..00000000000
--- a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/PetApi.cs
+++ /dev/null
@@ -1,808 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using RestSharp;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace IO.Swagger.Api {
-  
-
-  public interface IPetApi {
-    
-    /// <summary>
-    /// Update an existing pet 
-    /// </summary>
-    /// <param name="Body">Pet object that needs to be added to the store</param>
-    /// <returns></returns>
-    void UpdatePet (Pet Body);
-
-    /// <summary>
-    /// Update an existing pet 
-    /// </summary>
-    /// <param name="Body">Pet object that needs to be added to the store</param>
-    /// <returns></returns>
-    Task UpdatePetAsync (Pet Body);
-    
-    /// <summary>
-    /// Add a new pet to the store 
-    /// </summary>
-    /// <param name="Body">Pet object that needs to be added to the store</param>
-    /// <returns></returns>
-    void AddPet (Pet Body);
-
-    /// <summary>
-    /// Add a new pet to the store 
-    /// </summary>
-    /// <param name="Body">Pet object that needs to be added to the store</param>
-    /// <returns></returns>
-    Task AddPetAsync (Pet Body);
-    
-    /// <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>List<Pet></returns>
-    List<Pet> FindPetsByStatus (List<string> Status);
-
-    /// <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>List<Pet></returns>
-    Task<List<Pet>> FindPetsByStatusAsync (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>
-    List<Pet> FindPetsByTags (List<string> Tags);
-
-    /// <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>
-    Task<List<Pet>> FindPetsByTagsAsync (List<string> Tags);
-    
-    /// <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>
-    Pet GetPetById (long? PetId);
-
-    /// <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>
-    Task<Pet> GetPetByIdAsync (long? PetId);
-    
-    /// <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>
-    /// <returns></returns>
-    void UpdatePetWithForm (string PetId, string Name, string Status);
-
-    /// <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>
-    /// <returns></returns>
-    Task UpdatePetWithFormAsync (string PetId, string Name, string Status);
-    
-    /// <summary>
-    /// Deletes a pet 
-    /// </summary>
-    /// <param name="ApiKey"></param>/// <param name="PetId">Pet id to delete</param>
-    /// <returns></returns>
-    void DeletePet (string ApiKey, long? PetId);
-
-    /// <summary>
-    /// Deletes a pet 
-    /// </summary>
-    /// <param name="ApiKey"></param>/// <param name="PetId">Pet id to delete</param>
-    /// <returns></returns>
-    Task DeletePetAsync (string ApiKey, long? PetId);
-    
-    /// <summary>
-    /// uploads an image 
-    /// </summary>
-    /// <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, string File);
-
-    /// <summary>
-    /// uploads an image 
-    /// </summary>
-    /// <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>
-    Task UploadFileAsync (long? PetId, string AdditionalMetadata, string File);
-    
-  }
-
-  /// <summary>
-  /// Represents a collection of functions to interact with the API endpoints
-  /// </summary>
-  public class PetApi : IPetApi {
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="PetApi"/> class.
-    /// </summary>
-    /// <param name="apiClient"> an instance of ApiClient (optional)
-    /// <returns></returns>
-    public PetApi(ApiClient apiClient = null) {
-      if (apiClient == null) { // use the default one in Configuration
-        this.apiClient = Configuration.apiClient; 
-      } else {
-        this.apiClient = apiClient;
-      }
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="PetApi"/> class.
-    /// </summary>
-    /// <returns></returns>
-    public PetApi(String basePath)
-    {
-      this.apiClient = new ApiClient(basePath);
-    }
-
-    /// <summary>
-    /// Sets the base path of the API client.
-    /// </summary>
-    /// <value>The base path</value>
-    public void SetBasePath(String basePath) {
-      this.apiClient.basePath = basePath;
-    }
-
-    /// <summary>
-    /// Gets the base path of the API client.
-    /// </summary>
-    /// <value>The base path</value>
-    public String GetBasePath(String basePath) {
-      return this.apiClient.basePath;
-    }
-
-    /// <summary>
-    /// Gets or sets the API client.
-    /// </summary>
-    /// <value>The API client</value>
-    public ApiClient apiClient {get; set;}
-
-
-    
-    /// <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) {
-
-      
-
-      var path = "/pet";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = apiClient.Serialize(Body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling UpdatePet: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-	
-	 /// <summary>
-    /// Update an existing pet 
-    /// </summary>
-    /// <param name="Body">Pet object that needs to be added to the store</param>
-    /// <returns></returns>
-    public async Task UpdatePetAsync (Pet Body) {
-
-      
-
-      var path = "/pet";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = apiClient.Serialize(Body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling UpdatePet: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-    
-    /// <summary>
-    /// Add a new pet to the store 
-    /// </summary>
-    /// <param name="Body">Pet object that needs to be added to the store</param>
-    /// <returns></returns>
-    public void AddPet (Pet Body) {
-
-      
-
-      var path = "/pet";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = apiClient.Serialize(Body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling AddPet: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-	
-	 /// <summary>
-    /// Add a new pet to the store 
-    /// </summary>
-    /// <param name="Body">Pet object that needs to be added to the store</param>
-    /// <returns></returns>
-    public async Task AddPetAsync (Pet Body) {
-
-      
-
-      var path = "/pet";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = apiClient.Serialize(Body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling AddPet: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-    
-    /// <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>List<Pet></returns>
-    public List<Pet> FindPetsByStatus (List<string> Status) {
-
-      
-
-      var path = "/pet/findByStatus";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-       if (Status != null) queryParams.Add("status", apiClient.ParameterToString(Status)); // query parameter
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByStatus: " + response.Content, response.Content);
-      }
-      return (List<Pet>) apiClient.Deserialize(response.Content, 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>List<Pet></returns>
-    public async Task<List<Pet>> FindPetsByStatusAsync (List<string> Status) {
-
-      
-
-      var path = "/pet/findByStatus";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-       if (Status != null) queryParams.Add("status", apiClient.ParameterToString(Status)); // query parameter
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByStatus: " + response.Content, response.Content);
-      }
-      return (List<Pet>) apiClient.Deserialize(response.Content, 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<Pet></returns>
-    public List<Pet> FindPetsByTags (List<string> Tags) {
-
-      
-
-      var path = "/pet/findByTags";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-       if (Tags != null) queryParams.Add("tags", apiClient.ParameterToString(Tags)); // query parameter
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByTags: " + response.Content, response.Content);
-      }
-      return (List<Pet>) apiClient.Deserialize(response.Content, 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<Pet></returns>
-    public async Task<List<Pet>> FindPetsByTagsAsync (List<string> Tags) {
-
-      
-
-      var path = "/pet/findByTags";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-       if (Tags != null) queryParams.Add("tags", apiClient.ParameterToString(Tags)); // query parameter
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByTags: " + response.Content, response.Content);
-      }
-      return (List<Pet>) apiClient.Deserialize(response.Content, 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) {
-
-      
-      // 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}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", apiClient.ParameterToString(PetId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth", "api_key" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling GetPetById: " + response.Content, response.Content);
-      }
-      return (Pet) apiClient.Deserialize(response.Content, 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>Pet</returns>
-    public async Task<Pet> GetPetByIdAsync (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}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", apiClient.ParameterToString(PetId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth", "api_key" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling GetPetById: " + response.Content, response.Content);
-      }
-      return (Pet) apiClient.Deserialize(response.Content, 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>
-    /// <returns></returns>
-    public void UpdatePetWithForm (string PetId, string Name, string Status) {
-
-      
-      // 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}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", apiClient.ParameterToString(PetId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      if (Name != null) formParams.Add("name", apiClient.ParameterToString(Name)); // form parameter
-      if (Status != null) formParams.Add("status", apiClient.ParameterToString(Status)); // form parameter
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling UpdatePetWithForm: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-	
-	 /// <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>
-    /// <returns></returns>
-    public async Task UpdatePetWithFormAsync (string PetId, string Name, string Status) {
-
-      
-          // 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}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", apiClient.ParameterToString(PetId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      if (Name != null) formParams.Add("name", apiClient.ParameterToString(Name)); // form parameter
-      if (Status != null) formParams.Add("status", apiClient.ParameterToString(Status)); // form parameter
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling UpdatePetWithForm: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-    
-    /// <summary>
-    /// Deletes a pet 
-    /// </summary>
-    /// <param name="ApiKey"></param>/// <param name="PetId">Pet id to delete</param>
-    /// <returns></returns>
-    public void DeletePet (string ApiKey, long? PetId) {
-
-      
-      // verify the required parameter 'PetId' is set
-      if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling DeletePet");
-      
-
-      var path = "/pet/{petId}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", apiClient.ParameterToString(PetId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-       if (ApiKey != null) headerParams.Add("api_key", apiClient.ParameterToString(ApiKey)); // header parameter
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling DeletePet: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-	
-	 /// <summary>
-    /// Deletes a pet 
-    /// </summary>
-    /// <param name="ApiKey"></param>/// <param name="PetId">Pet id to delete</param>
-    /// <returns></returns>
-    public async Task DeletePetAsync (string ApiKey, long? PetId) {
-
-      
-          // verify the required parameter 'PetId' is set
-          if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling DeletePet");
-      
-
-      var path = "/pet/{petId}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", apiClient.ParameterToString(PetId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-       if (ApiKey != null) headerParams.Add("api_key", apiClient.ParameterToString(ApiKey)); // header parameter
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling DeletePet: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-    
-    /// <summary>
-    /// uploads an image 
-    /// </summary>
-    /// <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>
-    public void UploadFile (long? PetId, string AdditionalMetadata, string File) {
-
-      
-      // verify the required parameter 'PetId' is set
-      if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling UploadFile");
-      
-
-      var path = "/pet/{petId}/uploadImage";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", apiClient.ParameterToString(PetId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      if (AdditionalMetadata != null) formParams.Add("additionalMetadata", apiClient.ParameterToString(AdditionalMetadata)); // form parameter
-      if (File != null) fileParams.Add("file", File);
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling UploadFile: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-	
-	 /// <summary>
-    /// uploads an image 
-    /// </summary>
-    /// <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>
-    public async Task UploadFileAsync (long? PetId, string AdditionalMetadata, string File) {
-
-      
-          // verify the required parameter 'PetId' is set
-          if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling UploadFile");
-      
-
-      var path = "/pet/{petId}/uploadImage";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", apiClient.ParameterToString(PetId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      if (AdditionalMetadata != null) formParams.Add("additionalMetadata", apiClient.ParameterToString(AdditionalMetadata)); // form parameter
-      if (File != null) fileParams.Add("file", File);
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling UploadFile: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-    
-  }  
-  
-}
diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/StoreApi.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/StoreApi.cs
deleted file mode 100644
index 739c9d30be3..00000000000
--- a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/StoreApi.cs
+++ /dev/null
@@ -1,428 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using RestSharp;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace IO.Swagger.Api {
-  
-
-  public interface IStoreApi {
-    
-    /// <summary>
-    /// Returns pet inventories by status Returns a map of status codes to quantities
-    /// </summary>
-    
-    /// <returns>Dictionary<String, int?></returns>
-    Dictionary<String, int?> GetInventory ();
-
-    /// <summary>
-    /// Returns pet inventories by status Returns a map of status codes to quantities
-    /// </summary>
-    
-    /// <returns>Dictionary<String, int?></returns>
-    Task<Dictionary<String, int?>> GetInventoryAsync ();
-    
-    /// <summary>
-    /// Place an order for a pet 
-    /// </summary>
-    /// <param name="Body">order placed for purchasing the pet</param>
-    /// <returns>Order</returns>
-    Order PlaceOrder (Order Body);
-
-    /// <summary>
-    /// Place an order for a pet 
-    /// </summary>
-    /// <param name="Body">order placed for purchasing the pet</param>
-    /// <returns>Order</returns>
-    Task<Order> PlaceOrderAsync (Order Body);
-    
-    /// <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>
-    Order GetOrderById (string OrderId);
-
-    /// <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>
-    Task<Order> GetOrderByIdAsync (string OrderId);
-    
-    /// <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>
-    /// <param name="OrderId">ID of the order that needs to be deleted</param>
-    /// <returns></returns>
-    void DeleteOrder (string OrderId);
-
-    /// <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>
-    /// <param name="OrderId">ID of the order that needs to be deleted</param>
-    /// <returns></returns>
-    Task DeleteOrderAsync (string OrderId);
-    
-  }
-
-  /// <summary>
-  /// Represents a collection of functions to interact with the API endpoints
-  /// </summary>
-  public class StoreApi : IStoreApi {
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="StoreApi"/> class.
-    /// </summary>
-    /// <param name="apiClient"> an instance of ApiClient (optional)
-    /// <returns></returns>
-    public StoreApi(ApiClient apiClient = null) {
-      if (apiClient == null) { // use the default one in Configuration
-        this.apiClient = Configuration.apiClient; 
-      } else {
-        this.apiClient = apiClient;
-      }
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="StoreApi"/> class.
-    /// </summary>
-    /// <returns></returns>
-    public StoreApi(String basePath)
-    {
-      this.apiClient = new ApiClient(basePath);
-    }
-
-    /// <summary>
-    /// Sets the base path of the API client.
-    /// </summary>
-    /// <value>The base path</value>
-    public void SetBasePath(String basePath) {
-      this.apiClient.basePath = basePath;
-    }
-
-    /// <summary>
-    /// Gets the base path of the API client.
-    /// </summary>
-    /// <value>The base path</value>
-    public String GetBasePath(String basePath) {
-      return this.apiClient.basePath;
-    }
-
-    /// <summary>
-    /// Gets or sets the API client.
-    /// </summary>
-    /// <value>The API client</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>
-    public Dictionary<String, int?> GetInventory () {
-
-      
-
-      var path = "/store/inventory";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "api_key" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling GetInventory: " + response.Content, response.Content);
-      }
-      return (Dictionary<String, int?>) apiClient.Deserialize(response.Content, typeof(Dictionary<String, int?>));
-    }
-	
-	 /// <summary>
-    /// Returns pet inventories by status Returns a map of status codes to quantities
-    /// </summary>
-    
-    /// <returns>Dictionary<String, int?></returns>
-    public async Task<Dictionary<String, int?>> GetInventoryAsync () {
-
-      
-
-      var path = "/store/inventory";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "api_key" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling GetInventory: " + response.Content, response.Content);
-      }
-      return (Dictionary<String, int?>) apiClient.Deserialize(response.Content, 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) {
-
-      
-
-      var path = "/store/order";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = apiClient.Serialize(Body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling PlaceOrder: " + response.Content, response.Content);
-      }
-      return (Order) apiClient.Deserialize(response.Content, typeof(Order));
-    }
-	
-	 /// <summary>
-    /// Place an order for a pet 
-    /// </summary>
-    /// <param name="Body">order placed for purchasing the pet</param>
-    /// <returns>Order</returns>
-    public async Task<Order> PlaceOrderAsync (Order Body) {
-
-      
-
-      var path = "/store/order";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = apiClient.Serialize(Body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling PlaceOrder: " + response.Content, response.Content);
-      }
-      return (Order) apiClient.Deserialize(response.Content, 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) {
-
-      
-      // 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}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "orderId" + "}", apiClient.ParameterToString(OrderId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling GetOrderById: " + response.Content, response.Content);
-      }
-      return (Order) apiClient.Deserialize(response.Content, 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 async Task<Order> GetOrderByIdAsync (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}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "orderId" + "}", apiClient.ParameterToString(OrderId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling GetOrderById: " + response.Content, response.Content);
-      }
-      return (Order) apiClient.Deserialize(response.Content, 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>
-    /// <param name="OrderId">ID of the order that needs to be deleted</param>
-    /// <returns></returns>
-    public void DeleteOrder (string OrderId) {
-
-      
-      // verify the required parameter 'OrderId' is set
-      if (OrderId == null) throw new ApiException(400, "Missing required parameter 'OrderId' when calling DeleteOrder");
-      
-
-      var path = "/store/order/{orderId}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "orderId" + "}", apiClient.ParameterToString(OrderId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling DeleteOrder: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-	
-	 /// <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>
-    /// <param name="OrderId">ID of the order that needs to be deleted</param>
-    /// <returns></returns>
-    public async Task DeleteOrderAsync (string OrderId) {
-
-      
-          // verify the required parameter 'OrderId' is set
-          if (OrderId == null) throw new ApiException(400, "Missing required parameter 'OrderId' when calling DeleteOrder");
-      
-
-      var path = "/store/order/{orderId}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "orderId" + "}", apiClient.ParameterToString(OrderId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling DeleteOrder: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-    
-  }  
-  
-}
diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/UserApi.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/UserApi.cs
deleted file mode 100644
index ffee3f5fdd2..00000000000
--- a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/UserApi.cs
+++ /dev/null
@@ -1,796 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using RestSharp;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace IO.Swagger.Api {
-  
-
-  public interface IUserApi {
-    
-    /// <summary>
-    /// Create user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="Body">Created user object</param>
-    /// <returns></returns>
-    void CreateUser (User Body);
-
-    /// <summary>
-    /// Create user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="Body">Created user object</param>
-    /// <returns></returns>
-    Task CreateUserAsync (User Body);
-    
-    /// <summary>
-    /// Creates list of users with given input array 
-    /// </summary>
-    /// <param name="Body">List of user object</param>
-    /// <returns></returns>
-    void CreateUsersWithArrayInput (List<User> Body);
-
-    /// <summary>
-    /// Creates list of users with given input array 
-    /// </summary>
-    /// <param name="Body">List of user object</param>
-    /// <returns></returns>
-    Task CreateUsersWithArrayInputAsync (List<User> Body);
-    
-    /// <summary>
-    /// Creates list of users with given input array 
-    /// </summary>
-    /// <param name="Body">List of user object</param>
-    /// <returns></returns>
-    void CreateUsersWithListInput (List<User> Body);
-
-    /// <summary>
-    /// Creates list of users with given input array 
-    /// </summary>
-    /// <param name="Body">List of user object</param>
-    /// <returns></returns>
-    Task CreateUsersWithListInputAsync (List<User> Body);
-    
-    /// <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>
-    string LoginUser (string Username, string Password);
-
-    /// <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>
-    Task<string> LoginUserAsync (string Username, string Password);
-    
-    /// <summary>
-    /// Logs out current logged in user session 
-    /// </summary>
-    
-    /// <returns></returns>
-    void LogoutUser ();
-
-    /// <summary>
-    /// Logs out current logged in user session 
-    /// </summary>
-    
-    /// <returns></returns>
-    Task LogoutUserAsync ();
-    
-    /// <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>
-    User GetUserByName (string Username);
-
-    /// <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>
-    Task<User> GetUserByNameAsync (string Username);
-    
-    /// <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>
-    void UpdateUser (string Username, User 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></returns>
-    Task UpdateUserAsync (string Username, User Body);
-    
-    /// <summary>
-    /// Delete user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="Username">The name that needs to be deleted</param>
-    /// <returns></returns>
-    void DeleteUser (string Username);
-
-    /// <summary>
-    /// Delete user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="Username">The name that needs to be deleted</param>
-    /// <returns></returns>
-    Task DeleteUserAsync (string Username);
-    
-  }
-
-  /// <summary>
-  /// Represents a collection of functions to interact with the API endpoints
-  /// </summary>
-  public class UserApi : IUserApi {
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="UserApi"/> class.
-    /// </summary>
-    /// <param name="apiClient"> an instance of ApiClient (optional)
-    /// <returns></returns>
-    public UserApi(ApiClient apiClient = null) {
-      if (apiClient == null) { // use the default one in Configuration
-        this.apiClient = Configuration.apiClient; 
-      } else {
-        this.apiClient = apiClient;
-      }
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="UserApi"/> class.
-    /// </summary>
-    /// <returns></returns>
-    public UserApi(String basePath)
-    {
-      this.apiClient = new ApiClient(basePath);
-    }
-
-    /// <summary>
-    /// Sets the base path of the API client.
-    /// </summary>
-    /// <value>The base path</value>
-    public void SetBasePath(String basePath) {
-      this.apiClient.basePath = basePath;
-    }
-
-    /// <summary>
-    /// Gets the base path of the API client.
-    /// </summary>
-    /// <value>The base path</value>
-    public String GetBasePath(String basePath) {
-      return this.apiClient.basePath;
-    }
-
-    /// <summary>
-    /// Gets or sets the API client.
-    /// </summary>
-    /// <value>The API client</value>
-    public ApiClient apiClient {get; set;}
-
-
-    
-    /// <summary>
-    /// Create user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="Body">Created user object</param>
-    /// <returns></returns>
-    public void CreateUser (User Body) {
-
-      
-
-      var path = "/user";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = apiClient.Serialize(Body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling CreateUser: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-	
-	 /// <summary>
-    /// Create user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="Body">Created user object</param>
-    /// <returns></returns>
-    public async Task CreateUserAsync (User Body) {
-
-      
-
-      var path = "/user";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = apiClient.Serialize(Body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling CreateUser: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-    
-    /// <summary>
-    /// Creates list of users with given input array 
-    /// </summary>
-    /// <param name="Body">List of user object</param>
-    /// <returns></returns>
-    public void CreateUsersWithArrayInput (List<User> Body) {
-
-      
-
-      var path = "/user/createWithArray";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = apiClient.Serialize(Body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithArrayInput: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-	
-	 /// <summary>
-    /// Creates list of users with given input array 
-    /// </summary>
-    /// <param name="Body">List of user object</param>
-    /// <returns></returns>
-    public async Task CreateUsersWithArrayInputAsync (List<User> Body) {
-
-      
-
-      var path = "/user/createWithArray";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = apiClient.Serialize(Body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithArrayInput: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-    
-    /// <summary>
-    /// Creates list of users with given input array 
-    /// </summary>
-    /// <param name="Body">List of user object</param>
-    /// <returns></returns>
-    public void CreateUsersWithListInput (List<User> Body) {
-
-      
-
-      var path = "/user/createWithList";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = apiClient.Serialize(Body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithListInput: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-	
-	 /// <summary>
-    /// Creates list of users with given input array 
-    /// </summary>
-    /// <param name="Body">List of user object</param>
-    /// <returns></returns>
-    public async Task CreateUsersWithListInputAsync (List<User> Body) {
-
-      
-
-      var path = "/user/createWithList";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = apiClient.Serialize(Body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithListInput: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-    
-    /// <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, string Password) {
-
-      
-
-      var path = "/user/login";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-       if (Username != null) queryParams.Add("username", apiClient.ParameterToString(Username)); // query parameter
-       if (Password != null) queryParams.Add("password", apiClient.ParameterToString(Password)); // query parameter
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling LoginUser: " + response.Content, response.Content);
-      }
-      return (string) apiClient.Deserialize(response.Content, 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>string</returns>
-    public async Task<string> LoginUserAsync (string Username, string Password) {
-
-      
-
-      var path = "/user/login";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-       if (Username != null) queryParams.Add("username", apiClient.ParameterToString(Username)); // query parameter
-       if (Password != null) queryParams.Add("password", apiClient.ParameterToString(Password)); // query parameter
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling LoginUser: " + response.Content, response.Content);
-      }
-      return (string) apiClient.Deserialize(response.Content, typeof(string));
-    }
-    
-    /// <summary>
-    /// Logs out current logged in user session 
-    /// </summary>
-    
-    /// <returns></returns>
-    public void LogoutUser () {
-
-      
-
-      var path = "/user/logout";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling LogoutUser: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-	
-	 /// <summary>
-    /// Logs out current logged in user session 
-    /// </summary>
-    
-    /// <returns></returns>
-    public async Task LogoutUserAsync () {
-
-      
-
-      var path = "/user/logout";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling LogoutUser: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-    
-    /// <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) {
-
-      
-      // 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}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "username" + "}", apiClient.ParameterToString(Username));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling GetUserByName: " + response.Content, response.Content);
-      }
-      return (User) apiClient.Deserialize(response.Content, 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>User</returns>
-    public async Task<User> GetUserByNameAsync (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}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "username" + "}", apiClient.ParameterToString(Username));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling GetUserByName: " + response.Content, response.Content);
-      }
-      return (User) apiClient.Deserialize(response.Content, 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) {
-
-      
-      // 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}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "username" + "}", apiClient.ParameterToString(Username));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = apiClient.Serialize(Body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling UpdateUser: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-	
-	 /// <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 async Task UpdateUserAsync (string Username, User Body) {
-
-      
-          // 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}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "username" + "}", apiClient.ParameterToString(Username));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = apiClient.Serialize(Body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling UpdateUser: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-    
-    /// <summary>
-    /// Delete user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="Username">The name that needs to be deleted</param>
-    /// <returns></returns>
-    public void DeleteUser (string Username) {
-
-      
-      // verify the required parameter 'Username' is set
-      if (Username == null) throw new ApiException(400, "Missing required parameter 'Username' when calling DeleteUser");
-      
-
-      var path = "/user/{username}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "username" + "}", apiClient.ParameterToString(Username));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling DeleteUser: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-	
-	 /// <summary>
-    /// Delete user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="Username">The name that needs to be deleted</param>
-    /// <returns></returns>
-    public async Task DeleteUserAsync (string Username) {
-
-      
-          // verify the required parameter 'Username' is set
-          if (Username == null) throw new ApiException(400, "Missing required parameter 'Username' when calling DeleteUser");
-      
-
-      var path = "/user/{username}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "username" + "}", apiClient.ParameterToString(Username));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling DeleteUser: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-    
-  }  
-  
-}
diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/ApiClient.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/ApiClient.cs
deleted file mode 100644
index b001a38845c..00000000000
--- a/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/ApiClient.cs
+++ /dev/null
@@ -1,222 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-using RestSharp;
-
-namespace IO.Swagger.Client {
-  /// <summary>
-  /// API client is mainly responible for making the HTTP call to the API backend
-  /// </summary>
-  public class ApiClient {
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ApiClient"/> class.
-    /// </summary>
-    /// <param name="basePath">The base path.</param>
-    public ApiClient(String basePath="http://petstore.swagger.io/v2") {
-      this.basePath = basePath;
-      this.restClient = new RestClient(this.basePath);
-    }
-
-    /// <summary>
-    /// Gets or sets the base path.
-    /// </summary>
-    /// <value>The base path.</value> 
-    public string basePath { get; set; }
-
-    /// <summary>
-    /// Gets or sets the RestClient
-    /// </summary>
-    /// <value>The RestClient.</value> 
-    public RestClient restClient { get; set; }
-
-    private Dictionary<String, String> defaultHeaderMap = new Dictionary<String, String>();
-
-    public Object CallApi(String Path, RestSharp.Method Method, Dictionary<String, String> QueryParams, String PostBody,
-      Dictionary<String, String> HeaderParams, Dictionary<String, String> FormParams, Dictionary<String, String> FileParams, String[] AuthSettings) {
-      var response = Task.Run(async () => {
-                            var resp = await CallApiAsync(Path, Method, QueryParams, PostBody, HeaderParams, FormParams, FileParams, AuthSettings);
-                            return resp;
-                            });
-        return response.Result;
-    }
-
-    public async Task<Object> CallApiAsync(String Path, RestSharp.Method Method, Dictionary<String, String> QueryParams, String PostBody,
-      Dictionary<String, String> HeaderParams, Dictionary<String, String> FormParams, Dictionary<String, String> FileParams, String[] AuthSettings) {
-
-      var request = new RestRequest(Path, Method);
-
-      UpdateParamsForAuth(QueryParams, HeaderParams, AuthSettings);
-
-      // add default header, if any
-      foreach(KeyValuePair<string, string> defaultHeader in this.defaultHeaderMap)
-        request.AddHeader(defaultHeader.Key, defaultHeader.Value);
-
-      // add header parameter, if any
-      foreach(KeyValuePair<string, string> param in HeaderParams)
-        request.AddHeader(param.Key, param.Value);
-     
-      // add query parameter, if any
-      foreach(KeyValuePair<string, string> param in QueryParams)
-        request.AddQueryParameter(param.Key, param.Value);
-
-      // add form parameter, if any
-      foreach(KeyValuePair<string, string> param in FormParams)
-        request.AddParameter(param.Key, param.Value);
-
-      // add file parameter, if any
-      foreach(KeyValuePair<string, string> param in FileParams)
-        request.AddFile(param.Key, param.Value);
-
-      if (PostBody != null) {
-        request.AddParameter("application/json", PostBody, ParameterType.RequestBody); // http body (model) parameter
-      }
-
-      return (Object) await restClient.ExecuteTaskAsync(request);
-
-    }
-
-    /// <summary>
-    /// Add default header
-    /// </summary>
-    /// <param name="key">  Header field name
-    /// <param name="value"> Header field value
-    /// <returns></returns>
-    public void AddDefaultHeader(string key, string value) {
-       defaultHeaderMap.Add(key, value);
-    }
-
-    /// <summary>
-    /// Get default header
-    /// </summary>
-    /// <returns>Dictionary of default header</returns>
-    public Dictionary<String, String> GetDefaultHeader() {
-       return defaultHeaderMap;
-    }
-
-    /// <summary>
-    /// escape string (url-encoded)
-    /// </summary>
-    /// <param name="str"> String to be escaped
-    /// <returns>Escaped string</returns>
-    public string EscapeString(string str) {
-      return str;
-    }
-
-    /// <summary>
-    /// if parameter is DateTime, output in ISO8601 format
-    /// if parameter is a list of string, join the list with ","
-    /// otherwise just return the string
-    /// </summary>
-    /// <param name="obj"> The parameter (header, path, query, form)
-    /// <returns>Formatted string</returns>
-    public string ParameterToString(object obj)
-    {
-      if (obj is DateTime) {
-        return ((DateTime)obj).ToString ("u");
-      } else if (obj is List<string>) {
-        return String.Join(",", obj as List<string>);
-      } else {
-	return Convert.ToString (obj);
-      }
-    }
-
-    /// <summary>
-    /// Deserialize the JSON string into a proper object
-    /// </summary>
-    /// <param name="json"> JSON string
-    /// <param name="type"> Object type
-    /// <returns>Object representation of the JSON string</returns>
-    public object Deserialize(string content, Type type) {
-      if (type.GetType() == typeof(Object))
-        return (Object)content;
-
-      try
-      {
-          return JsonConvert.DeserializeObject(content, type);
-      }
-      catch (IOException e) {
-        throw new ApiException(500, e.Message);
-      }
-    }
-
-    /// <summary>
-    /// Serialize an object into JSON string
-    /// </summary>
-    /// <param name="obj"> Object 
-    /// <returns>JSON string</returns>
-    public string Serialize(object obj) {
-      try
-      {
-          return obj != null ? JsonConvert.SerializeObject(obj) : null;
-      }
-      catch (Exception e) {
-        throw new ApiException(500, e.Message);
-      }
-    }
-
-    /// <summary>
-    /// Get the API key with prefix
-    /// </summary>
-    /// <param name="obj"> Object 
-    /// <returns>API key with prefix</returns>
-    public string GetApiKeyWithPrefix (string apiKey)
-    {
-      var apiKeyValue = "";
-      Configuration.apiKey.TryGetValue (apiKey, out apiKeyValue);
-      var apiKeyPrefix = "";
-      if (Configuration.apiKeyPrefix.TryGetValue (apiKey, out apiKeyPrefix)) {
-        return apiKeyPrefix + " " + apiKeyValue;
-      } else {
-        return apiKeyValue;
-      }
-    }
-
-    /// <summary>
-    /// Update parameters based on authentication
-    /// </summary>
-    /// <param name="QueryParams">Query parameters</param>
-    /// <param name="HeaderParams">Header parameters</param>
-    /// <param name="AuthSettings">Authentication settings</param>
-    public void UpdateParamsForAuth(Dictionary<String, String> QueryParams, Dictionary<String, String> HeaderParams, string[] AuthSettings) {
-      if (AuthSettings == null || AuthSettings.Length == 0)
-        return;
-  
-      foreach (string auth in AuthSettings) {
-        // determine which one to use
-        switch(auth) {
-          
-          case "api_key":
-            HeaderParams["api_key"] = GetApiKeyWithPrefix("api_key");
-            
-            break;
-          
-          case "petstore_auth":
-            
-            //TODO support oauth
-            break;
-          
-          default:
-            //TODO show warning about security definition not found
-          break;
-        }
-      }
-
-    }
-
-    /// <summary>
-    /// Encode string in base64 format 
-    /// </summary>
-    /// <param name="text">String to be encoded</param>
-    public static string Base64Encode(string text) {
-      var textByte = System.Text.Encoding.UTF8.GetBytes(text);
-      return System.Convert.ToBase64String(textByte);
-    }
-
-  }
-}
diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/ApiException.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/ApiException.cs
deleted file mode 100644
index f9cf380e683..00000000000
--- a/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/ApiException.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-
-namespace IO.Swagger.Client {
-  /// <summary>
-  /// API Exception
-  /// </summary>
-  public class ApiException : Exception {
-    /// <summary>
-    /// Gets or sets the error code (HTTP status code)
-    /// </summary>
-    /// <value>The error code (HTTP status code).</value>
-    public int ErrorCode { get; set; }
-
-    /// <summary>
-    /// Gets or sets the error content (body json object)
-    /// </summary>
-    /// <value>The error content (Http response body).</value>
-    public dynamic ErrorContent { get; private set; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ApiException"/> class.
-    /// </summary>
-    /// <param name="basePath">The base path.</param>
-    public ApiException() {}
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ApiException"/> class.
-    /// </summary>
-    /// <param name="errorCode">HTTP status code.</param>
-    /// <param name="message">Error message.</param>
-    public ApiException(int errorCode, string message) : base(message) {
-      this.ErrorCode = errorCode;
-    }
-
-    public ApiException(int errorCode, string message, dynamic errorContent = null) : base(message) {
-       this.ErrorCode = errorCode;
-       this.ErrorContent = errorContent;
-    }
-
-  }
-
-}
diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/Configuration.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/Configuration.cs
deleted file mode 100644
index 4e7975e3ad0..00000000000
--- a/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/Configuration.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Text;
-using IO.Swagger.Client;
-
-namespace IO.Swagger.Client {
-  /// <summary>
-  /// Represents a set of configuration settings
-  /// </summary>
-  public class Configuration{
-
-    /// <summary>
-    /// Gets or sets the API client. This is the default API client for making HTTP calls.
-    /// </summary>
-    /// <value>The API client.</value>
-    public static ApiClient apiClient = new ApiClient();
-
-    /// <summary>
-    /// Gets or sets the username (HTTP basic authentication)
-    /// </summary>
-    /// <value>The username.</value>
-    public static String username { get; set; }
-
-    /// <summary>
-    /// Gets or sets the password (HTTP basic authentication)
-    /// </summary>
-    /// <value>The password.</value>
-    public static String password { get; set; }
-
-    /// <summary>
-    /// Gets or sets the API key based on the authentication name 
-    /// </summary>
-    /// <value>The API key.</value>
-    public static 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>
-    /// <value>The prefix of the API key.</value>
-    public static Dictionary<String, String> apiKeyPrefix = new Dictionary<String, String>();
-
-
-  }
-}
diff --git a/samples/client/petstore/flash/FlashPetstoreCodegen.scala b/samples/client/petstore/flash/FlashPetstoreCodegen.scala
deleted file mode 100644
index e318765c57e..00000000000
--- a/samples/client/petstore/flash/FlashPetstoreCodegen.scala
+++ /dev/null
@@ -1,35 +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.
- */
-
-object FlashPetstoreCodegen extends BasicFlashCodegen {
-  def main(args: Array[String]) = generateClient(args)
-
-  override def packageName = "io.swagger.client"
-
-  // where to write generated code
-  override def destinationDir = destinationRoot + "/src/main/flex"
-
-  override def destinationRoot = "samples/client/petstore/flash"
-
-  // package for models
-  override def modelPackage = Some("com.wordnik.client.model")
-
-  // package for api classes
-  override def apiPackage = Some("com.wordnik.client.api")
-
-  // supporting classes
-  override def supportingFiles = baseSupportingFiles ++ List()
-}
diff --git a/samples/client/petstore/flash/bin/AirExecutorApp-app.xml b/samples/client/petstore/flash/bin/AirExecutorApp-app.xml
deleted file mode 100644
index 1eb5e43c7d7..00000000000
--- a/samples/client/petstore/flash/bin/AirExecutorApp-app.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<application xmlns="http://ns.adobe.com/air/application/2.0">
-
-    <!-- Adobe AIR Application Descriptor File Template.
-
-        Specifies parameters for identifying, installing, and launching AIR applications.
-
-        xmlns - The Adobe AIR namespace: http://ns.adobe.com/air/application/2.0
-                The last segment of the namespace specifies the version
-                of the AIR runtime required for this application to run.
-
-        minimumPatchLevel - The minimum patch level of the AIR runtime required to run
-                the application. Optional.
-    -->
-
-    <!-- A universally unique application identifier. Must be unique across all AIR applications.
-         Using a reverse DNS-style name as the id is recommended. (Eg. com.example.ExampleApplication.) Required. -->
-    <id>AirExecutorApp</id>
-
-    <!-- Used as the filename for the application. Required. -->
-    <filename>AirExecutorApp</filename>
-
-    <!-- The name that is displayed in the AIR application installer.
-         May have multiple values for each language. See samples or xsd schema file. Optional. -->
-    <name>AirExecutorApp</name>
-
-    <!-- An application version designator (such as "v1", "2.5", or "Alpha 1"). Required. -->
-    <version>v1</version>
-
-    <!-- Description, displayed in the AIR application installer.
-         May have multiple values for each language. See samples or xsd schema file. Optional. -->
-    <!-- <description></description> -->
-
-    <!-- Copyright information. Optional -->
-    <!-- <copyright></copyright> -->
-
-    <!-- Publisher ID. Used if you're updating an application created prior to 1.5.3 -->
-    <!-- <publisherID></publisherID> -->
-
-    <!-- Settings for the application's initial window. Required. -->
-    <initialWindow>
-        <!-- The main SWF or HTML file of the application. Required. -->
-        <!-- Note: In Flash Builder, the SWF reference is set automatically. -->
-        <content>AirExecutorApp.swf</content>
-
-        <!-- The title of the main window. Optional. -->
-        <!-- <title></title> -->
-
-        <!-- The type of system chrome to use (either "standard" or "none"). Optional. Default standard. -->
-        <!-- <systemChrome></systemChrome> -->
-
-        <!-- Whether the window is transparent. Only applicable when systemChrome is none. Optional. Default false. -->
-        <!-- <transparent></transparent> -->
-
-        <!-- Whether the window is initially visible. Optional. Default false. -->
-        <!-- <visible></visible> -->
-
-        <!-- Whether the user can minimize the window. Optional. Default true. -->
-        <!-- <minimizable></minimizable> -->
-
-        <!-- Whether the user can maximize the window. Optional. Default true. -->
-        <!-- <maximizable></maximizable> -->
-
-        <!-- Whether the user can resize the window. Optional. Default true. -->
-        <!-- <resizable></resizable> -->
-
-        <!-- The window's initial width in pixels. Optional. -->
-        <!-- <width></width> -->
-
-        <!-- The window's initial height in pixels. Optional. -->
-        <!-- <height></height> -->
-
-        <!-- The window's initial x position. Optional. -->
-        <!-- <x></x> -->
-
-        <!-- The window's initial y position. Optional. -->
-        <!-- <y></y> -->
-
-        <!-- The window's minimum size, specified as a width/height pair in pixels, such as "400 200". Optional. -->
-        <!-- <minSize></minSize> -->
-
-        <!-- The window's initial maximum size, specified as a width/height pair in pixels, such as "1600 1200". Optional. -->
-        <!-- <maxSize></maxSize> -->
-    </initialWindow>
-
-    <!-- We recommend omitting the supportedProfiles element, -->
-    <!-- which in turn permits your application to be deployed to all -->
-    <!-- devices supported by AIR. If you wish to restrict deployment -->
-    <!-- (i.e., to only mobile devices) then add this element and list -->
-    <!-- only the profiles which your application does support. -->
-    <!-- <supportedProfiles>desktop extendedDesktop mobileDevice extendedMobileDevice</supportedProfiles> -->
-
-    <!-- The subpath of the standard default installation location to use. Optional. -->
-    <!-- <installFolder></installFolder> -->
-
-    <!-- The subpath of the Programs menu to use. (Ignored on operating systems without a Programs menu.) Optional. -->
-    <!-- <programMenuFolder></programMenuFolder> -->
-
-    <!-- The icon the system uses for the application. For at least one resolution,
-         specify the path to a PNG file included in the AIR package. Optional. -->
-    <!-- <icon>
-        <image16x16></image16x16>
-        <image32x32></image32x32>
-        <image48x48></image48x48>
-        <image128x128></image128x128>
-    </icon> -->
-
-    <!-- Whether the application handles the update when a user double-clicks an update version
-    of the AIR file (true), or the default AIR application installer handles the update (false).
-    Optional. Default false. -->
-    <!-- <customUpdateUI></customUpdateUI> -->
-
-    <!-- Whether the application can be launched when the user clicks a link in a web browser.
-    Optional. Default false. -->
-    <!-- <allowBrowserInvocation></allowBrowserInvocation> -->
-
-    <!-- Listing of file types for which the application can register. Optional. -->
-    <!-- <fileTypes> -->
-
-    <!-- Defines one file type. Optional. -->
-    <!-- <fileType> -->
-
-    <!-- The name that the system displays for the registered file type. Required. -->
-    <!-- <name></name> -->
-
-    <!-- The extension to register. Required. -->
-    <!-- <extension></extension> -->
-
-    <!-- The description of the file type. Optional. -->
-    <!-- <description></description> -->
-
-    <!-- The MIME content type. -->
-    <!-- <contentType></contentType> -->
-
-    <!-- The icon to display for the file type. Optional. -->
-    <!-- <icon>
-        <image16x16></image16x16>
-        <image32x32></image32x32>
-        <image48x48></image48x48>
-        <image128x128></image128x128>
-    </icon> -->
-
-    <!-- </fileType> -->
-    <!-- </fileTypes> -->
-
-</application>
diff --git a/samples/client/petstore/flash/src/main/flex/bin/AirExecutorApp-app.xml b/samples/client/petstore/flash/src/main/flex/bin/AirExecutorApp-app.xml
new file mode 100644
index 00000000000..1dbaf98e644
--- /dev/null
+++ b/samples/client/petstore/flash/src/main/flex/bin/AirExecutorApp-app.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<application xmlns="http://ns.adobe.com/air/application/2.0">
+
+<!-- Adobe AIR Application Descriptor File Template.
+
+	Specifies parameters for identifying, installing, and launching AIR applications.
+
+	xmlns - The Adobe AIR namespace: http://ns.adobe.com/air/application/2.0
+			The last segment of the namespace specifies the version 
+			of the AIR runtime required for this application to run.
+			
+	minimumPatchLevel - The minimum patch level of the AIR runtime required to run 
+			the application. Optional.
+-->
+
+	<!-- A universally unique application identifier. Must be unique across all AIR applications.
+	     Using a reverse DNS-style name as the id is recommended. (Eg. com.example.ExampleApplication.) Required. -->
+	<id>AirExecutorApp</id>
+
+	<!-- Used as the filename for the application. Required. -->
+	<filename>AirExecutorApp</filename>
+
+	<!-- The name that is displayed in the AIR application installer. 
+	     May have multiple values for each language. See samples or xsd schema file. Optional. -->
+	<name>AirExecutorApp</name>
+
+	<!-- An application version designator (such as "v1", "2.5", or "Alpha 1"). Required. -->
+	<version>v1</version>
+
+	<!-- Description, displayed in the AIR application installer.
+	     May have multiple values for each language. See samples or xsd schema file. Optional. -->
+	<!-- <description></description> -->
+
+	<!-- Copyright information. Optional -->
+	<!-- <copyright></copyright> -->
+
+	<!-- Publisher ID. Used if you're updating an application created prior to 1.5.3 -->
+	<!-- <publisherID></publisherID> -->
+
+	<!-- Settings for the application's initial window. Required. -->
+	<initialWindow>
+		<!-- The main SWF or HTML file of the application. Required. -->
+		<!-- Note: In Flash Builder, the SWF reference is set automatically. -->
+		<content>AirExecutorApp.swf</content>
+		
+		<!-- The title of the main window. Optional. -->
+		<!-- <title></title> -->
+
+		<!-- The type of system chrome to use (either "standard" or "none"). Optional. Default standard. -->
+		<!-- <systemChrome></systemChrome> -->
+
+		<!-- Whether the window is transparent. Only applicable when systemChrome is none. Optional. Default false. -->
+		<!-- <transparent></transparent> -->
+
+		<!-- Whether the window is initially visible. Optional. Default false. -->
+		<!-- <visible></visible> -->
+
+		<!-- Whether the user can minimize the window. Optional. Default true. -->
+		<!-- <minimizable></minimizable> -->
+
+		<!-- Whether the user can maximize the window. Optional. Default true. -->
+		<!-- <maximizable></maximizable> -->
+
+		<!-- Whether the user can resize the window. Optional. Default true. -->
+		<!-- <resizable></resizable> -->
+
+		<!-- The window's initial width in pixels. Optional. -->
+		<!-- <width></width> -->
+
+		<!-- The window's initial height in pixels. Optional. -->
+		<!-- <height></height> -->
+
+		<!-- The window's initial x position. Optional. -->
+		<!-- <x></x> -->
+
+		<!-- The window's initial y position. Optional. -->
+		<!-- <y></y> -->
+
+		<!-- The window's minimum size, specified as a width/height pair in pixels, such as "400 200". Optional. -->
+		<!-- <minSize></minSize> -->
+
+		<!-- The window's initial maximum size, specified as a width/height pair in pixels, such as "1600 1200". Optional. -->
+		<!-- <maxSize></maxSize> -->
+	</initialWindow>
+
+    <!-- We recommend omitting the supportedProfiles element, -->
+    <!-- which in turn permits your application to be deployed to all -->
+    <!-- devices supported by AIR. If you wish to restrict deployment -->
+    <!-- (i.e., to only mobile devices) then add this element and list -->
+    <!-- only the profiles which your application does support. -->
+    <!-- <supportedProfiles>desktop extendedDesktop mobileDevice extendedMobileDevice</supportedProfiles> -->
+
+	<!-- The subpath of the standard default installation location to use. Optional. -->
+	<!-- <installFolder></installFolder> -->
+
+	<!-- The subpath of the Programs menu to use. (Ignored on operating systems without a Programs menu.) Optional. -->
+	<!-- <programMenuFolder></programMenuFolder> -->
+
+	<!-- The icon the system uses for the application. For at least one resolution,
+		 specify the path to a PNG file included in the AIR package. Optional. -->
+	<!-- <icon>
+		<image16x16></image16x16>
+		<image32x32></image32x32>
+		<image48x48></image48x48>
+		<image128x128></image128x128>
+	</icon> -->
+
+	<!-- Whether the application handles the update when a user double-clicks an update version
+	of the AIR file (true), or the default AIR application installer handles the update (false).
+	Optional. Default false. -->
+	<!-- <customUpdateUI></customUpdateUI> -->
+	
+	<!-- Whether the application can be launched when the user clicks a link in a web browser.
+	Optional. Default false. -->
+	<!-- <allowBrowserInvocation></allowBrowserInvocation> -->
+
+	<!-- Listing of file types for which the application can register. Optional. -->
+	<!-- <fileTypes> -->
+
+		<!-- Defines one file type. Optional. -->
+		<!-- <fileType> -->
+
+			<!-- The name that the system displays for the registered file type. Required. -->
+			<!-- <name></name> -->
+
+			<!-- The extension to register. Required. -->
+			<!-- <extension></extension> -->
+			
+			<!-- The description of the file type. Optional. -->
+			<!-- <description></description> -->
+			
+			<!-- The MIME content type. -->
+			<!-- <contentType></contentType> -->
+			
+			<!-- The icon to display for the file type. Optional. -->
+			<!-- <icon>
+				<image16x16></image16x16>
+				<image32x32></image32x32>
+				<image48x48></image48x48>
+				<image128x128></image128x128>
+			</icon> -->
+			
+		<!-- </fileType> -->
+	<!-- </fileTypes> -->
+
+</application>
diff --git a/samples/client/petstore/flash/build.properties b/samples/client/petstore/flash/src/main/flex/build.properties
similarity index 100%
rename from samples/client/petstore/flash/build.properties
rename to samples/client/petstore/flash/src/main/flex/build.properties
diff --git a/samples/client/petstore/flash/build.xml b/samples/client/petstore/flash/src/main/flex/build.xml
similarity index 89%
rename from samples/client/petstore/flash/build.xml
rename to samples/client/petstore/flash/src/main/flex/build.xml
index 6861dd464ec..4f021b0b8b2 100644
--- a/samples/client/petstore/flash/build.xml
+++ b/samples/client/petstore/flash/src/main/flex/build.xml
@@ -62,11 +62,11 @@
             <arg line="-doc-sources ${sourcepath}"/>
             <arg line="-source-path ${sourcepath}"/>
             <arg line="-footer 'Copyright Wordnik'"/>
-            <arg line="-package com.wordnik.swagger.api 'Contains the apis which are used by clients to make calls to the services deployed'"/>
-            <arg line="-package com.wordnik.swagger.codegen.model 'Contains common classes which encapsulate data elements required'"/>
-            <arg line="-package com.wordnik.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 com.wordnik.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 com.wordnik.swagger.exception 'Contains classes that encapsulate the errors generated'"/>
+            <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}"/>
diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/api/PetApi.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/api/PetApi.as
deleted file mode 100644
index 88f9b42eaa0..00000000000
--- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/api/PetApi.as
+++ /dev/null
@@ -1,272 +0,0 @@
-package com.wordnik.client.api {
-
-import com.wordnik.swagger.common.ApiInvoker;
-import com.wordnik.swagger.exception.ApiErrorCodes;
-import com.wordnik.swagger.exception.ApiError;
-import com.wordnik.swagger.common.ApiUserCredentials;
-import com.wordnik.swagger.event.Response;
-import com.wordnik.swagger.common.SwaggerApi;
-import com.wordnik.client.model.Pet;
-import com.wordnik.client.model.File;
-
-import mx.rpc.AsyncToken;
-import mx.utils.UIDUtil;
-
-import flash.utils.Dictionary;
-import flash.events.EventDispatcher;
-
-public class PetApi extends SwaggerApi {
-    public static const event_getPetById:String = "getPetById";
-    public static const event_deletePet:String = "deletePet";
-    public static const event_partialUpdate:String = "partialUpdate";
-    public static const event_updatePetWithForm:String = "updatePetWithForm";
-    public static const event_uploadFile:String = "uploadFile";
-    public static const event_addPet:String = "addPet";
-    public static const event_updatePet:String = "updatePet";
-    public static const event_findPetsByStatus:String = "findPetsByStatus";
-    public static const event_findPetsByTags:String = "findPetsByTags";
-
-    /**
-     * 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);
-    }
-    /*
-     * Returns Pet */
-
-    public function getPetById(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();
-
-        // verify required params are set
-        if (petId == null) {
-            throw new ApiError(400, "missing required params");
-        }
-        var token:AsyncToken = getApiInvoker().invokeAPI(path, "GET", queryParams, null, headerParams);
-
-        var requestId:String = getUniqueId();
-
-        token.requestId = requestId;
-        token.completionEventType = "getPetById";
-
-        token.returnType = Pet;
-        return requestId;
-
-    }
-
-    /*
-     * Returns void */
-    public function deletePet(petId: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();
-
-        // verify required params are set
-        if (petId == null) {
-            throw new ApiError(400, "missing required params");
-        }
-        var token:AsyncToken = getApiInvoker().invokeAPI(path, "DELETE", queryParams, null, headerParams);
-
-        var requestId:String = getUniqueId();
-
-        token.requestId = requestId;
-        token.completionEventType = "deletePet";
-
-        token.returnType = null;
-        return requestId;
-
-    }
-
-    /*
-     * Returns Array[Pet] */
-    public function partialUpdate(petId:String, body:Pet):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();
-
-        // verify required params are set
-        if (petId == null || body == null) {
-            throw new ApiError(400, "missing required params");
-        }
-        var token:AsyncToken = getApiInvoker().invokeAPI(path, "PATCH", queryParams, body, headerParams);
-
-        var requestId:String = getUniqueId();
-
-        token.requestId = requestId;
-        token.completionEventType = "partialUpdate";
-
-        token.returnType = Array[Pet];
-        return requestId;
-
-    }
-
-    /*
-     * Returns void */
-    public function updatePetWithForm(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();
-
-        // verify required params are set
-        if (petId == null) {
-            throw new ApiError(400, "missing required params");
-        }
-        var token:AsyncToken = getApiInvoker().invokeAPI(path, "POST", queryParams, null, headerParams);
-
-        var requestId:String = getUniqueId();
-
-        token.requestId = requestId;
-        token.completionEventType = "updatePetWithForm";
-
-        token.returnType = null;
-        return requestId;
-
-    }
-
-    /*
-     * Returns void */
-    public function uploadFile(additionalMetadata:String, body:File):String {
-        // create path and map variables
-        var path:String = "/pet/uploadImage".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 = "uploadFile";
-
-        token.returnType = null;
-        return requestId;
-
-    }
-
-    /*
-     * Returns void */
-    public function addPet(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();
-
-        // verify required params are set
-        if (body == null) {
-            throw new ApiError(400, "missing required params");
-        }
-        var token:AsyncToken = getApiInvoker().invokeAPI(path, "POST", queryParams, body, headerParams);
-
-        var requestId:String = getUniqueId();
-
-        token.requestId = requestId;
-        token.completionEventType = "addPet";
-
-        token.returnType = null;
-        return requestId;
-
-    }
-
-    /*
-     * Returns void */
-    public function updatePet(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();
-
-        // verify required params are set
-        if (body == null) {
-            throw new ApiError(400, "missing required params");
-        }
-        var token:AsyncToken = getApiInvoker().invokeAPI(path, "PUT", queryParams, body, headerParams);
-
-        var requestId:String = getUniqueId();
-
-        token.requestId = requestId;
-        token.completionEventType = "updatePet";
-
-        token.returnType = null;
-        return requestId;
-
-    }
-
-    /*
-     * Returns Array[Pet] */
-    public function findPetsByStatus(status:String = "available"):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();
-
-        // verify required params are set
-        if (status == null) {
-            throw new ApiError(400, "missing required params");
-        }
-        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 = "findPetsByStatus";
-
-        token.returnType = Array[Pet];
-        return requestId;
-
-    }
-
-    /*
-     * Returns Array[Pet] */
-    public function findPetsByTags(tags:String):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();
-
-        // verify required params are set
-        if (tags == null) {
-            throw new ApiError(400, "missing required params");
-        }
-        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 = "findPetsByTags";
-
-        token.returnType = Array[Pet];
-        return requestId;
-
-    }
-}
-}
diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/api/StoreApi.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/api/StoreApi.as
deleted file mode 100644
index cc4bc2c4a13..00000000000
--- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/api/StoreApi.as
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.wordnik.client.api {
-
-import com.wordnik.swagger.common.ApiInvoker;
-import com.wordnik.swagger.exception.ApiErrorCodes;
-import com.wordnik.swagger.exception.ApiError;
-import com.wordnik.swagger.common.ApiUserCredentials;
-import com.wordnik.swagger.event.Response;
-import com.wordnik.swagger.common.SwaggerApi;
-import com.wordnik.client.model.Order;
-
-import mx.rpc.AsyncToken;
-import mx.utils.UIDUtil;
-
-import flash.utils.Dictionary;
-import flash.events.EventDispatcher;
-
-public class StoreApi extends SwaggerApi {
-    public static const event_getOrderById:String = "getOrderById";
-    public static const event_deleteOrder:String = "deleteOrder";
-    public static const event_placeOrder:String = "placeOrder";
-
-    /**
-     * 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);
-    }
-    /*
-     * Returns Order */
-
-    public function getOrderById(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();
-
-        // verify required params are set
-        if (orderId == null) {
-            throw new ApiError(400, "missing required params");
-        }
-        var token:AsyncToken = getApiInvoker().invokeAPI(path, "GET", queryParams, null, headerParams);
-
-        var requestId:String = getUniqueId();
-
-        token.requestId = requestId;
-        token.completionEventType = "getOrderById";
-
-        token.returnType = Order;
-        return requestId;
-
-    }
-
-    /*
-     * Returns void */
-    public function deleteOrder(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();
-
-        // verify required params are set
-        if (orderId == null) {
-            throw new ApiError(400, "missing required params");
-        }
-        var token:AsyncToken = getApiInvoker().invokeAPI(path, "DELETE", queryParams, null, headerParams);
-
-        var requestId:String = getUniqueId();
-
-        token.requestId = requestId;
-        token.completionEventType = "deleteOrder";
-
-        token.returnType = null;
-        return requestId;
-
-    }
-
-    /*
-     * Returns void */
-    public function placeOrder(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();
-
-        // verify required params are set
-        if (body == null) {
-            throw new ApiError(400, "missing required params");
-        }
-        var token:AsyncToken = getApiInvoker().invokeAPI(path, "POST", queryParams, body, headerParams);
-
-        var requestId:String = getUniqueId();
-
-        token.requestId = requestId;
-        token.completionEventType = "placeOrder";
-
-        token.returnType = null;
-        return requestId;
-
-    }
-}
-}
diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/api/UserApi.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/api/UserApi.as
deleted file mode 100644
index 1714b4a0381..00000000000
--- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/api/UserApi.as
+++ /dev/null
@@ -1,244 +0,0 @@
-package com.wordnik.client.api {
-
-import com.wordnik.swagger.common.ApiInvoker;
-import com.wordnik.swagger.exception.ApiErrorCodes;
-import com.wordnik.swagger.exception.ApiError;
-import com.wordnik.swagger.common.ApiUserCredentials;
-import com.wordnik.swagger.event.Response;
-import com.wordnik.swagger.common.SwaggerApi;
-import com.wordnik.client.model.User;
-
-import mx.rpc.AsyncToken;
-import mx.utils.UIDUtil;
-
-import flash.utils.Dictionary;
-import flash.events.EventDispatcher;
-
-public class UserApi extends SwaggerApi {
-    public static const event_updateUser:String = "updateUser";
-    public static const event_deleteUser:String = "deleteUser";
-    public static const event_getUserByName:String = "getUserByName";
-    public static const event_loginUser:String = "loginUser";
-    public static const event_logoutUser:String = "logoutUser";
-    public static const event_createUser:String = "createUser";
-    public static const event_createUsersWithArrayInput:String = "createUsersWithArrayInput";
-    public static const event_createUsersWithListInput:String = "createUsersWithListInput";
-
-    /**
-     * 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);
-    }
-    /*
-     * Returns void */
-
-    public function updateUser(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();
-
-        // verify required params are set
-        if (username == null || body == null) {
-            throw new ApiError(400, "missing required params");
-        }
-        var token:AsyncToken = getApiInvoker().invokeAPI(path, "PUT", queryParams, body, headerParams);
-
-        var requestId:String = getUniqueId();
-
-        token.requestId = requestId;
-        token.completionEventType = "updateUser";
-
-        token.returnType = null;
-        return requestId;
-
-    }
-
-    /*
-     * Returns void */
-    public function deleteUser(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();
-
-        // verify required params are set
-        if (username == null) {
-            throw new ApiError(400, "missing required params");
-        }
-        var token:AsyncToken = getApiInvoker().invokeAPI(path, "DELETE", queryParams, null, headerParams);
-
-        var requestId:String = getUniqueId();
-
-        token.requestId = requestId;
-        token.completionEventType = "deleteUser";
-
-        token.returnType = null;
-        return requestId;
-
-    }
-
-    /*
-     * Returns User */
-    public function getUserByName(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();
-
-        // verify required params are set
-        if (username == null) {
-            throw new ApiError(400, "missing required params");
-        }
-        var token:AsyncToken = getApiInvoker().invokeAPI(path, "GET", queryParams, null, headerParams);
-
-        var requestId:String = getUniqueId();
-
-        token.requestId = requestId;
-        token.completionEventType = "getUserByName";
-
-        token.returnType = User;
-        return requestId;
-
-    }
-
-    /*
-     * Returns string */
-    public function loginUser(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();
-
-        // verify required params are set
-        if (username == null || password == null) {
-            throw new ApiError(400, "missing required params");
-        }
-        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 = "loginUser";
-
-        token.returnType = string;
-        return requestId;
-
-    }
-
-    /*
-     * Returns void */
-    public function logoutUser():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 = "logoutUser";
-
-        token.returnType = null;
-        return requestId;
-
-    }
-
-    /*
-     * Returns void */
-    public function createUser(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();
-
-        // verify required params are set
-        if (body == null) {
-            throw new ApiError(400, "missing required params");
-        }
-        var token:AsyncToken = getApiInvoker().invokeAPI(path, "POST", queryParams, body, headerParams);
-
-        var requestId:String = getUniqueId();
-
-        token.requestId = requestId;
-        token.completionEventType = "createUser";
-
-        token.returnType = null;
-        return requestId;
-
-    }
-
-    /*
-     * Returns void */
-    public function createUsersWithArrayInput(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();
-
-        // verify required params are set
-        if (body == null) {
-            throw new ApiError(400, "missing required params");
-        }
-        var token:AsyncToken = getApiInvoker().invokeAPI(path, "POST", queryParams, body, headerParams);
-
-        var requestId:String = getUniqueId();
-
-        token.requestId = requestId;
-        token.completionEventType = "createUsersWithArrayInput";
-
-        token.returnType = null;
-        return requestId;
-
-    }
-
-    /*
-     * Returns void */
-    public function createUsersWithListInput(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();
-
-        // verify required params are set
-        if (body == null) {
-            throw new ApiError(400, "missing required params");
-        }
-        var token:AsyncToken = getApiInvoker().invokeAPI(path, "POST", queryParams, body, headerParams);
-
-        var requestId:String = getUniqueId();
-
-        token.requestId = requestId;
-        token.completionEventType = "createUsersWithListInput";
-
-        token.returnType = null;
-        return requestId;
-
-    }
-}
-}
diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Category.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Category.as
deleted file mode 100644
index e20d3701cf7..00000000000
--- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Category.as
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.wordnik.client.model {
-
-[XmlRootNode(name="Category")]
-public class Category {
-    [XmlElement(name="id")]
-    public var id:Number = 0.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/src/main/flex/com/wordnik/client/model/CategoryList.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/CategoryList.as
deleted file mode 100644
index 48b18dbe1f4..00000000000
--- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/CategoryList.as
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.wordnik.client.model {
-
-import com.wordnik.swagger.common.ListWrapper;
-
-public class CategoryList implements ListWrapper {
-    // This declaration below of _Category_obj_class is to force flash compiler to include this class
-    [XmlElements(name="category", type="com.wordnik.client.model.Category")]
-    public var category:Array = new Array();
-    private var _category_obj_class:com.wordnik.client.model.Category = null;
-
-    public function getList():Array {
-        return category;
-    }
-
-}
-}
-
diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Order.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Order.as
deleted file mode 100644
index 5147a428ba5..00000000000
--- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Order.as
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.wordnik.client.model {
-
-[XmlRootNode(name="Order")]
-public class Order {
-    [XmlElement(name="id")]
-    public var id:Number = 0.0;
-
-    [XmlElement(name="petId")]
-    public var petId:Number = 0.0;
-
-    [XmlElement(name="quantity")]
-    public var quantity:Number = 0.0;
-
-    /* Order Status */
-    [XmlElement(name="status")]
-    public var status:String = null;
-
-    [XmlElement(name="shipDate")]
-    public var shipDate:Date = null;
-
-    public function toString():String {
-        var str:String = "Order: ";
-        str += " (id: " + id + ")";
-        str += " (petId: " + petId + ")";
-        str += " (quantity: " + quantity + ")";
-        str += " (status: " + status + ")";
-        str += " (shipDate: " + shipDate + ")";
-        return str;
-    }
-
-
-}
-}
-
diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/OrderList.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/OrderList.as
deleted file mode 100644
index 56825295dd8..00000000000
--- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/OrderList.as
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.wordnik.client.model {
-
-import com.wordnik.swagger.common.ListWrapper;
-
-public class OrderList implements ListWrapper {
-    // This declaration below of _Order_obj_class is to force flash compiler to include this class
-    [XmlElements(name="order", type="com.wordnik.client.model.Order")]
-    public var order:Array = new Array();
-    private var _order_obj_class:com.wordnik.client.model.Order = null;
-
-    public function getList():Array {
-        return order;
-    }
-
-}
-}
-
diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Pet.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Pet.as
deleted file mode 100644
index 4a19692e9f1..00000000000
--- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Pet.as
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.wordnik.client.model {
-
-import com.wordnik.client.model.Category;
-import com.wordnik.client.model.Tag;
-
-[XmlRootNode(name="Pet")]
-public class Pet {
-    /* unique identifier for the pet */
-    [XmlElement(name="id")]
-    public var id:Number = 0.0;
-
-    [XmlElement(name="category")]
-    public var category:Category = null;
-
-    [XmlElement(name="name")]
-    public var name:String = null;
-
-    // This declaration below of _photoUrls_obj_class is to force flash compiler to include this class
-    [XmlElementWrapper(name="photoUrls")]
-    [XmlElements(name="photoUrl", type="com.wordnik.client.model.String")]
-    public var photoUrls:Array = new Array();
-    [XmlElementWrapper(name="tags")]
-    [XmlElements(name="tag", type="com.wordnik.client.model.Tag")]
-    public var tags:Array = new Array();
-
-    // This declaration below of _tags_obj_class is to force flash compiler to include this class
-    [XmlElement(name="status")]
-    public var status:String = null;
-    private var _photoUrls_obj_class:com.wordnik.client.model.String = null;
-
-    /* pet status in the store */
-    private var _tags_obj_class:com.wordnik.client.model.Tag = 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/src/main/flex/com/wordnik/client/model/PetList.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/PetList.as
deleted file mode 100644
index 61b4070a543..00000000000
--- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/PetList.as
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.wordnik.client.model {
-
-import com.wordnik.swagger.common.ListWrapper;
-import com.wordnik.client.model.Category;
-import com.wordnik.client.model.Tag;
-
-public class PetList implements ListWrapper {
-    // This declaration below of _Pet_obj_class is to force flash compiler to include this class
-    [XmlElements(name="pet", type="com.wordnik.client.model.Pet")]
-    public var pet:Array = new Array();
-    private var _pet_obj_class:com.wordnik.client.model.Pet = null;
-
-    public function getList():Array {
-        return pet;
-    }
-
-}
-}
-
diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Tag.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Tag.as
deleted file mode 100644
index 07f1f8dd9f3..00000000000
--- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Tag.as
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.wordnik.client.model {
-
-[XmlRootNode(name="Tag")]
-public class Tag {
-    [XmlElement(name="id")]
-    public var id:Number = 0.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/src/main/flex/com/wordnik/client/model/TagList.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/TagList.as
deleted file mode 100644
index 92a9f7d71b1..00000000000
--- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/TagList.as
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.wordnik.client.model {
-
-import com.wordnik.swagger.common.ListWrapper;
-
-public class TagList implements ListWrapper {
-    // This declaration below of _Tag_obj_class is to force flash compiler to include this class
-    [XmlElements(name="tag", type="com.wordnik.client.model.Tag")]
-    public var tag:Array = new Array();
-    private var _tag_obj_class:com.wordnik.client.model.Tag = null;
-
-    public function getList():Array {
-        return tag;
-    }
-
-}
-}
-
diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/User.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/User.as
deleted file mode 100644
index d5227f9d28e..00000000000
--- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/User.as
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.wordnik.client.model {
-
-[XmlRootNode(name="User")]
-public class User {
-    [XmlElement(name="id")]
-    public var id:Number = 0.0;
-
-    [XmlElement(name="firstName")]
-    public var firstName:String = null;
-
-    [XmlElement(name="username")]
-    public var username: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.0;
-
-    public function toString():String {
-        var str:String = "User: ";
-        str += " (id: " + id + ")";
-        str += " (firstName: " + firstName + ")";
-        str += " (username: " + username + ")";
-        str += " (lastName: " + lastName + ")";
-        str += " (email: " + email + ")";
-        str += " (password: " + password + ")";
-        str += " (phone: " + phone + ")";
-        str += " (userStatus: " + userStatus + ")";
-        return str;
-    }
-
-
-}
-}
-
diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/UserList.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/UserList.as
deleted file mode 100644
index fdaab68ac23..00000000000
--- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/UserList.as
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.wordnik.client.model {
-
-import com.wordnik.swagger.common.ListWrapper;
-
-public class UserList implements ListWrapper {
-    // This declaration below of _User_obj_class is to force flash compiler to include this class
-    [XmlElements(name="user", type="com.wordnik.client.model.User")]
-    public var user:Array = new Array();
-    private var _user_obj_class:com.wordnik.client.model.User = null;
-
-    public function getList():Array {
-        return user;
-    }
-
-}
-}
-
diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/ListWrapper.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/ListWrapper.as
deleted file mode 100644
index 1dc8ef029fa..00000000000
--- a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/ListWrapper.as
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.wordnik.swagger.common {
-public interface ListWrapper {
-
-    function getList():Array;
-
-}
-}
\ No newline at end of file
diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/SwaggerApi.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/SwaggerApi.as
deleted file mode 100644
index af58870d179..00000000000
--- a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/SwaggerApi.as
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.wordnik.swagger.common {
-import com.wordnik.swagger.common.ApiUserCredentials;
-
-import flash.events.EventDispatcher;
-import flash.events.IEventDispatcher;
-
-import mx.utils.UIDUtil;
-
-public class SwaggerApi extends EventDispatcher {
-
-    /**
-     * 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(",");
-    }
-
-    /**
-     * 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;
-    }
-    protected var _apiUsageCredentials:ApiUserCredentials;
-    protected var _apiEventNotifier:EventDispatcher;
-    protected var _apiInvoker:ApiInvoker;
-    protected var _useProxyServer:Boolean = false;
-
-    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();
-    }
-
-}
-}
\ No newline at end of file
diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/XMLWriter.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/XMLWriter.as
deleted file mode 100644
index 9b575262a31..00000000000
--- a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/XMLWriter.as
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.wordnik.swagger.common {
-public class XMLWriter {
-    public function XMLWriter() {
-        xml = <obj/>;
-    }
-    public var xml:XML;
-
-    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/src/main/flex/com/wordnik/swagger/exception/ApiError.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/exception/ApiError.as
deleted file mode 100644
index 8f473a0cbf9..00000000000
--- a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/exception/ApiError.as
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.wordnik.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/src/main/flex/com/wordnik/swagger/exception/ApiErrorCodes.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/exception/ApiErrorCodes.as
deleted file mode 100644
index 7abb7642f8e..00000000000
--- a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/exception/ApiErrorCodes.as
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.wordnik.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/flash/src/main/flex/io/swagger/client/api/PetApi.as b/samples/client/petstore/flash/src/main/flex/io/swagger/client/api/PetApi.as
new file mode 100644
index 00000000000..edd1298600f
--- /dev/null
+++ b/samples/client/petstore/flash/src/main/flex/io/swagger/client/api/PetApi.as
@@ -0,0 +1,276 @@
+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";
+
+
+    /*
+     * 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 = available): 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;
+
+    }
+    
+}
+        
+}
diff --git a/samples/client/petstore/flash/src/main/flex/io/swagger/client/api/StoreApi.as b/samples/client/petstore/flash/src/main/flex/io/swagger/client/api/StoreApi.as
new file mode 100644
index 00000000000..061878ad257
--- /dev/null
+++ b/samples/client/petstore/flash/src/main/flex/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/src/main/flex/io/swagger/client/api/UserApi.as b/samples/client/petstore/flash/src/main/flex/io/swagger/client/api/UserApi.as
new file mode 100644
index 00000000000..06b0d079799
--- /dev/null
+++ b/samples/client/petstore/flash/src/main/flex/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/src/main/flex/io/swagger/client/model/Category.as b/samples/client/petstore/flash/src/main/flex/io/swagger/client/model/Category.as
new file mode 100644
index 00000000000..6aa73414387
--- /dev/null
+++ b/samples/client/petstore/flash/src/main/flex/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/src/main/flex/io/swagger/client/model/CategoryList.as b/samples/client/petstore/flash/src/main/flex/io/swagger/client/model/CategoryList.as
new file mode 100644
index 00000000000..342cd70c001
--- /dev/null
+++ b/samples/client/petstore/flash/src/main/flex/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/src/main/flex/io/swagger/client/model/Order.as b/samples/client/petstore/flash/src/main/flex/io/swagger/client/model/Order.as
new file mode 100644
index 00000000000..d6e4e6dc4d7
--- /dev/null
+++ b/samples/client/petstore/flash/src/main/flex/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/src/main/flex/io/swagger/client/model/OrderList.as b/samples/client/petstore/flash/src/main/flex/io/swagger/client/model/OrderList.as
new file mode 100644
index 00000000000..bba3d8a4724
--- /dev/null
+++ b/samples/client/petstore/flash/src/main/flex/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/src/main/flex/io/swagger/client/model/Pet.as b/samples/client/petstore/flash/src/main/flex/io/swagger/client/model/Pet.as
new file mode 100644
index 00000000000..81b29d91e4c
--- /dev/null
+++ b/samples/client/petstore/flash/src/main/flex/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 = null;
+    
+        
+        
+        [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/src/main/flex/io/swagger/client/model/PetList.as b/samples/client/petstore/flash/src/main/flex/io/swagger/client/model/PetList.as
new file mode 100644
index 00000000000..ada0846c5ea
--- /dev/null
+++ b/samples/client/petstore/flash/src/main/flex/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/src/main/flex/io/swagger/client/model/Tag.as b/samples/client/petstore/flash/src/main/flex/io/swagger/client/model/Tag.as
new file mode 100644
index 00000000000..7387e2e2745
--- /dev/null
+++ b/samples/client/petstore/flash/src/main/flex/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/src/main/flex/io/swagger/client/model/TagList.as b/samples/client/petstore/flash/src/main/flex/io/swagger/client/model/TagList.as
new file mode 100644
index 00000000000..25ebadb27fb
--- /dev/null
+++ b/samples/client/petstore/flash/src/main/flex/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/src/main/flex/io/swagger/client/model/User.as b/samples/client/petstore/flash/src/main/flex/io/swagger/client/model/User.as
new file mode 100644
index 00000000000..2b6474de90c
--- /dev/null
+++ b/samples/client/petstore/flash/src/main/flex/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/src/main/flex/io/swagger/client/model/UserList.as b/samples/client/petstore/flash/src/main/flex/io/swagger/client/model/UserList.as
new file mode 100644
index 00000000000..e8a1fdb27f6
--- /dev/null
+++ b/samples/client/petstore/flash/src/main/flex/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/src/main/flex/com/wordnik/swagger/common/ApiInvoker.as b/samples/client/petstore/flash/src/main/flex/io/swagger/swagger/common/ApiInvoker.as
similarity index 93%
rename from samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/ApiInvoker.as
rename to samples/client/petstore/flash/src/main/flex/io/swagger/swagger/common/ApiInvoker.as
index 89fd394d2e9..98d94052ec4 100644
--- a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/ApiInvoker.as
+++ b/samples/client/petstore/flash/src/main/flex/io/swagger/swagger/common/ApiInvoker.as
@@ -1,27 +1,6 @@
-package com.wordnik.swagger.common {
-import asaxb.xml.bind.ASAXBContext;
-import asaxb.xml.bind.Unmarshaller;
-
-import com.wordnik.swagger.event.ApiClientEvent;
-import com.wordnik.swagger.event.Response;
-import com.wordnik.swagger.common.ApiUserCredentials;
-
-import flash.events.EventDispatcher;
-import flash.utils.Dictionary;
-import flash.utils.describeType;
-import flash.xml.XMLDocument;
-import flash.xml.XMLNode;
-
-import mx.messaging.ChannelSet;
-import mx.messaging.channels.HTTPChannel;
-import mx.messaging.messages.HTTPRequestMessage;
-import mx.rpc.AsyncToken;
-import mx.rpc.events.FaultEvent;
-import mx.rpc.events.ResultEvent;
-import mx.rpc.http.HTTPService;
-import mx.rpc.xml.SimpleXMLEncoder;
-import mx.utils.ObjectUtil;
-
+package io.swagger.common {
+import io.swagger.event.ApiClientEvent;
+import io.swagger.event.Response;
 
 public class ApiInvoker extends EventDispatcher {
 
diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/ApiUrlHelper.as b/samples/client/petstore/flash/src/main/flex/io/swagger/swagger/common/ApiUrlHelper.as
similarity index 74%
rename from samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/ApiUrlHelper.as
rename to samples/client/petstore/flash/src/main/flex/io/swagger/swagger/common/ApiUrlHelper.as
index 0fc7e1821b1..4333c6c7e4c 100644
--- a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/ApiUrlHelper.as
+++ b/samples/client/petstore/flash/src/main/flex/io/swagger/swagger/common/ApiUrlHelper.as
@@ -1,5 +1,5 @@
-package com.wordnik.swagger.common {
-import com.wordnik.swagger.common.ApiUserCredentials;
+package io.swagger.common {
+import io.swagger.common.ApiUserCredentials;
 
 /**
  * @private
@@ -12,17 +12,17 @@ internal class ApiUrlHelper {
 
     private static const HTTP_URL_PREFIX:String = "http://";
 
-    internal static function appendTokenInfo(restUrl:String, requestHeader:Object, credentials:ApiUserCredentials):String {
+    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) {
+        if(restUrl.indexOf("?") == -1){
             restUrl += ( "?" + API_URL_KEY + "=" + credentials.apiToken );
         }
-        else {
+        else{
             restUrl += ( "&" + API_URL_KEY + "=" + credentials.apiToken );
         }
         requestHeader.api_key = credentials.apiToken;
 
-        if (credentials.authToken != null && credentials.authToken != "") {
+        if(credentials.authToken != null && credentials.authToken != ""){
             restUrl += ( "&" + AUTH_TOKEN_URL_KEY + "=" + credentials.authToken );
             requestHeader.auth_token = credentials.authToken;
         }
@@ -30,7 +30,7 @@ internal class ApiUrlHelper {
         return restUrl;
     }
 
-    internal static function getProxyUrl(hostName:String, proxyPath:String):String {
+    internal static function getProxyUrl(hostName: String, proxyPath: String): String{
         if (hostName(hostName.length - 1) == "/") //remove trailing slash
         {
             hostName = hostName.substring(0, hostName.length - 1);
diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/ApiUserCredentials.as b/samples/client/petstore/flash/src/main/flex/io/swagger/swagger/common/ApiUserCredentials.as
similarity index 53%
rename from samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/ApiUserCredentials.as
rename to samples/client/petstore/flash/src/main/flex/io/swagger/swagger/common/ApiUserCredentials.as
index 3b0e38e6ccc..118d917a247 100644
--- a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/common/ApiUserCredentials.as
+++ b/samples/client/petstore/flash/src/main/flex/io/swagger/swagger/common/ApiUserCredentials.as
@@ -1,28 +1,10 @@
-package com.wordnik.swagger.common {
+package io.swagger.common {
 
 /**
  * Api account credentials.
  *
  */
 public class ApiUserCredentials {
-    /**
-     * 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;
-    }
     /**
      * An apitoken that is passed along with the requests
      */
@@ -39,21 +21,43 @@ public class ApiUserCredentials {
      * 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;
+
     /**
-     * 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
+     * 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 var apiProxyServerUrl:String;
+    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/src/main/flex/io/swagger/swagger/common/ListWrapper.as b/samples/client/petstore/flash/src/main/flex/io/swagger/swagger/common/ListWrapper.as
new file mode 100644
index 00000000000..b22890ad1d1
--- /dev/null
+++ b/samples/client/petstore/flash/src/main/flex/io/swagger/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/src/main/flex/io/swagger/swagger/common/SwaggerApi.as b/samples/client/petstore/flash/src/main/flex/io/swagger/swagger/common/SwaggerApi.as
new file mode 100644
index 00000000000..059de642a74
--- /dev/null
+++ b/samples/client/petstore/flash/src/main/flex/io/swagger/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/src/main/flex/io/swagger/swagger/common/XMLWriter.as b/samples/client/petstore/flash/src/main/flex/io/swagger/swagger/common/XMLWriter.as
new file mode 100644
index 00000000000..0b08066775b
--- /dev/null
+++ b/samples/client/petstore/flash/src/main/flex/io/swagger/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/src/main/flex/com/wordnik/swagger/event/ApiClientEvent.as b/samples/client/petstore/flash/src/main/flex/io/swagger/swagger/event/ApiClientEvent.as
similarity index 75%
rename from samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/event/ApiClientEvent.as
rename to samples/client/petstore/flash/src/main/flex/io/swagger/swagger/event/ApiClientEvent.as
index 923cf3454fa..d64cd304d49 100644
--- a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/event/ApiClientEvent.as
+++ b/samples/client/petstore/flash/src/main/flex/io/swagger/swagger/event/ApiClientEvent.as
@@ -1,5 +1,5 @@
-package com.wordnik.swagger.event {
-import com.wordnik.swagger.event.Response;
+package io.swagger.event {
+import io.swagger.event.Response;
 
 import flash.events.Event;
 
@@ -8,7 +8,7 @@ import flash.events.Event;
  * 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 {
+public class ApiClientEvent extends Event{
 
     /**
      * Event type to indicate a unsuccessful invocation
@@ -19,17 +19,18 @@ public class ApiClientEvent extends Event {
      * Event type to indicate a successful invocation
      */
     public static const SUCCESS_EVENT:String = "successfulInvocation";
-
-    public function ApiClientEvent(type:String, bubbles:Boolean = false, cancelable:Boolean = false) {
-        super(type, bubbles, cancelable);
-    }
+    
     /**
      * The Response object which contains response info
      */
-    public var response:Response;
+    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/src/main/flex/com/wordnik/swagger/event/Response.as b/samples/client/petstore/flash/src/main/flex/io/swagger/swagger/event/Response.as
similarity index 63%
rename from samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/event/Response.as
rename to samples/client/petstore/flash/src/main/flex/io/swagger/swagger/event/Response.as
index 2379096932a..a43b7980a38 100644
--- a/samples/client/petstore/flash/src/main/flex/com/wordnik/swagger/event/Response.as
+++ b/samples/client/petstore/flash/src/main/flex/io/swagger/swagger/event/Response.as
@@ -1,4 +1,4 @@
-package com.wordnik.swagger.event {
+package io.swagger.event {
 
 /**
  * Response contains info on the result of an API invocation.
@@ -6,47 +6,50 @@ package com.wordnik.swagger.event {
  */
 public class Response {
 
-    private static const API_ERROR_MSG:String = "Api error response: ";
-
-    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 Response(isSuccessful:Boolean, payload:Object = null, errorMessage:String = null, requestId:String = null) {
-        this.isSuccess = isSuccessful;
-        this.payload = payload;
-        this.errorMessage = getFriendlyMessage(errorMessage);
-    }
     /**
      * 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 {
+    public function toString(): String {
         return "Response (requestId:" + requestId + "; isSuccess:" + isSuccess + "; errorMessage:" + errorMessage + "; payload:" + payload + ")";
     }
 }
diff --git a/samples/client/petstore/flash/src/main/flex/io/swagger/swagger/exception/ApiErrorCodes.as b/samples/client/petstore/flash/src/main/flex/io/swagger/swagger/exception/ApiErrorCodes.as
new file mode 100644
index 00000000000..e5ea46480aa
--- /dev/null
+++ b/samples/client/petstore/flash/src/main/flex/io/swagger/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/flash/src/main/flex/io/swagger/swagger/exception/ApiErrors.as b/samples/client/petstore/flash/src/main/flex/io/swagger/swagger/exception/ApiErrors.as
new file mode 100644
index 00000000000..c8ac95a5c59
--- /dev/null
+++ b/samples/client/petstore/flash/src/main/flex/io/swagger/swagger/exception/ApiErrors.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/lib/ASAXB-0.1.1.swc b/samples/client/petstore/flash/src/main/flex/lib/ASAXB-0.1.1.swc
similarity index 100%
rename from samples/client/petstore/flash/lib/ASAXB-0.1.1.swc
rename to samples/client/petstore/flash/src/main/flex/lib/ASAXB-0.1.1.swc
diff --git a/samples/client/petstore/flash/lib/ext/as3corelib.swc b/samples/client/petstore/flash/src/main/flex/lib/as3corelib.swc
similarity index 100%
rename from samples/client/petstore/flash/lib/ext/as3corelib.swc
rename to samples/client/petstore/flash/src/main/flex/lib/as3corelib.swc
diff --git a/samples/client/petstore/flash/lib/ext/flexunit-4.1.0_RC2-28-flex_3.5.0.12683.swc b/samples/client/petstore/flash/src/main/flex/lib/ext/flexunit-4.1.0_RC2-28-flex_3.5.0.12683.swc
similarity index 100%
rename from samples/client/petstore/flash/lib/ext/flexunit-4.1.0_RC2-28-flex_3.5.0.12683.swc
rename to samples/client/petstore/flash/src/main/flex/lib/ext/flexunit-4.1.0_RC2-28-flex_3.5.0.12683.swc
diff --git a/samples/client/petstore/flash/lib/ext/flexunit-aircilistener-4.1.0_RC2-28-3.5.0.12683.swc b/samples/client/petstore/flash/src/main/flex/lib/ext/flexunit-aircilistener-4.1.0_RC2-28-3.5.0.12683.swc
similarity index 100%
rename from samples/client/petstore/flash/lib/ext/flexunit-aircilistener-4.1.0_RC2-28-3.5.0.12683.swc
rename to samples/client/petstore/flash/src/main/flex/lib/ext/flexunit-aircilistener-4.1.0_RC2-28-3.5.0.12683.swc
diff --git a/samples/client/petstore/flash/lib/ext/flexunit-cilistener-4.1.0_RC2-28-3.5.0.12683.swc b/samples/client/petstore/flash/src/main/flex/lib/ext/flexunit-cilistener-4.1.0_RC2-28-3.5.0.12683.swc
similarity index 100%
rename from samples/client/petstore/flash/lib/ext/flexunit-cilistener-4.1.0_RC2-28-3.5.0.12683.swc
rename to samples/client/petstore/flash/src/main/flex/lib/ext/flexunit-cilistener-4.1.0_RC2-28-3.5.0.12683.swc
diff --git a/samples/client/petstore/flash/lib/ext/flexunit-core-flex-4.0.0.2-sdk3.5.0.12683.swc b/samples/client/petstore/flash/src/main/flex/lib/ext/flexunit-core-flex-4.0.0.2-sdk3.5.0.12683.swc
similarity index 100%
rename from samples/client/petstore/flash/lib/ext/flexunit-core-flex-4.0.0.2-sdk3.5.0.12683.swc
rename to samples/client/petstore/flash/src/main/flex/lib/ext/flexunit-core-flex-4.0.0.2-sdk3.5.0.12683.swc
diff --git a/samples/client/petstore/java/default/hello.txt b/samples/client/petstore/java/default/hello.txt
new file mode 100644
index 00000000000..6769dd60bdf
--- /dev/null
+++ b/samples/client/petstore/java/default/hello.txt
@@ -0,0 +1 @@
+Hello world!
\ No newline at end of file
diff --git a/samples/client/petstore/java/pom.xml b/samples/client/petstore/java/default/pom.xml
similarity index 98%
rename from samples/client/petstore/java/pom.xml
rename to samples/client/petstore/java/default/pom.xml
index 058733e08fc..3cef1c564c9 100644
--- a/samples/client/petstore/java/pom.xml
+++ b/samples/client/petstore/java/default/pom.xml
@@ -112,6 +112,8 @@
       <artifactId>swagger-annotations</artifactId>
       <version>${swagger-annotations-version}</version>
     </dependency>
+
+    <!-- HTTP client: jersey-client -->
     <dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-client</artifactId>
@@ -122,6 +124,8 @@
       <artifactId>jersey-multipart</artifactId>
       <version>${jersey-version}</version>
     </dependency>
+
+    <!-- JSON processing: jackson -->
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
@@ -141,7 +145,7 @@
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-joda</artifactId>
       <version>2.1.5</version>
-    </dependency>   
+    </dependency>
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiClient.java
similarity index 65%
rename from samples/client/petstore/java/src/main/java/io/swagger/client/ApiClient.java
rename to samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiClient.java
index 0adcbe7031d..bc2dab2e8a8 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiClient.java
@@ -1,17 +1,14 @@
 package io.swagger.client;
 
-import com.fasterxml.jackson.core.JsonGenerator.Feature;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.annotation.*;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.ClientResponse;
 import com.sun.jersey.api.client.config.ClientConfig;
 import com.sun.jersey.api.client.config.DefaultClientConfig;
 import com.sun.jersey.api.client.filter.LoggingFilter;
 import com.sun.jersey.api.client.WebResource.Builder;
+
 import com.sun.jersey.multipart.FormDataMultiPart;
+import com.sun.jersey.multipart.file.FileDataBodyPart;
 
 import javax.ws.rs.core.Response.Status.Family;
 import javax.ws.rs.core.MediaType;
@@ -22,12 +19,14 @@
 import java.util.Map.Entry;
 import java.util.HashMap;
 import java.util.List;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.TimeZone;
 
 import java.net.URLEncoder;
 
 import java.io.IOException;
+import java.io.File;
 import java.io.UnsupportedEncodingException;
 
 import java.text.DateFormat;
@@ -39,11 +38,13 @@
 import io.swagger.client.auth.ApiKeyAuth;
 import io.swagger.client.auth.OAuth;
 
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-24T11:46:58.447+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 JSON json = new JSON();
 
   private Map<String, Authentication> authentications;
 
@@ -237,6 +238,62 @@ public String parameterToString(Object param) {
     }
   }
 
+  /*
+    Format to {@code Pair} objects.
+  */
+  public List<Pair> parameterToPairs(String collectionFormat, String name, Object value){
+    List<Pair> params = new ArrayList<Pair>();
+
+    // preconditions
+    if (name == null || name.isEmpty() || value == null) return params;
+
+    Collection valueCollection = null;
+    if (value instanceof Collection) {
+      valueCollection = (Collection) value;
+    } else {
+      params.add(new Pair(name, parameterToString(value)));
+      return params;
+    }
+
+    if (valueCollection.isEmpty()){
+      return params;
+    }
+
+    // get the collection format
+    collectionFormat = (collectionFormat == null || collectionFormat.isEmpty() ? "csv" : collectionFormat); // default: csv
+
+    // create the params based on the collection format
+    if (collectionFormat.equals("multi")) {
+      for (Object item : valueCollection) {
+        params.add(new Pair(name, parameterToString(item)));
+      }
+
+      return params;
+    }
+
+    String delimiter = ",";
+
+    if (collectionFormat.equals("csv")) {
+      delimiter = ",";
+    } else if (collectionFormat.equals("ssv")) {
+      delimiter = " ";
+    } else if (collectionFormat.equals("tsv")) {
+      delimiter = "\t";
+    } else if (collectionFormat.equals("pipes")) {
+      delimiter = "|";
+    }
+
+    StringBuilder sb = new StringBuilder() ;
+    for (Object item : valueCollection) {
+      sb.append(delimiter);
+      sb.append(parameterToString(item));
+    }
+
+    params.add(new Pair(name, sb.substring(1)));
+
+    return params;
+  }
+
   /**
    * Select the Accept header's value from the given accepts array:
    *   if JSON exists in the given array, use it;
@@ -279,50 +336,38 @@ public String escapeString(String str) {
   }
 
   /**
-   * Deserialize the given JSON string to Java object.
-   *
-   * @param json The JSON string
-   * @param containerType The container type, one of "list", "array" or ""
-   * @param cls The type of the Java object
-   * @return The deserialized Java object
+   * Serialize the given Java object into string according the given
+   * Content-Type (only JSON is supported for now).
    */
-  public Object deserialize(String json, String containerType, Class cls) throws ApiException {
-    if(null != containerType) {
-        containerType = containerType.toLowerCase();
-    }
-    try{
-      if("list".equals(containerType) || "array".equals(containerType)) {
-        JavaType typeInfo = JsonUtil.getJsonMapper().getTypeFactory().constructCollectionType(List.class, cls);
-        List response = (List<?>) JsonUtil.getJsonMapper().readValue(json, typeInfo);
-        return response;
-      }
-      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(), null, json);
+  public String serialize(Object obj, String contentType) throws ApiException {
+    if (contentType.startsWith("application/json")) {
+      return json.serialize(obj);
+    } else {
+      throw new ApiException(400, "can not serialize object into Content-Type: " + contentType);
     }
   }
 
   /**
-   * Serialize the given Java object into JSON string.
+   * Deserialize response body to Java object according to the Content-Type.
    */
-  public 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 <T> T deserialize(ClientResponse response, TypeRef returnType) throws ApiException {
+    String contentType = null;
+    List<String> contentTypes = response.getHeaders().get("Content-Type");
+    if (contentTypes != null && !contentTypes.isEmpty())
+      contentType = contentTypes.get(0);
+    if (contentType == null)
+      throw new ApiException(500, "missing Content-Type in response");
+
+    String body;
+    if (response.hasEntity())
+      body = (String) response.getEntity(String.class);
+    else
+      body = "";
+
+    if (contentType.startsWith("application/json")) {
+      return json.deserialize(body, returnType);
+    } else {
+      throw new ApiException(500, "can not deserialize Content-Type: " + contentType);
     }
   }
 
@@ -338,25 +383,28 @@ public String serialize(Object obj) throws ApiException {
    * @param accept The request's Accept header
    * @param contentType The request's Content-Type header
    * @param authNames The authentications to apply
+   * @param returnType The return type into which to deserialize the response
    * @return The response body in type of string
    */
-  public String invokeAPI(String path, String method, Map<String, String> queryParams, Object body, Map<String, String> headerParams, Map<String, String> formParams, String accept, String contentType, String[] authNames) throws ApiException {
+  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, TypeRef returnType) throws ApiException {
     updateParamsForAuth(authNames, queryParams, headerParams);
 
     Client client = getClient();
 
     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("?");
+    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("&");
-        b.append(escapeString(key)).append("=").append(escapeString(value));
+        }
       }
     }
-    String querystring = b.toString();
+
+    String querystring = b.substring(0, b.length() - 1);
 
     Builder builder;
     if (accept == null)
@@ -364,90 +412,89 @@ public String invokeAPI(String path, String method, Map<String, String> queryPar
     else
       builder = client.resource(basePath + path + querystring).accept(accept);
 
-    for(String key : headerParams.keySet()) {
+    for (String key : headerParams.keySet()) {
       builder = builder.header(key, headerParams.get(key));
     }
-    for(String key : defaultHeaderMap.keySet()) {
-      if(!headerParams.containsKey(key)) {
+    for (String key : defaultHeaderMap.keySet()) {
+      if (!headerParams.containsKey(key)) {
         builder = builder.header(key, defaultHeaderMap.get(key));
       }
     }
 
+    String encodedFormParams = null;
+    if (contentType.startsWith("multipart/form-data")) {
+      FormDataMultiPart mp = new FormDataMultiPart();
+      for (Entry<String, Object> param: formParams.entrySet()) {
+        if (param.getValue() instanceof File) {
+          File file = (File) param.getValue();
+          mp.field(param.getKey(), file.getName());
+          mp.bodyPart(new FileDataBodyPart(param.getKey(), file, MediaType.MULTIPART_FORM_DATA_TYPE));
+        } else {
+          mp.field(param.getKey(), parameterToString(param.getValue()), MediaType.MULTIPART_FORM_DATA_TYPE);
+        }
+      }
+      body = mp;
+    } else if (contentType.startsWith("application/x-www-form-urlencoded")) {
+      encodedFormParams = this.getXWWWFormUrlencodedParams(formParams);
+    }
+
     ClientResponse response = null;
 
-    if("GET".equals(method)) {
+    if ("GET".equals(method)) {
       response = (ClientResponse) builder.get(ClientResponse.class);
-    }
-    else if ("POST".equals(method)) {
-      if (contentType.startsWith("application/x-www-form-urlencoded")) {
-        String encodedFormParams = this
-            .getXWWWFormUrlencodedParams(formParams);
-        response = builder.type(contentType).post(ClientResponse.class,
-            encodedFormParams);
+    } else if ("POST".equals(method)) {
+      if (encodedFormParams != null) {
+        response = builder.type(contentType).post(ClientResponse.class, encodedFormParams);
       } else if (body == null) {
         response = builder.post(ClientResponse.class, null);
-      } else if(body instanceof FormDataMultiPart) {
+      } else if (body instanceof FormDataMultiPart) {
         response = builder.type(contentType).post(ClientResponse.class, body);
+      } else {
+        response = builder.type(contentType).post(ClientResponse.class, serialize(body, contentType));
       }
-      else
-        response = builder.type(contentType).post(ClientResponse.class, serialize(body));
-    }
-    else if ("PUT".equals(method)) {
-      if ("application/x-www-form-urlencoded".equals(contentType)) {
-          String encodedFormParams = this
-              .getXWWWFormUrlencodedParams(formParams);
-          response = builder.type(contentType).put(ClientResponse.class,
-              encodedFormParams);
+    } else if ("PUT".equals(method)) {
+      if (encodedFormParams != null) {
+        response = builder.type(contentType).put(ClientResponse.class, encodedFormParams);
       } else if(body == null) {
-        response = builder.put(ClientResponse.class, serialize(body));
+        response = builder.put(ClientResponse.class, serialize(body, contentType));
       } else {
-          response = builder.type(contentType).put(ClientResponse.class, serialize(body));
+        response = builder.type(contentType).put(ClientResponse.class, serialize(body, contentType));
       }
-    }
-    else if ("DELETE".equals(method)) {
-      if ("application/x-www-form-urlencoded".equals(contentType)) {
-        String encodedFormParams = this
-            .getXWWWFormUrlencodedParams(formParams);
-        response = builder.type(contentType).delete(ClientResponse.class,
-            encodedFormParams);
+    } else if ("DELETE".equals(method)) {
+      if (encodedFormParams != null) {
+        response = builder.type(contentType).delete(ClientResponse.class, encodedFormParams);
       } else if(body == null) {
         response = builder.delete(ClientResponse.class);
       } else {
-        response = builder.type(contentType).delete(ClientResponse.class, serialize(body));
+        response = builder.type(contentType).delete(ClientResponse.class, serialize(body, contentType));
       }
-    }
-    else {
+    } else {
       throw new ApiException(500, "unknown method type " + method);
     }
 
-    if(response.getClientResponseStatus() == ClientResponse.Status.NO_CONTENT) {
+    if (response.getStatusInfo() == ClientResponse.Status.NO_CONTENT) {
       return null;
-    }
-    else if(response.getClientResponseStatus().getFamily() == Family.SUCCESSFUL) {
-      if(response.hasEntity()) {
-        return (String) response.getEntity(String.class);
-      }
-      else {
-        return "";
-      }
-    }
-    else {
+    } else if (response.getStatusInfo().getFamily() == Family.SUCCESSFUL) {
+      if (returnType == null)
+        return null;
+      else
+        return deserialize(response, returnType);
+    } else {
       String message = "error";
       String respBody = null;
-      if(response.hasEntity()) {
-        try{
+      if (response.hasEntity()) {
+        try {
           respBody = String.valueOf(response.getEntity(String.class));
           message = respBody;
-        }
-        catch (RuntimeException e) {
+        } catch (RuntimeException e) {
           // e.printStackTrace();
         }
       }
       throw new ApiException(
-                response.getClientResponseStatus().getStatusCode(),
-                message,
-                response.getHeaders(),
-                respBody);
+        response.getStatusInfo().getStatusCode(),
+        message,
+        response.getHeaders(),
+        respBody);
     }
   }
 
@@ -456,7 +503,7 @@ else if(response.getClientResponseStatus().getFamily() == Family.SUCCESSFUL) {
    *
    * @param authNames The authentications to apply
    */
-  private void updateParamsForAuth(String[] authNames, Map<String, String> queryParams, Map<String, String> headerParams) {
+  private void updateParamsForAuth(String[] authNames, List<Pair> queryParams, Map<String, String> headerParams) {
     for (String authName : authNames) {
       Authentication auth = authentications.get(authName);
       if (auth == null) throw new RuntimeException("Authentication undefined: " + authName);
@@ -467,15 +514,14 @@ private void updateParamsForAuth(String[] authNames, Map<String, String> queryPa
   /**
    * Encode the given form parameters as request body.
    */
-  private String getXWWWFormUrlencodedParams(Map<String, String> formParams) {
+  private String getXWWWFormUrlencodedParams(Map<String, Object> formParams) {
     StringBuilder formParamBuilder = new StringBuilder();
 
-    for (Entry<String, String> param : formParams.entrySet()) {
-      String keyStr = parameterToString(param.getKey());
+    for (Entry<String, Object> param : formParams.entrySet()) {
+      String keyStr = param.getKey();
       String valueStr = parameterToString(param.getValue());
-
       try {
-        formParamBuilder.append(URLEncoder.encode(keyStr, "utf8"))
+        formParamBuilder.append(URLEncoder.encode(param.getKey(), "utf8"))
             .append("=")
             .append(URLEncoder.encode(valueStr, "utf8"));
         formParamBuilder.append("&");
@@ -483,11 +529,12 @@ private String getXWWWFormUrlencodedParams(Map<String, String> formParams) {
         // move on to next
       }
     }
+
     String encodedFormParams = formParamBuilder.toString();
     if (encodedFormParams.endsWith("&")) {
-      encodedFormParams = encodedFormParams.substring(0,
-          encodedFormParams.length() - 1);
+      encodedFormParams = encodedFormParams.substring(0, encodedFormParams.length() - 1);
     }
+
     return encodedFormParams;
   }
 
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/ApiException.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiException.java
similarity index 88%
rename from samples/client/petstore/java/src/main/java/io/swagger/client/ApiException.java
rename to samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiException.java
index a39785eb47e..679786deb10 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/ApiException.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiException.java
@@ -3,6 +3,7 @@
 import java.util.Map;
 import java.util.List;
 
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-24T11:46:58.447+08:00")
 public class ApiException extends Exception {
   private int code = 0;
   private String message = null;
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/Configuration.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/Configuration.java
similarity index 81%
rename from samples/client/petstore/java/src/main/java/io/swagger/client/Configuration.java
rename to samples/client/petstore/java/default/src/main/java/io/swagger/client/Configuration.java
index 04899a110f6..0a674b8d52a 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/Configuration.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/Configuration.java
@@ -1,5 +1,6 @@
 package io.swagger.client;
 
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-24T11:46:58.447+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/JSON.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/JSON.java
new file mode 100644
index 00000000000..5523b921e45
--- /dev/null
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/JSON.java
@@ -0,0 +1,54 @@
+package io.swagger.client;
+
+import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.datatype.joda.*;
+
+import java.io.IOException;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-24T18:19:30.060+08:00")
+public class JSON {
+  private ObjectMapper mapper;
+
+  public JSON() {
+    mapper = new ObjectMapper();
+    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());
+	}
+
+  /**
+   * Serialize the given Java object into JSON string.
+   */
+  public String serialize(Object obj) throws ApiException {
+    try {
+      if (obj != null)
+        return mapper.writeValueAsString(obj);
+      else
+        return null;
+    } catch (Exception e) {
+      throw new ApiException(400, e.getMessage());
+    }
+  }
+
+  /**
+   * Deserialize the given JSON string to Java object.
+   *
+   * @param body The JSON string
+   * @param returnType The type to deserialize inot
+   * @return The deserialized Java object
+   */
+  public <T> T deserialize(String body, TypeRef returnType) throws ApiException {
+    JavaType javaType = mapper.constructType(returnType.getType());
+    try {
+      return mapper.readValue(body, javaType);
+    } catch (IOException e) {
+      if (returnType.getType().equals(String.class))
+        return (T) body;
+      else
+        throw new ApiException(500, e.getMessage(), null, body);
+    }
+  }
+}
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
new file mode 100644
index 00000000000..9f9e2c96b4c
--- /dev/null
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/Pair.java
@@ -0,0 +1,39 @@
+package io.swagger.client;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-24T11:46:58.447+08:00")
+public class Pair {
+    private String name = "";
+    private String value = "";
+
+    public Pair (String name, String value) {
+        setName(name);
+        setValue(value);
+    }
+
+    private void setName(String name) {
+        if (!isValidString(name)) return;
+
+        this.name = name;
+    }
+
+    private void setValue(String value) {
+        if (!isValidString(value)) return;
+
+        this.value = value;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    private boolean isValidString(String arg) {
+        if (arg == null) return false;
+        if (arg.trim().isEmpty()) return false;
+
+        return true;
+    }
+}
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/StringUtil.java
similarity index 90%
rename from samples/client/petstore/java/src/main/java/io/swagger/client/StringUtil.java
rename to samples/client/petstore/java/default/src/main/java/io/swagger/client/StringUtil.java
index 5b5af2d5ce0..de5e940ba55 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/StringUtil.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/StringUtil.java
@@ -1,5 +1,6 @@
 package io.swagger.client;
 
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-24T11:46:58.447+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/TypeRef.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/TypeRef.java
new file mode 100644
index 00000000000..cd69bd71e7c
--- /dev/null
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/TypeRef.java
@@ -0,0 +1,26 @@
+package io.swagger.client;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-24T11:46:58.447+08:00")
+public class TypeRef<T> {
+    private final Type type;
+
+    public TypeRef() {
+        this.type = getGenericType(getClass());
+    }
+
+    private static Type getGenericType(Class<?> klass) {
+        Type superclass = klass.getGenericSuperclass();
+        if (superclass instanceof Class) {
+            throw new RuntimeException("No type parameter provided");
+        }
+        ParameterizedType parameterized = (ParameterizedType) superclass;
+        return parameterized.getActualTypeArguments()[0];
+    }
+
+    public Type getType() {
+        return type;
+    }
+}
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java
similarity index 52%
rename from samples/client/petstore/java/src/main/java/io/swagger/client/api/PetApi.java
rename to samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java
index c102cf00b51..75dfc35beb1 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java
@@ -3,6 +3,8 @@
 import io.swagger.client.ApiException;
 import io.swagger.client.ApiClient;
 import io.swagger.client.Configuration;
+import io.swagger.client.Pair;
+import io.swagger.client.TypeRef;
 
 import io.swagger.client.model.*;
 
@@ -11,15 +13,11 @@
 import io.swagger.client.model.Pet;
 import java.io.File;
 
-import com.sun.jersey.multipart.FormDataMultiPart;
-import com.sun.jersey.multipart.file.FileDataBodyPart;
-
-import javax.ws.rs.core.MediaType;
-
 import java.io.File;
 import java.util.Map;
 import java.util.HashMap;
 
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-24T11:46:58.447+08:00")
 public class PetApi {
   private ApiClient apiClient;
 
@@ -54,9 +52,11 @@ public void updatePet (Pet body) throws ApiException {
     String path = "/pet".replaceAll("\\{format\\}","json");
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, Object> formParams = new HashMap<String, Object>();
+
+    
 
     
 
@@ -72,29 +72,10 @@ public void updatePet (Pet body) throws ApiException {
     };
     final String contentType = apiClient.selectHeaderContentType(contentTypes);
 
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      
-    }
-
-    try {
-      String[] authNames = new String[] { "petstore_auth" };
-      String response = apiClient.invokeAPI(path, "PUT", queryParams, postBody, headerParams, formParams, accept, contentType, authNames);
-      if(response != null){
-        return ;
-      }
-      else {
-        return ;
-      }
-    } catch (ApiException ex) {
-      throw ex;
-    }
+    String[] authNames = new String[] { "petstore_auth" };
+    
+    apiClient.invokeAPI(path, "PUT", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    
   }
   
   /**
@@ -111,9 +92,11 @@ public void addPet (Pet body) throws ApiException {
     String path = "/pet".replaceAll("\\{format\\}","json");
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, Object> formParams = new HashMap<String, Object>();
+
+    
 
     
 
@@ -129,29 +112,10 @@ public void addPet (Pet body) throws ApiException {
     };
     final String contentType = apiClient.selectHeaderContentType(contentTypes);
 
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      
-    }
-
-    try {
-      String[] authNames = new String[] { "petstore_auth" };
-      String response = apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames);
-      if(response != null){
-        return ;
-      }
-      else {
-        return ;
-      }
-    } catch (ApiException ex) {
-      throw ex;
-    }
+    String[] authNames = new String[] { "petstore_auth" };
+    
+    apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    
   }
   
   /**
@@ -168,12 +132,14 @@ public List<Pet> findPetsByStatus (List<String> status) throws ApiException {
     String path = "/pet/findByStatus".replaceAll("\\{format\\}","json");
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, Object> formParams = new HashMap<String, Object>();
+
+    
+    queryParams.addAll(apiClient.parameterToPairs("multi", "status", status));
+    
 
-    if (status != null)
-      queryParams.put("status", apiClient.parameterToString(status));
     
 
     
@@ -188,29 +154,11 @@ public List<Pet> findPetsByStatus (List<String> status) throws ApiException {
     };
     final String contentType = apiClient.selectHeaderContentType(contentTypes);
 
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      
-    }
-
-    try {
-      String[] authNames = new String[] { "petstore_auth" };
-      String response = apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames);
-      if(response != null){
-        return (List<Pet>) apiClient.deserialize(response, "array", Pet.class);
-      }
-      else {
-        return null;
-      }
-    } catch (ApiException ex) {
-      throw ex;
-    }
+    String[] authNames = new String[] { "petstore_auth" };
+    
+    TypeRef returnType = new TypeRef<List<Pet>>() {};
+    return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
+    
   }
   
   /**
@@ -227,12 +175,14 @@ public List<Pet> findPetsByTags (List<String> tags) throws ApiException {
     String path = "/pet/findByTags".replaceAll("\\{format\\}","json");
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, Object> formParams = new HashMap<String, Object>();
+
+    
+    queryParams.addAll(apiClient.parameterToPairs("multi", "tags", tags));
+    
 
-    if (tags != null)
-      queryParams.put("tags", apiClient.parameterToString(tags));
     
 
     
@@ -247,29 +197,11 @@ public List<Pet> findPetsByTags (List<String> tags) throws ApiException {
     };
     final String contentType = apiClient.selectHeaderContentType(contentTypes);
 
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      
-    }
-
-    try {
-      String[] authNames = new String[] { "petstore_auth" };
-      String response = apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames);
-      if(response != null){
-        return (List<Pet>) apiClient.deserialize(response, "array", Pet.class);
-      }
-      else {
-        return null;
-      }
-    } catch (ApiException ex) {
-      throw ex;
-    }
+    String[] authNames = new String[] { "petstore_auth" };
+    
+    TypeRef returnType = new TypeRef<List<Pet>>() {};
+    return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
+    
   }
   
   /**
@@ -292,9 +224,11 @@ public Pet getPetById (Long petId) throws ApiException {
       .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, Object> formParams = new HashMap<String, Object>();
+
+    
 
     
 
@@ -310,29 +244,11 @@ public Pet getPetById (Long petId) throws ApiException {
     };
     final String contentType = apiClient.selectHeaderContentType(contentTypes);
 
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      
-    }
-
-    try {
-      String[] authNames = new String[] { "petstore_auth", "api_key" };
-      String response = apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames);
-      if(response != null){
-        return (Pet) apiClient.deserialize(response, "", Pet.class);
-      }
-      else {
-        return null;
-      }
-    } catch (ApiException ex) {
-      throw ex;
-    }
+    String[] authNames = new String[] { "api_key", "petstore_auth" };
+    
+    TypeRef returnType = new TypeRef<Pet>() {};
+    return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
+    
   }
   
   /**
@@ -357,12 +273,18 @@ public void updatePetWithForm (String petId, String name, String status) throws
       .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = 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 = {
@@ -375,53 +297,20 @@ public void updatePetWithForm (String petId, String name, String status) throws
     };
     final String contentType = apiClient.selectHeaderContentType(contentTypes);
 
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      
-      if (name != null) {
-        hasFields = true;
-        mp.field("name", apiClient.parameterToString(name), MediaType.MULTIPART_FORM_DATA_TYPE);
-      }
-      
-      if (status != null) {
-        hasFields = true;
-        mp.field("status", apiClient.parameterToString(status), MediaType.MULTIPART_FORM_DATA_TYPE);
-      }
-      
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      if (name != null)
-        formParams.put("name", apiClient.parameterToString(name));
-      if (status != null)
-        formParams.put("status", apiClient.parameterToString(status));
-      
-    }
-
-    try {
-      String[] authNames = new String[] { "petstore_auth" };
-      String response = apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames);
-      if(response != null){
-        return ;
-      }
-      else {
-        return ;
-      }
-    } catch (ApiException ex) {
-      throw ex;
-    }
+    String[] authNames = new String[] { "petstore_auth" };
+    
+    apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    
   }
   
   /**
    * Deletes a pet
    * 
-   * @param apiKey 
    * @param petId Pet id to delete
+   * @param apiKey 
    * @return void
    */
-  public void deletePet (String apiKey, Long petId) throws ApiException {
+  public void deletePet (Long petId, String apiKey) throws ApiException {
     Object postBody = null;
     
     // verify the required parameter 'petId' is set
@@ -435,14 +324,16 @@ public void deletePet (String apiKey, Long petId) throws ApiException {
       .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, Object> formParams = new HashMap<String, Object>();
 
     
 
     if (apiKey != null)
-      headerParams.put("api_key", apiClient.parameterToString(apiKey));
+    headerParams.put("api_key", apiClient.parameterToString(apiKey));
+    
+
     
 
     final String[] accepts = {
@@ -455,29 +346,10 @@ public void deletePet (String apiKey, Long petId) throws ApiException {
     };
     final String contentType = apiClient.selectHeaderContentType(contentTypes);
 
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      
-    }
-
-    try {
-      String[] authNames = new String[] { "petstore_auth" };
-      String response = apiClient.invokeAPI(path, "DELETE", queryParams, postBody, headerParams, formParams, accept, contentType, authNames);
-      if(response != null){
-        return ;
-      }
-      else {
-        return ;
-      }
-    } catch (ApiException ex) {
-      throw ex;
-    }
+    String[] authNames = new String[] { "petstore_auth" };
+    
+    apiClient.invokeAPI(path, "DELETE", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    
   }
   
   /**
@@ -502,12 +374,18 @@ public void uploadFile (Long petId, String additionalMetadata, File file) throws
       .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = 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);
     
 
     final String[] accepts = {
@@ -520,43 +398,10 @@ public void uploadFile (Long petId, String additionalMetadata, File file) throws
     };
     final String contentType = apiClient.selectHeaderContentType(contentTypes);
 
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      
-      if (additionalMetadata != null) {
-        hasFields = true;
-        mp.field("additionalMetadata", apiClient.parameterToString(additionalMetadata), MediaType.MULTIPART_FORM_DATA_TYPE);
-      }
-      
-      if (file != null) {
-        hasFields = true;
-        mp.field("file", file.getName());
-        mp.bodyPart(new FileDataBodyPart("file", file, MediaType.MULTIPART_FORM_DATA_TYPE));
-      }
-      
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      if (additionalMetadata != null)
-        formParams.put("additionalMetadata", apiClient.parameterToString(additionalMetadata));
-      
-      
-    }
-
-    try {
-      String[] authNames = new String[] { "petstore_auth" };
-      String response = apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames);
-      if(response != null){
-        return ;
-      }
-      else {
-        return ;
-      }
-    } catch (ApiException ex) {
-      throw ex;
-    }
+    String[] authNames = new String[] { "petstore_auth" };
+    
+    apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    
   }
   
 }
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/StoreApi.java
similarity index 58%
rename from samples/client/petstore/java/src/main/java/io/swagger/client/api/StoreApi.java
rename to samples/client/petstore/java/default/src/main/java/io/swagger/client/api/StoreApi.java
index 727e791c603..a488fb37445 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/api/StoreApi.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/StoreApi.java
@@ -3,6 +3,8 @@
 import io.swagger.client.ApiException;
 import io.swagger.client.ApiClient;
 import io.swagger.client.Configuration;
+import io.swagger.client.Pair;
+import io.swagger.client.TypeRef;
 
 import io.swagger.client.model.*;
 
@@ -11,15 +13,11 @@
 import java.util.Map;
 import io.swagger.client.model.Order;
 
-import com.sun.jersey.multipart.FormDataMultiPart;
-import com.sun.jersey.multipart.file.FileDataBodyPart;
-
-import javax.ws.rs.core.MediaType;
-
 import java.io.File;
 import java.util.Map;
 import java.util.HashMap;
 
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-24T11:46:58.447+08:00")
 public class StoreApi {
   private ApiClient apiClient;
 
@@ -53,9 +51,11 @@ public Map<String, Integer> getInventory () throws ApiException {
     String path = "/store/inventory".replaceAll("\\{format\\}","json");
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, Object> formParams = new HashMap<String, Object>();
+
+    
 
     
 
@@ -71,29 +71,11 @@ public Map<String, Integer> getInventory () throws ApiException {
     };
     final String contentType = apiClient.selectHeaderContentType(contentTypes);
 
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      
-    }
-
-    try {
-      String[] authNames = new String[] { "api_key" };
-      String response = apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames);
-      if(response != null){
-        return (Map<String, Integer>) apiClient.deserialize(response, "map", Map.class);
-      }
-      else {
-        return null;
-      }
-    } catch (ApiException ex) {
-      throw ex;
-    }
+    String[] authNames = new String[] { "api_key" };
+    
+    TypeRef returnType = new TypeRef<Map<String, Integer>>() {};
+    return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
+    
   }
   
   /**
@@ -110,9 +92,11 @@ public Order placeOrder (Order body) throws ApiException {
     String path = "/store/order".replaceAll("\\{format\\}","json");
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, Object> formParams = new HashMap<String, Object>();
+
+    
 
     
 
@@ -128,29 +112,11 @@ public Order placeOrder (Order body) throws ApiException {
     };
     final String contentType = apiClient.selectHeaderContentType(contentTypes);
 
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      
-    }
-
-    try {
-      String[] authNames = new String[] {  };
-      String response = apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames);
-      if(response != null){
-        return (Order) apiClient.deserialize(response, "", Order.class);
-      }
-      else {
-        return null;
-      }
-    } catch (ApiException ex) {
-      throw ex;
-    }
+    String[] authNames = new String[] {  };
+    
+    TypeRef returnType = new TypeRef<Order>() {};
+    return apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
+    
   }
   
   /**
@@ -173,9 +139,11 @@ public Order getOrderById (String orderId) throws ApiException {
       .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString()));
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, Object> formParams = new HashMap<String, Object>();
+
+    
 
     
 
@@ -191,29 +159,11 @@ public Order getOrderById (String orderId) throws ApiException {
     };
     final String contentType = apiClient.selectHeaderContentType(contentTypes);
 
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      
-    }
-
-    try {
-      String[] authNames = new String[] {  };
-      String response = apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames);
-      if(response != null){
-        return (Order) apiClient.deserialize(response, "", Order.class);
-      }
-      else {
-        return null;
-      }
-    } catch (ApiException ex) {
-      throw ex;
-    }
+    String[] authNames = new String[] {  };
+    
+    TypeRef returnType = new TypeRef<Order>() {};
+    return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
+    
   }
   
   /**
@@ -236,9 +186,11 @@ public void deleteOrder (String orderId) throws ApiException {
       .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString()));
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, Object> formParams = new HashMap<String, Object>();
+
+    
 
     
 
@@ -254,29 +206,10 @@ public void deleteOrder (String orderId) throws ApiException {
     };
     final String contentType = apiClient.selectHeaderContentType(contentTypes);
 
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      
-    }
-
-    try {
-      String[] authNames = new String[] {  };
-      String response = apiClient.invokeAPI(path, "DELETE", queryParams, postBody, headerParams, formParams, accept, contentType, authNames);
-      if(response != null){
-        return ;
-      }
-      else {
-        return ;
-      }
-    } catch (ApiException ex) {
-      throw ex;
-    }
+    String[] authNames = new String[] {  };
+    
+    apiClient.invokeAPI(path, "DELETE", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    
   }
   
 }
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/UserApi.java
similarity index 55%
rename from samples/client/petstore/java/src/main/java/io/swagger/client/api/UserApi.java
rename to samples/client/petstore/java/default/src/main/java/io/swagger/client/api/UserApi.java
index 9e55bbed590..3dee565a271 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/api/UserApi.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/UserApi.java
@@ -3,6 +3,8 @@
 import io.swagger.client.ApiException;
 import io.swagger.client.ApiClient;
 import io.swagger.client.Configuration;
+import io.swagger.client.Pair;
+import io.swagger.client.TypeRef;
 
 import io.swagger.client.model.*;
 
@@ -11,15 +13,11 @@
 import io.swagger.client.model.User;
 import java.util.*;
 
-import com.sun.jersey.multipart.FormDataMultiPart;
-import com.sun.jersey.multipart.file.FileDataBodyPart;
-
-import javax.ws.rs.core.MediaType;
-
 import java.io.File;
 import java.util.Map;
 import java.util.HashMap;
 
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-24T11:46:58.447+08:00")
 public class UserApi {
   private ApiClient apiClient;
 
@@ -54,9 +52,11 @@ public void createUser (User body) throws ApiException {
     String path = "/user".replaceAll("\\{format\\}","json");
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, Object> formParams = new HashMap<String, Object>();
+
+    
 
     
 
@@ -72,29 +72,10 @@ public void createUser (User body) throws ApiException {
     };
     final String contentType = apiClient.selectHeaderContentType(contentTypes);
 
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      
-    }
-
-    try {
-      String[] authNames = new String[] {  };
-      String response = apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames);
-      if(response != null){
-        return ;
-      }
-      else {
-        return ;
-      }
-    } catch (ApiException ex) {
-      throw ex;
-    }
+    String[] authNames = new String[] {  };
+    
+    apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    
   }
   
   /**
@@ -111,9 +92,11 @@ public void createUsersWithArrayInput (List<User> body) throws ApiException {
     String path = "/user/createWithArray".replaceAll("\\{format\\}","json");
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, Object> formParams = new HashMap<String, Object>();
+
+    
 
     
 
@@ -129,29 +112,10 @@ public void createUsersWithArrayInput (List<User> body) throws ApiException {
     };
     final String contentType = apiClient.selectHeaderContentType(contentTypes);
 
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      
-    }
-
-    try {
-      String[] authNames = new String[] {  };
-      String response = apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames);
-      if(response != null){
-        return ;
-      }
-      else {
-        return ;
-      }
-    } catch (ApiException ex) {
-      throw ex;
-    }
+    String[] authNames = new String[] {  };
+    
+    apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    
   }
   
   /**
@@ -168,9 +132,11 @@ public void createUsersWithListInput (List<User> body) throws ApiException {
     String path = "/user/createWithList".replaceAll("\\{format\\}","json");
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, Object> formParams = new HashMap<String, Object>();
+
+    
 
     
 
@@ -186,29 +152,10 @@ public void createUsersWithListInput (List<User> body) throws ApiException {
     };
     final String contentType = apiClient.selectHeaderContentType(contentTypes);
 
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      
-    }
-
-    try {
-      String[] authNames = new String[] {  };
-      String response = apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames);
-      if(response != null){
-        return ;
-      }
-      else {
-        return ;
-      }
-    } catch (ApiException ex) {
-      throw ex;
-    }
+    String[] authNames = new String[] {  };
+    
+    apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    
   }
   
   /**
@@ -226,14 +173,16 @@ public String loginUser (String username, String password) throws ApiException {
     String path = "/user/login".replaceAll("\\{format\\}","json");
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, Object> formParams = new HashMap<String, Object>();
+
+    
+    queryParams.addAll(apiClient.parameterToPairs("", "username", username));
+    
+    queryParams.addAll(apiClient.parameterToPairs("", "password", password));
+    
 
-    if (username != null)
-      queryParams.put("username", apiClient.parameterToString(username));
-    if (password != null)
-      queryParams.put("password", apiClient.parameterToString(password));
     
 
     
@@ -248,29 +197,11 @@ public String loginUser (String username, String password) throws ApiException {
     };
     final String contentType = apiClient.selectHeaderContentType(contentTypes);
 
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      
-    }
-
-    try {
-      String[] authNames = new String[] {  };
-      String response = apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames);
-      if(response != null){
-        return (String) apiClient.deserialize(response, "", String.class);
-      }
-      else {
-        return null;
-      }
-    } catch (ApiException ex) {
-      throw ex;
-    }
+    String[] authNames = new String[] {  };
+    
+    TypeRef returnType = new TypeRef<String>() {};
+    return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
+    
   }
   
   /**
@@ -286,9 +217,11 @@ public void logoutUser () throws ApiException {
     String path = "/user/logout".replaceAll("\\{format\\}","json");
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, Object> formParams = new HashMap<String, Object>();
+
+    
 
     
 
@@ -304,29 +237,10 @@ public void logoutUser () throws ApiException {
     };
     final String contentType = apiClient.selectHeaderContentType(contentTypes);
 
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      
-    }
-
-    try {
-      String[] authNames = new String[] {  };
-      String response = apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames);
-      if(response != null){
-        return ;
-      }
-      else {
-        return ;
-      }
-    } catch (ApiException ex) {
-      throw ex;
-    }
+    String[] authNames = new String[] {  };
+    
+    apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    
   }
   
   /**
@@ -349,9 +263,11 @@ public User getUserByName (String username) throws ApiException {
       .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, Object> formParams = new HashMap<String, Object>();
+
+    
 
     
 
@@ -367,29 +283,11 @@ public User getUserByName (String username) throws ApiException {
     };
     final String contentType = apiClient.selectHeaderContentType(contentTypes);
 
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      
-    }
-
-    try {
-      String[] authNames = new String[] {  };
-      String response = apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames);
-      if(response != null){
-        return (User) apiClient.deserialize(response, "", User.class);
-      }
-      else {
-        return null;
-      }
-    } catch (ApiException ex) {
-      throw ex;
-    }
+    String[] authNames = new String[] {  };
+    
+    TypeRef returnType = new TypeRef<User>() {};
+    return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
+    
   }
   
   /**
@@ -413,9 +311,11 @@ public void updateUser (String username, User body) throws ApiException {
       .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, Object> formParams = new HashMap<String, Object>();
+
+    
 
     
 
@@ -431,29 +331,10 @@ public void updateUser (String username, User body) throws ApiException {
     };
     final String contentType = apiClient.selectHeaderContentType(contentTypes);
 
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      
-    }
-
-    try {
-      String[] authNames = new String[] {  };
-      String response = apiClient.invokeAPI(path, "PUT", queryParams, postBody, headerParams, formParams, accept, contentType, authNames);
-      if(response != null){
-        return ;
-      }
-      else {
-        return ;
-      }
-    } catch (ApiException ex) {
-      throw ex;
-    }
+    String[] authNames = new String[] {  };
+    
+    apiClient.invokeAPI(path, "PUT", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    
   }
   
   /**
@@ -476,9 +357,11 @@ public void deleteUser (String username) throws ApiException {
       .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
 
     // query params
-    Map<String, String> queryParams = new HashMap<String, String>();
+    List<Pair> queryParams = new ArrayList<Pair>();
     Map<String, String> headerParams = new HashMap<String, String>();
-    Map<String, String> formParams = new HashMap<String, String>();
+    Map<String, Object> formParams = new HashMap<String, Object>();
+
+    
 
     
 
@@ -494,29 +377,10 @@ public void deleteUser (String username) throws ApiException {
     };
     final String contentType = apiClient.selectHeaderContentType(contentTypes);
 
-    if(contentType.startsWith("multipart/form-data")) {
-      boolean hasFields = false;
-      FormDataMultiPart mp = new FormDataMultiPart();
-      
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      
-    }
-
-    try {
-      String[] authNames = new String[] {  };
-      String response = apiClient.invokeAPI(path, "DELETE", queryParams, postBody, headerParams, formParams, accept, contentType, authNames);
-      if(response != null){
-        return ;
-      }
-      else {
-        return ;
-      }
-    } catch (ApiException ex) {
-      throw ex;
-    }
+    String[] authNames = new String[] {  };
+    
+    apiClient.invokeAPI(path, "DELETE", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    
   }
   
 }
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
similarity index 76%
rename from samples/client/petstore/java/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
rename to samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
index ce55babb51d..dccddad0088 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
@@ -1,7 +1,11 @@
 package io.swagger.client.auth;
 
+import io.swagger.client.Pair;
+
 import java.util.Map;
+import java.util.List;
 
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-24T11:46:58.447+08:00")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
@@ -39,7 +43,7 @@ public void setApiKeyPrefix(String apiKeyPrefix) {
   }
 
   @Override
-  public void applyToParams(Map<String, String> queryParams, Map<String, String> headerParams) {
+  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams) {
     String value;
     if (apiKeyPrefix != null) {
       value = apiKeyPrefix + " " + apiKey;
@@ -47,7 +51,7 @@ public void applyToParams(Map<String, String> queryParams, Map<String, String> h
       value = apiKey;
     }
     if (location == "query") {
-      queryParams.put(paramName, value);
+      queryParams.add(new Pair(paramName, value));
     } else if (location == "header") {
       headerParams.put(paramName, value);
     }
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/Authentication.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/Authentication.java
new file mode 100644
index 00000000000..7efcc795425
--- /dev/null
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/Authentication.java
@@ -0,0 +1,12 @@
+package io.swagger.client.auth;
+
+import io.swagger.client.Pair;
+
+import java.util.Map;
+import java.util.List;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-24T11:46:58.447+08:00")
+public interface Authentication {
+  /** Apply authentication settings to header and query params. */
+  void applyToParams(List<Pair> queryParams, Map<String, String> headerParams);
+}
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
similarity index 75%
rename from samples/client/petstore/java/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
rename to samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
index 24bff8c2266..41d7988af0d 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
@@ -1,10 +1,14 @@
 package io.swagger.client.auth;
 
+import io.swagger.client.Pair;
+
 import java.util.Map;
+import java.util.List;
 
 import java.io.UnsupportedEncodingException;
 import javax.xml.bind.DatatypeConverter;
 
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-24T11:46:58.447+08:00")
 public class HttpBasicAuth implements Authentication {
   private String username;
   private String password;
@@ -26,7 +30,7 @@ public void setPassword(String password) {
   }
 
   @Override
-  public void applyToParams(Map<String, String> queryParams, Map<String, String> headerParams) {
+  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams) {
     String str = (username == null ? "" : username) + ":" + (password == null ? "" : password);
     try {
       headerParams.put("Authorization", "Basic " + DatatypeConverter.printBase64Binary(str.getBytes("UTF-8")));
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
new file mode 100644
index 00000000000..20520b96813
--- /dev/null
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/OAuth.java
@@ -0,0 +1,14 @@
+package io.swagger.client.auth;
+
+import io.swagger.client.Pair;
+
+import java.util.Map;
+import java.util.List;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-24T11:46:58.447+08:00")
+public class OAuth implements Authentication {
+  @Override
+  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams) {
+    // TODO: support oauth
+  }
+}
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
new file mode 100644
index 00000000000..b7ccc46204c
--- /dev/null
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Category.java
@@ -0,0 +1,53 @@
+package io.swagger.client.model;
+
+
+
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+@ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-24T11:46:58.447+08:00")
+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 String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Category {\n");
+    
+    sb.append("  id: ").append(id).append("\n");
+    sb.append("  name: ").append(name).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/client/petstore/java/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
new file mode 100644
index 00000000000..e89c1f3fb40
--- /dev/null
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Order.java
@@ -0,0 +1,127 @@
+package io.swagger.client.model;
+
+import java.util.Date;
+
+
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+@ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-24T18:19:30.060+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
+  public String toString() {
+    return value;
+  }
+}
+
+  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 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/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
new file mode 100644
index 00000000000..b3b0e1b5347
--- /dev/null
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Pet.java
@@ -0,0 +1,129 @@
+package io.swagger.client.model;
+
+import io.swagger.client.model.Category;
+import java.util.*;
+import io.swagger.client.model.Tag;
+
+
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+@ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-24T18:19:30.060+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
+  public String toString() {
+    return value;
+  }
+}
+
+  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 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/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
new file mode 100644
index 00000000000..2550d7c7636
--- /dev/null
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Tag.java
@@ -0,0 +1,53 @@
+package io.swagger.client.model;
+
+
+
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+@ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-24T11:46:58.447+08:00")
+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 String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Tag {\n");
+    
+    sb.append("  id: ").append(id).append("\n");
+    sb.append("  name: ").append(name).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/client/petstore/java/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
new file mode 100644
index 00000000000..d27f1c2658d
--- /dev/null
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/User.java
@@ -0,0 +1,138 @@
+package io.swagger.client.model;
+
+
+
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+@ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-24T11:46:58.447+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;
+
+  
+  /**
+   **/
+  @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 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/client/petstore/java/src/test/java/io/swagger/client/ApiClientTest.java b/samples/client/petstore/java/default/src/test/java/io/swagger/client/ApiClientTest.java
similarity index 55%
rename from samples/client/petstore/java/src/test/java/io/swagger/client/ApiClientTest.java
rename to samples/client/petstore/java/default/src/test/java/io/swagger/client/ApiClientTest.java
index 8a560d2d7bc..802c0cae3b9 100644
--- a/samples/client/petstore/java/src/test/java/io/swagger/client/ApiClientTest.java
+++ b/samples/client/petstore/java/default/src/test/java/io/swagger/client/ApiClientTest.java
@@ -2,7 +2,7 @@
 
 import io.swagger.client.auth.*;
 
-import java.util.Map;
+import java.util.*;
 
 import org.junit.*;
 import static org.junit.Assert.*;
@@ -109,4 +109,85 @@ public void testSetApiKeyAndPrefix() {
         auth.setApiKey(null);
         auth.setApiKeyPrefix(null);
     }
+
+    @Test
+    public void testParameterToPairsWhenNameIsInvalid() throws Exception {
+        List<Pair> pairs_a = apiClient.parameterToPairs("csv", null, new Integer(1));
+        List<Pair> pairs_b = apiClient.parameterToPairs("csv", "", new Integer(1));
+
+        assertTrue(pairs_a.isEmpty());
+        assertTrue(pairs_b.isEmpty());
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsNull() throws Exception {
+        List<Pair> pairs = apiClient.parameterToPairs("csv", "param-a", null);
+
+        assertTrue(pairs.isEmpty());
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsEmptyStrings() throws Exception {
+
+        // single empty string
+        List<Pair> pairs = apiClient.parameterToPairs("csv", "param-a", " ");
+        assertEquals(1, pairs.size());
+
+        // list of empty strings
+        List<String> strs = new ArrayList<String>();
+        strs.add(" ");
+        strs.add(" ");
+        strs.add(" ");
+
+        List<Pair> concatStrings = apiClient.parameterToPairs("csv", "param-a", strs);
+
+        assertEquals(1, concatStrings.size());
+        assertFalse(concatStrings.get(0).getValue().isEmpty()); // should contain some delimiters
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsNotCollection() throws Exception {
+        String name = "param-a";
+        Integer value = 1;
+
+        List<Pair> pairs = apiClient.parameterToPairs("csv", name, value);
+
+        assertEquals(1, pairs.size());
+        assertEquals(value, Integer.valueOf(pairs.get(0).getValue()));
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsCollection() throws Exception {
+        Map<String, String> collectionFormatMap = new HashMap<String, String>();
+        collectionFormatMap.put("csv", ",");
+        collectionFormatMap.put("tsv", "\t");
+        collectionFormatMap.put("ssv", " ");
+        collectionFormatMap.put("pipes", "\\|");
+        collectionFormatMap.put("", ","); // no format, must default to csv
+        collectionFormatMap.put("unknown", ","); // all other formats, must default to csv
+
+        String name = "param-a";
+
+        List<Object> values = new ArrayList<Object>();
+        values.add("value-a");
+        values.add(123);
+        values.add(new Date());
+
+        // check for multi separately
+        List<Pair> multiPairs = apiClient.parameterToPairs("multi", name, values);
+        assertEquals(values.size(), multiPairs.size());
+
+        // all other formats
+        for (String collectionFormat : collectionFormatMap.keySet()) {
+            List<Pair> pairs = apiClient.parameterToPairs(collectionFormat, name, values);
+
+            assertEquals(1, pairs.size());
+
+            String delimiter = collectionFormatMap.get(collectionFormat);
+            String[] pairValueSplit = pairs.get(0).getValue().split(delimiter);
+
+            // must equal input values
+            assertEquals(values.size(), pairValueSplit.length);
+        }
+    }
 }
diff --git a/samples/client/petstore/java/src/test/java/io/swagger/client/ConfigurationTest.java b/samples/client/petstore/java/default/src/test/java/io/swagger/client/ConfigurationTest.java
similarity index 100%
rename from samples/client/petstore/java/src/test/java/io/swagger/client/ConfigurationTest.java
rename to samples/client/petstore/java/default/src/test/java/io/swagger/client/ConfigurationTest.java
diff --git a/samples/client/petstore/java/src/test/java/io/swagger/client/StringUtilTest.java b/samples/client/petstore/java/default/src/test/java/io/swagger/client/StringUtilTest.java
similarity index 100%
rename from samples/client/petstore/java/src/test/java/io/swagger/client/StringUtilTest.java
rename to samples/client/petstore/java/default/src/test/java/io/swagger/client/StringUtilTest.java
diff --git a/samples/client/petstore/java/src/test/java/io/swagger/client/auth/ApiKeyAuthTest.java b/samples/client/petstore/java/default/src/test/java/io/swagger/client/auth/ApiKeyAuthTest.java
similarity index 78%
rename from samples/client/petstore/java/src/test/java/io/swagger/client/auth/ApiKeyAuthTest.java
rename to samples/client/petstore/java/default/src/test/java/io/swagger/client/auth/ApiKeyAuthTest.java
index 0a0bf57da61..5bdb4fb78fb 100644
--- a/samples/client/petstore/java/src/test/java/io/swagger/client/auth/ApiKeyAuthTest.java
+++ b/samples/client/petstore/java/default/src/test/java/io/swagger/client/auth/ApiKeyAuthTest.java
@@ -1,8 +1,11 @@
 package io.swagger.client.auth;
 
 import java.util.HashMap;
+import java.util.ArrayList;
 import java.util.Map;
+import java.util.List;
 
+import io.swagger.client.Pair;
 import org.junit.*;
 import static org.junit.Assert.*;
 
@@ -10,7 +13,7 @@
 public class ApiKeyAuthTest {
     @Test
     public void testApplyToParamsInQuery() {
-        Map<String, String> queryParams = new HashMap<String, String>();
+        List<Pair> queryParams = new ArrayList<Pair>();
         Map<String, String> headerParams = new HashMap<String, String>();
 
         ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
@@ -18,14 +21,17 @@ public void testApplyToParamsInQuery() {
         auth.applyToParams(queryParams, headerParams);
 
         assertEquals(1, queryParams.size());
-        assertEquals("my-api-key", queryParams.get("api_key"));
+        for (Pair queryParam : queryParams) {
+            assertEquals("my-api-key", queryParam.getValue());
+        }
+
         // no changes to header parameters
         assertEquals(0, headerParams.size());
     }
 
     @Test
     public void testApplyToParamsInHeaderWithPrefix() {
-        Map<String, String> queryParams = new HashMap<String, String>();
+            List<Pair> queryParams = new ArrayList<Pair>();
         Map<String, String> headerParams = new HashMap<String, String>();
 
         ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
diff --git a/samples/client/petstore/java/src/test/java/io/swagger/client/auth/HttpBasicAuthTest.java b/samples/client/petstore/java/default/src/test/java/io/swagger/client/auth/HttpBasicAuthTest.java
similarity index 92%
rename from samples/client/petstore/java/src/test/java/io/swagger/client/auth/HttpBasicAuthTest.java
rename to samples/client/petstore/java/default/src/test/java/io/swagger/client/auth/HttpBasicAuthTest.java
index a621cb60e48..52c5497ba83 100644
--- a/samples/client/petstore/java/src/test/java/io/swagger/client/auth/HttpBasicAuthTest.java
+++ b/samples/client/petstore/java/default/src/test/java/io/swagger/client/auth/HttpBasicAuthTest.java
@@ -1,8 +1,11 @@
 package io.swagger.client.auth;
 
 import java.util.HashMap;
+import java.util.ArrayList;
 import java.util.Map;
+import java.util.List;
 
+import io.swagger.client.Pair;
 import org.junit.*;
 import static org.junit.Assert.*;
 
@@ -17,7 +20,7 @@ public void setup() {
 
     @Test
     public void testApplyToParams() {
-        Map<String, String> queryParams = new HashMap<String, String>();
+        List<Pair> queryParams = new ArrayList<Pair>();
         Map<String, String> headerParams = new HashMap<String, String>();
 
         auth.setUsername("my-username");
diff --git a/samples/client/petstore/java/src/test/java/io/swagger/petstore/test/PetApiTest.java b/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/PetApiTest.java
similarity index 96%
rename from samples/client/petstore/java/src/test/java/io/swagger/petstore/test/PetApiTest.java
rename to samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/PetApiTest.java
index 7178049d644..0a8f8a1665d 100644
--- a/samples/client/petstore/java/src/test/java/io/swagger/petstore/test/PetApiTest.java
+++ b/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/PetApiTest.java
@@ -86,7 +86,7 @@ public void testUpdatePet() throws Exception {
     public void testFindPetsByStatus() throws Exception {
         Pet pet = createRandomPet();
         pet.setName("programmer");
-        pet.setStatus(Pet.StatusEnum.available);
+        pet.setStatus(Pet.StatusEnum.AVAILABLE);
 
         api.updatePet(pet);
 
@@ -108,7 +108,7 @@ public void testFindPetsByStatus() throws Exception {
     public void testFindPetsByTags() throws Exception {
         Pet pet = createRandomPet();
         pet.setName("monster");
-        pet.setStatus(Pet.StatusEnum.available);
+        pet.setStatus(Pet.StatusEnum.AVAILABLE);
 
         List<Tag> tags = new ArrayList<Tag>();
         Tag tag1 = new Tag();
@@ -151,7 +151,7 @@ public void testDeletePet() throws Exception {
         api.addPet(pet);
 
         Pet fetched = api.getPetById(pet.getId());
-        api.deletePet(null, fetched.getId());
+        api.deletePet(fetched.getId(), null);
 
         try {
             fetched = api.getPetById(fetched.getId());
@@ -183,7 +183,7 @@ private Pet createRandomPet() {
         category.setName("really-happy");
 
         pet.setCategory(category);
-        pet.setStatus(Pet.StatusEnum.available);
+        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);
 
diff --git a/samples/client/petstore/java/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/StoreApiTest.java
similarity index 97%
rename from samples/client/petstore/java/src/test/java/io/swagger/petstore/test/StoreApiTest.java
rename to samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/StoreApiTest.java
index 508764b8c2d..a1fd7e345a8 100644
--- a/samples/client/petstore/java/src/test/java/io/swagger/petstore/test/StoreApiTest.java
+++ b/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/StoreApiTest.java
@@ -64,7 +64,7 @@ private Order createOrder() {
         order.setPetId(new Long(200));
         order.setQuantity(new Integer(13));
         order.setShipDate(new java.util.Date());
-        order.setStatus(Order.StatusEnum.placed);
+        order.setStatus(Order.StatusEnum.PLACED);
         order.setComplete(true);
 
         return order;
diff --git a/samples/client/petstore/java/src/test/java/io/swagger/petstore/test/UserApiTest.java b/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/UserApiTest.java
similarity index 100%
rename from samples/client/petstore/java/src/test/java/io/swagger/petstore/test/UserApiTest.java
rename to samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/UserApiTest.java
diff --git a/samples/client/petstore/java/jersey2/pom.xml b/samples/client/petstore/java/jersey2/pom.xml
new file mode 100644
index 00000000000..eee88cd2429
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/pom.xml
@@ -0,0 +1,171 @@
+<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-jersey2</artifactId>
+  <packaging>jar</packaging>
+  <name>swagger-petstore-jersey2</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.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>io.swagger</groupId>
+      <artifactId>swagger-annotations</artifactId>
+      <version>${swagger-annotations-version}</version>
+    </dependency>
+
+    <!-- HTTP client: jersey-client -->
+    <dependency>
+      <groupId>org.glassfish.jersey.core</groupId>
+      <artifactId>jersey-client</artifactId>
+      <version>${jersey-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.media</groupId>
+      <artifactId>jersey-media-multipart</artifactId>
+      <version>${jersey-version}</version>
+    </dependency>
+
+    <!-- JSON processing: jackson -->
+    <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</swagger-annotations-version>
+    <jersey-version>2.6</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>
+  </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
new file mode 100644
index 00000000000..3ddf4621ae8
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java
@@ -0,0 +1,533 @@
+package io.swagger.client;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Form;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+
+import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.filter.LoggingFilter;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
+import org.glassfish.jersey.media.multipart.FormDataMultiPart;
+import org.glassfish.jersey.media.multipart.MultiPart;
+import org.glassfish.jersey.media.multipart.MultiPartFeature;
+import org.glassfish.jersey.media.multipart.file.FileDataBodyPart;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.TimeZone;
+
+import java.net.URLEncoder;
+
+import java.io.IOException;
+import java.io.File;
+import java.io.UnsupportedEncodingException;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.text.ParseException;
+
+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 = "2015-08-22T21:47:05.989+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 JSON json = new JSON();
+
+  private Map<String, Authentication> authentications;
+
+  private DateFormat dateFormat;
+
+  public ApiClient() {
+    // Use ISO 8601 format for date and datetime.
+    // See https://en.wikipedia.org/wiki/ISO_8601
+    this.dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
+
+    // Use UTC as the default time zone.
+    this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+
+    // Set default User-Agent.
+    setUserAgent("Java-Swagger");
+
+    // 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());
+    // Prevent the authentications from being modified.
+    authentications = Collections.unmodifiableMap(authentications);
+  }
+
+  public String getBasePath() {
+    return basePath;
+  }
+
+  public ApiClient setBasePath(String basePath) {
+    this.basePath = basePath;
+    return this;
+  }
+
+  /**
+   * Get authentications (key: authentication name, value: authentication).
+   */
+  public Map<String, Authentication> getAuthentications() {
+    return authentications;
+  }
+
+  /**
+   * Get authentication for the given name.
+   *
+   * @param authName The authentication name
+   * @return The authentication, null if not found
+   */
+  public Authentication getAuthentication(String authName) {
+    return authentications.get(authName);
+  }
+
+  /**
+   * Helper method to set username for the first HTTP basic authentication.
+   */
+  public void setUsername(String username) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof HttpBasicAuth) {
+        ((HttpBasicAuth) auth).setUsername(username);
+        return;
+      }
+    }
+    throw new RuntimeException("No HTTP basic authentication configured!");
+  }
+
+  /**
+   * Helper method to set password for the first HTTP basic authentication.
+   */
+  public void setPassword(String password) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof HttpBasicAuth) {
+        ((HttpBasicAuth) auth).setPassword(password);
+        return;
+      }
+    }
+    throw new RuntimeException("No HTTP basic authentication configured!");
+  }
+
+  /**
+   * Helper method to set API key value for the first API key authentication.
+   */
+  public void setApiKey(String apiKey) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof ApiKeyAuth) {
+        ((ApiKeyAuth) auth).setApiKey(apiKey);
+        return;
+      }
+    }
+    throw new RuntimeException("No API key authentication configured!");
+  }
+
+  /**
+   * Helper method to set API key prefix for the first API key authentication.
+   */
+  public void setApiKeyPrefix(String apiKeyPrefix) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof ApiKeyAuth) {
+        ((ApiKeyAuth) auth).setApiKeyPrefix(apiKeyPrefix);
+        return;
+      }
+    }
+    throw new RuntimeException("No API key authentication configured!");
+  }
+
+  /**
+   * Set the User-Agent header's value (by adding to the default header map).
+   */
+  public ApiClient setUserAgent(String userAgent) {
+    addDefaultHeader("User-Agent", userAgent);
+    return this;
+  }
+
+  /**
+   * Add a default header.
+   *
+   * @param key The header's key
+   * @param value The header's value
+   */
+  public ApiClient addDefaultHeader(String key, String value) {
+    defaultHeaderMap.put(key, value);
+    return this;
+  }
+
+  /**
+   * Check that whether debugging is enabled for this API client.
+   */
+  public boolean isDebugging() {
+    return debugging;
+  }
+
+  /**
+   * Enable/disable debugging for this API client.
+   *
+   * @param debugging To enable (true) or disable (false) debugging
+   */
+  public ApiClient setDebugging(boolean debugging) {
+    this.debugging = debugging;
+    return this;
+  }
+
+  /**
+   * Get the date format used to parse/format date parameters.
+   */
+  public DateFormat getDateFormat() {
+    return dateFormat;
+  }
+
+  /**
+   * Set the date format used to parse/format date parameters.
+   */
+  public ApiClient getDateFormat(DateFormat dateFormat) {
+    this.dateFormat = dateFormat;
+    return this;
+  }
+
+  /**
+   * Parse the given string into Date object.
+   */
+  public Date parseDate(String str) {
+    try {
+      return dateFormat.parse(str);
+    } catch (java.text.ParseException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  /**
+   * Format the given Date object into string.
+   */
+  public String formatDate(Date date) {
+    return dateFormat.format(date);
+  }
+
+  /**
+   * Format the given parameter object into string.
+   */
+  public String parameterToString(Object param) {
+    if (param == null) {
+      return "";
+    } else if (param instanceof Date) {
+      return formatDate((Date) param);
+    } else if (param instanceof Collection) {
+      StringBuilder b = new StringBuilder();
+      for(Object o : (Collection)param) {
+        if(b.length() > 0) {
+          b.append(",");
+        }
+        b.append(String.valueOf(o));
+      }
+      return b.toString();
+    } else {
+      return String.valueOf(param);
+    }
+  }
+
+  /*
+    Format to {@code Pair} objects.
+  */
+  public List<Pair> parameterToPairs(String collectionFormat, String name, Object value){
+    List<Pair> params = new ArrayList<Pair>();
+
+    // preconditions
+    if (name == null || name.isEmpty() || value == null) return params;
+
+    Collection valueCollection = null;
+    if (value instanceof Collection) {
+      valueCollection = (Collection) value;
+    } else {
+      params.add(new Pair(name, parameterToString(value)));
+      return params;
+    }
+
+    if (valueCollection.isEmpty()){
+      return params;
+    }
+
+    // get the collection format
+    collectionFormat = (collectionFormat == null || collectionFormat.isEmpty() ? "csv" : collectionFormat); // default: csv
+
+    // create the params based on the collection format
+    if (collectionFormat.equals("multi")) {
+      for (Object item : valueCollection) {
+        params.add(new Pair(name, parameterToString(item)));
+      }
+
+      return params;
+    }
+
+    String delimiter = ",";
+
+    if (collectionFormat.equals("csv")) {
+      delimiter = ",";
+    } else if (collectionFormat.equals("ssv")) {
+      delimiter = " ";
+    } else if (collectionFormat.equals("tsv")) {
+      delimiter = "\t";
+    } else if (collectionFormat.equals("pipes")) {
+      delimiter = "|";
+    }
+
+    StringBuilder sb = new StringBuilder() ;
+    for (Object item : valueCollection) {
+      sb.append(delimiter);
+      sb.append(parameterToString(item));
+    }
+
+    params.add(new Pair(name, sb.substring(1)));
+
+    return params;
+  }
+
+  /**
+   * Select the Accept header's value from the given accepts array:
+   *   if JSON exists in the given array, use it;
+   *   otherwise use all of them (joining into a string)
+   *
+   * @param accepts The accepts array to select from
+   * @return The Accept header to use. If the given array is empty,
+   *   null will be returned (not to set the Accept header explicitly).
+   */
+  public String selectHeaderAccept(String[] accepts) {
+    if (accepts.length == 0) return null;
+    if (StringUtil.containsIgnoreCase(accepts, "application/json")) return "application/json";
+    return StringUtil.join(accepts, ",");
+  }
+
+  /**
+   * Select the Content-Type header's value from the given array:
+   *   if JSON exists in the given array, use it;
+   *   otherwise use the first one of the array.
+   *
+   * @param contentTypes The Content-Type array to select from
+   * @return The Content-Type header to use. If the given array is empty,
+   *   JSON will be used.
+   */
+  public String selectHeaderContentType(String[] contentTypes) {
+    if (contentTypes.length == 0) return "application/json";
+    if (StringUtil.containsIgnoreCase(contentTypes, "application/json")) return "application/json";
+    return contentTypes[0];
+  }
+
+  /**
+   * Escape the given string to be used as URL query value.
+   */
+  public String escapeString(String str) {
+    try {
+      return URLEncoder.encode(str, "utf8").replaceAll("\\+", "%20");
+    } catch (UnsupportedEncodingException e) {
+      return str;
+    }
+  }
+
+  /**
+   * Serialize the given Java object into string entity according the given
+   * Content-Type (only JSON is supported for now).
+   */
+  public Entity<String> serialize(Object obj, String contentType) throws ApiException {
+    if (contentType.startsWith("application/json")) {
+      return Entity.json(json.serialize(obj));
+    } else {
+      throw new ApiException(400, "can not serialize object into Content-Type: " + contentType);
+    }
+  }
+
+  /**
+   * Deserialize response body to Java object according to the Content-Type.
+   */
+  public <T> T deserialize(Response response, TypeRef returnType) throws ApiException {
+    String contentType = null;
+    List<Object> contentTypes = response.getHeaders().get("Content-Type");
+    if (contentTypes != null && !contentTypes.isEmpty())
+      contentType = String.valueOf(contentTypes.get(0));
+    if (contentType == null)
+      throw new ApiException(500, "missing Content-Type in response");
+
+    String body;
+    if (response.hasEntity())
+      body = (String) response.readEntity(String.class);
+    else
+      body = "";
+
+    if (contentType.startsWith("application/json")) {
+      return json.deserialize(body, returnType);
+    } else {
+      throw new ApiException(500, "can not deserialize Content-Type: " + contentType);
+    }
+  }
+
+  /**
+   * Invoke API by sending HTTP request with the given options.
+   *
+   * @param path The sub-path of the HTTP URL
+   * @param method The request method, one of "GET", "POST", "PUT", and "DELETE"
+   * @param queryParams The query parameters
+   * @param body The request body object
+   * @param headerParams The header parameters
+   * @param formParams The form parameters
+   * @param accept The request's Accept header
+   * @param contentType The request's Content-Type header
+   * @param authNames The authentications to apply
+   * @param returnType The return type into which to deserialize the response
+   * @return The response body in type of string
+   */
+  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, TypeRef returnType) throws ApiException {
+    updateParamsForAuth(authNames, queryParams, headerParams);
+
+    final ClientConfig clientConfig = new ClientConfig();
+    clientConfig.register(MultiPartFeature.class);
+    if (debugging) {
+      clientConfig.register(LoggingFilter.class);
+    }
+    Client client = ClientBuilder.newClient(clientConfig);
+
+    WebTarget target = client.target(this.basePath).path(path);
+
+    if (queryParams != null) {
+      for (Pair queryParam : queryParams) {
+        if (queryParam.getValue() != null) {
+          target = target.queryParam(queryParam.getName(), queryParam.getValue());
+        }
+      }
+    }
+
+    Invocation.Builder invocationBuilder = target.request(contentType).accept(accept);
+
+    for (String key : headerParams.keySet()) {
+      String value = headerParams.get(key);
+      if (value != null) {
+        invocationBuilder = invocationBuilder.header(key, value);
+      }
+    }
+
+    for (String key : defaultHeaderMap.keySet()) {
+      if (!headerParams.containsKey(key)) {
+        String value = defaultHeaderMap.get(key);
+        if (value != null) {
+          invocationBuilder = invocationBuilder.header(key, value);
+        }
+      }
+    }
+
+    Entity<?> formEntity = null;
+
+    if (contentType.startsWith("multipart/form-data")) {
+      MultiPart multipart = new MultiPart();
+      for (Entry<String, Object> param: formParams.entrySet()) {
+        if (param.getValue() instanceof File) {
+          File file = (File) param.getValue();
+
+          FormDataMultiPart mp = new FormDataMultiPart();
+          mp.bodyPart(new FormDataBodyPart(param.getKey(), file.getName()));
+          multipart.bodyPart(mp, MediaType.MULTIPART_FORM_DATA_TYPE);
+
+          multipart.bodyPart(new FileDataBodyPart(param.getKey(), file, MediaType.APPLICATION_OCTET_STREAM_TYPE));
+        } else {
+          FormDataMultiPart mp = new FormDataMultiPart();
+          mp.bodyPart(new FormDataBodyPart(param.getKey(), parameterToString(param.getValue())));
+          multipart.bodyPart(mp, MediaType.MULTIPART_FORM_DATA_TYPE);
+        }
+      }
+      formEntity = Entity.entity(multipart, MediaType.MULTIPART_FORM_DATA_TYPE);
+    } else if (contentType.startsWith("application/x-www-form-urlencoded")) {
+      Form form = new Form();
+      for (Entry<String, Object> param: formParams.entrySet()) {
+        form.param(param.getKey(), parameterToString(param.getValue()));
+      }
+      formEntity = Entity.entity(form, MediaType.APPLICATION_FORM_URLENCODED_TYPE);
+    }
+
+    Response response = null;
+
+    if ("GET".equals(method)) {
+      response = invocationBuilder.get();
+    } else if ("POST".equals(method)) {
+      if (formEntity != null) {
+        response = invocationBuilder.post(formEntity);
+      } else if (body == null) {
+        response = invocationBuilder.post(null);
+      } else {
+        response = invocationBuilder.post(serialize(body, contentType));
+      }
+    } else if ("PUT".equals(method)) {
+      if (formEntity != null) {
+        response = invocationBuilder.put(formEntity);
+      } else if (body == null) {
+        response = invocationBuilder.put(null);
+      } else {
+        response = invocationBuilder.put(serialize(body, contentType));
+      }
+    } else if ("DELETE".equals(method)) {
+      response = invocationBuilder.delete();
+    } else {
+      throw new ApiException(500, "unknown method type " + method);
+    }
+
+    if (response.getStatus() == Status.NO_CONTENT.getStatusCode()) {
+      return null;
+    } else if (response.getStatusInfo().getFamily().equals(Status.Family.SUCCESSFUL)) {
+      if (returnType == null)
+        return null;
+      else
+        return deserialize(response, returnType);
+    } else {
+      String message = "error";
+      String respBody = null;
+      if (response.hasEntity()) {
+        try {
+          respBody = String.valueOf(response.readEntity(String.class));
+          message = respBody;
+        } catch (RuntimeException e) {
+          // e.printStackTrace();
+        }
+      }
+      Map<String, List<String>> responseHeaders = new HashMap<String, List<String>>();
+      for (String key: response.getHeaders().keySet()) {
+        List<Object> values = response.getHeaders().get(key);
+        List<String> headers = new ArrayList<String>();
+        for (Object o : values) {
+          headers.add(String.valueOf(o));
+        }
+        responseHeaders.put(key, headers);
+      }
+      throw new ApiException(
+        response.getStatus(),
+        message,
+        responseHeaders,
+        respBody);
+    }
+  }
+
+  /**
+   * Update query and header parameters based on authentication settings.
+   *
+   * @param authNames The authentications to apply
+   */
+  private void updateParamsForAuth(String[] authNames, List<Pair> queryParams, Map<String, String> headerParams) {
+    for (String authName : authNames) {
+      Authentication auth = authentications.get(authName);
+      if (auth == null) throw new RuntimeException("Authentication undefined: " + authName);
+      auth.applyToParams(queryParams, headerParams);
+    }
+  }
+}
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
new file mode 100644
index 00000000000..48b196e2af7
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiException.java
@@ -0,0 +1,48 @@
+package io.swagger.client;
+
+import java.util.Map;
+import java.util.List;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-22T21:47:05.989+08:00")
+public class ApiException extends Exception {
+  private int code = 0;
+  private String message = null;
+  private Map<String, List<String>> responseHeaders = null;
+  private String responseBody = null;
+
+  public ApiException() {}
+
+  public ApiException(int code, String message) {
+    this.code = code;
+    this.message = message;
+  }
+
+  public ApiException(int code, String message, Map<String, List<String>> responseHeaders, String responseBody) {
+    this.code = code;
+    this.message = message;
+    this.responseHeaders = responseHeaders;
+    this.responseBody = responseBody;
+  }
+
+  public int getCode() {
+    return code;
+  }
+
+  public String getMessage() {
+    return message;
+  }
+
+  /**
+   * Get the HTTP response headers.
+   */
+  public Map<String, List<String>> getResponseHeaders() {
+    return responseHeaders;
+  }
+
+  /**
+   * Get the HTTP response body.
+   */
+  public String getResponseBody() {
+    return responseBody;
+  }
+}
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
new file mode 100644
index 00000000000..e94cd5c0aa3
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Configuration.java
@@ -0,0 +1,22 @@
+package io.swagger.client;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-22T21:47:05.989+08:00")
+public class Configuration {
+  private static ApiClient defaultApiClient = new ApiClient();
+
+  /**
+   * Get the default API client, which would be used when creating API
+   * instances without providing an API client.
+   */
+  public static ApiClient getDefaultApiClient() {
+    return defaultApiClient;
+   }
+
+  /**
+   * Set the default API client, which would be used when creating API
+   * instances without providing an API client.
+   */
+  public static void setDefaultApiClient(ApiClient apiClient) {
+    defaultApiClient = 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
new file mode 100644
index 00000000000..3095c7bacea
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/JSON.java
@@ -0,0 +1,54 @@
+package io.swagger.client;
+
+import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.datatype.joda.*;
+
+import java.io.IOException;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-24T16:42:49.539+08:00")
+public class JSON {
+  private ObjectMapper mapper;
+
+  public JSON() {
+    mapper = new ObjectMapper();
+    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());
+	}
+
+  /**
+   * Serialize the given Java object into JSON string.
+   */
+  public String serialize(Object obj) throws ApiException {
+    try {
+      if (obj != null)
+        return mapper.writeValueAsString(obj);
+      else
+        return null;
+    } catch (Exception e) {
+      throw new ApiException(400, e.getMessage());
+    }
+  }
+
+  /**
+   * Deserialize the given JSON string to Java object.
+   *
+   * @param body The JSON string
+   * @param returnType The type to deserialize inot
+   * @return The deserialized Java object
+   */
+  public <T> T deserialize(String body, TypeRef returnType) throws ApiException {
+    JavaType javaType = mapper.constructType(returnType.getType());
+    try {
+      return mapper.readValue(body, javaType);
+    } catch (IOException e) {
+      if (returnType.getType().equals(String.class))
+        return (T) body;
+      else
+        throw new ApiException(500, e.getMessage(), null, body);
+    }
+  }
+}
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
new file mode 100644
index 00000000000..cb0e034bd63
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Pair.java
@@ -0,0 +1,39 @@
+package io.swagger.client;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-22T21:47:05.989+08:00")
+public class Pair {
+    private String name = "";
+    private String value = "";
+
+    public Pair (String name, String value) {
+        setName(name);
+        setValue(value);
+    }
+
+    private void setName(String name) {
+        if (!isValidString(name)) return;
+
+        this.name = name;
+    }
+
+    private void setValue(String value) {
+        if (!isValidString(value)) return;
+
+        this.value = value;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    private boolean isValidString(String arg) {
+        if (arg == null) return false;
+        if (arg.trim().isEmpty()) return false;
+
+        return true;
+    }
+}
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
new file mode 100644
index 00000000000..50e37eb367a
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/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 = "2015-08-22T21:47:05.989+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/client/petstore/java/jersey2/src/main/java/io/swagger/client/TypeRef.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/TypeRef.java
new file mode 100644
index 00000000000..1444bca5a06
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/TypeRef.java
@@ -0,0 +1,26 @@
+package io.swagger.client;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-22T21:47:05.989+08:00")
+public class TypeRef<T> {
+    private final Type type;
+
+    public TypeRef() {
+        this.type = getGenericType(getClass());
+    }
+
+    private static Type getGenericType(Class<?> klass) {
+        Type superclass = klass.getGenericSuperclass();
+        if (superclass instanceof Class) {
+            throw new RuntimeException("No type parameter provided");
+        }
+        ParameterizedType parameterized = (ParameterizedType) superclass;
+        return parameterized.getActualTypeArguments()[0];
+    }
+
+    public Type getType() {
+        return type;
+    }
+}
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
new file mode 100644
index 00000000000..ca72d88b130
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/PetApi.java
@@ -0,0 +1,407 @@
+package io.swagger.client.api;
+
+import io.swagger.client.ApiException;
+import io.swagger.client.ApiClient;
+import io.swagger.client.Configuration;
+import io.swagger.client.Pair;
+import io.swagger.client.TypeRef;
+
+import io.swagger.client.model.*;
+
+import java.util.*;
+
+import io.swagger.client.model.Pet;
+import java.io.File;
+
+import java.io.File;
+import java.util.Map;
+import java.util.HashMap;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-22T21:47:05.989+08:00")
+public class PetApi {
+  private ApiClient apiClient;
+
+  public PetApi() {
+    this(Configuration.getDefaultApiClient());
+  }
+
+  public PetApi(ApiClient apiClient) {
+    this.apiClient = apiClient;
+  }
+
+  public ApiClient getApiClient() {
+    return apiClient;
+  }
+
+  public void setApiClient(ApiClient apiClient) {
+    this.apiClient = apiClient;
+  }
+
+  
+  /**
+   * 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
+   */
+  public void addPet (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, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, 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" };
+    
+    TypeRef returnType = new TypeRef<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" };
+    
+    TypeRef returnType = new TypeRef<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[] { "petstore_auth", "api_key" };
+    
+    TypeRef returnType = new TypeRef<Pet>() {};
+    return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
+    
+  }
+  
+  /**
+   * 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 postBody = 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 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>();
+
+    
+
+    
+
+    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);
+
+    final String[] contentTypes = {
+      "application/x-www-form-urlencoded"
+    };
+    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+
+    String[] authNames = new String[] { "petstore_auth" };
+    
+    apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    
+  }
+  
+  /**
+   * Deletes a pet
+   * 
+   * @param petId Pet id to delete
+   * @param apiKey 
+   * @return void
+   */
+  public void deletePet (Long petId, String apiKey) 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 deletePet");
+    }
+    
+
+    // 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>();
+
+    
+
+    if (apiKey != null)
+    headerParams.put("api_key", apiClient.parameterToString(apiKey));
+    
+
+    
+
+    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" };
+    
+    apiClient.invokeAPI(path, "DELETE", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, 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
+   */
+  public void uploadFile (Long petId, String additionalMetadata, File file) 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 uploadFile");
+    }
+    
+
+    // create path and map variables
+    String path = "/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>();
+
+    
+
+    
+
+    if (additionalMetadata != null)
+      formParams.put("additionalMetadata", additionalMetadata);
+    if (file != null)
+      formParams.put("file", file);
+    
+
+    final String[] accepts = {
+      "application/json", "application/xml"
+    };
+    final String accept = apiClient.selectHeaderAccept(accepts);
+
+    final String[] contentTypes = {
+      "multipart/form-data"
+    };
+    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+
+    String[] authNames = new String[] { "petstore_auth" };
+    
+    apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, 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
new file mode 100644
index 00000000000..2abbae3f714
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/StoreApi.java
@@ -0,0 +1,215 @@
+package io.swagger.client.api;
+
+import io.swagger.client.ApiException;
+import io.swagger.client.ApiClient;
+import io.swagger.client.Configuration;
+import io.swagger.client.Pair;
+import io.swagger.client.TypeRef;
+
+import io.swagger.client.model.*;
+
+import java.util.*;
+
+import java.util.Map;
+import io.swagger.client.model.Order;
+
+import java.io.File;
+import java.util.Map;
+import java.util.HashMap;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-22T21:47:05.989+08:00")
+public class StoreApi {
+  private ApiClient apiClient;
+
+  public StoreApi() {
+    this(Configuration.getDefaultApiClient());
+  }
+
+  public StoreApi(ApiClient apiClient) {
+    this.apiClient = apiClient;
+  }
+
+  public ApiClient getApiClient() {
+    return apiClient;
+  }
+
+  public void setApiClient(ApiClient apiClient) {
+    this.apiClient = apiClient;
+  }
+
+  
+  /**
+   * 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" };
+    
+    TypeRef returnType = new TypeRef<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[] {  };
+    
+    TypeRef returnType = new TypeRef<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[] {  };
+    
+    TypeRef returnType = new TypeRef<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
+   */
+  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");
+    }
+    
+
+    // 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[] {  };
+    
+    apiClient.invokeAPI(path, "DELETE", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    
+  }
+  
+}
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
new file mode 100644
index 00000000000..7959290acd6
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/UserApi.java
@@ -0,0 +1,386 @@
+package io.swagger.client.api;
+
+import io.swagger.client.ApiException;
+import io.swagger.client.ApiClient;
+import io.swagger.client.Configuration;
+import io.swagger.client.Pair;
+import io.swagger.client.TypeRef;
+
+import io.swagger.client.model.*;
+
+import java.util.*;
+
+import io.swagger.client.model.User;
+import java.util.*;
+
+import java.io.File;
+import java.util.Map;
+import java.util.HashMap;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-22T21:47:05.989+08:00")
+public class UserApi {
+  private ApiClient apiClient;
+
+  public UserApi() {
+    this(Configuration.getDefaultApiClient());
+  }
+
+  public UserApi(ApiClient apiClient) {
+    this.apiClient = apiClient;
+  }
+
+  public ApiClient getApiClient() {
+    return apiClient;
+  }
+
+  public void setApiClient(ApiClient apiClient) {
+    this.apiClient = apiClient;
+  }
+
+  
+  /**
+   * 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 ApiException {
+    Object postBody = body;
+    
+
+    // create path and map variables
+    String path = "/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>();
+
+    
+
+    
+
+    
+
+    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, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    
+  }
+  
+  /**
+   * Creates list of users with given input array
+   * 
+   * @param body List of user object
+   * @return void
+   */
+  public void createUsersWithArrayInput (List<User> body) throws ApiException {
+    Object postBody = body;
+    
+
+    // create path and map variables
+    String path = "/user/createWithArray".replaceAll("\\{format\\}","json");
+
+    // query params
+    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, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    
+  }
+  
+  /**
+   * Creates list of users with given input array
+   * 
+   * @param body List of user object
+   * @return void
+   */
+  public void createUsersWithListInput (List<User> body) throws ApiException {
+    Object postBody = body;
+    
+
+    // create path and map variables
+    String path = "/user/createWithList".replaceAll("\\{format\\}","json");
+
+    // query params
+    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, "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[] {  };
+    
+    TypeRef returnType = new TypeRef<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[] {  };
+    
+    TypeRef returnType = new TypeRef<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);
+    
+  }
+  
+  /**
+   * 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) 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 deleteUser");
+    }
+    
+
+    // 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, "DELETE", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, 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
new file mode 100644
index 00000000000..87a4a90a49c
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
@@ -0,0 +1,59 @@
+package io.swagger.client.auth;
+
+import io.swagger.client.Pair;
+
+import java.util.Map;
+import java.util.List;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-22T21:47:05.989+08:00")
+public class ApiKeyAuth implements Authentication {
+  private final String location;
+  private final String paramName;
+
+  private String apiKey;
+  private String apiKeyPrefix;
+
+  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;
+  }
+
+  public String getApiKeyPrefix() {
+    return apiKeyPrefix;
+  }
+
+  public void setApiKeyPrefix(String apiKeyPrefix) {
+    this.apiKeyPrefix = apiKeyPrefix;
+  }
+
+  @Override
+  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams) {
+    String value;
+    if (apiKeyPrefix != null) {
+      value = apiKeyPrefix + " " + apiKey;
+    } else {
+      value = apiKey;
+    }
+    if (location == "query") {
+      queryParams.add(new Pair(paramName, value));
+    } else if (location == "header") {
+      headerParams.put(paramName, value);
+    }
+  }
+}
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/Authentication.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/Authentication.java
new file mode 100644
index 00000000000..b35133a0c94
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/Authentication.java
@@ -0,0 +1,12 @@
+package io.swagger.client.auth;
+
+import io.swagger.client.Pair;
+
+import java.util.Map;
+import java.util.List;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-22T21:47:05.989+08:00")
+public interface Authentication {
+  /** Apply authentication settings to header and query params. */
+  void applyToParams(List<Pair> queryParams, Map<String, String> headerParams);
+}
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
new file mode 100644
index 00000000000..7d224efefbb
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
@@ -0,0 +1,41 @@
+package io.swagger.client.auth;
+
+import io.swagger.client.Pair;
+
+import java.util.Map;
+import java.util.List;
+
+import java.io.UnsupportedEncodingException;
+import javax.xml.bind.DatatypeConverter;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-22T21:47:05.989+08:00")
+public class HttpBasicAuth implements Authentication {
+  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;
+  }
+
+  @Override
+  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams) {
+    String str = (username == null ? "" : username) + ":" + (password == null ? "" : password);
+    try {
+      headerParams.put("Authorization", "Basic " + DatatypeConverter.printBase64Binary(str.getBytes("UTF-8")));
+    } catch (UnsupportedEncodingException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
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
new file mode 100644
index 00000000000..06debad62e4
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/OAuth.java
@@ -0,0 +1,14 @@
+package io.swagger.client.auth;
+
+import io.swagger.client.Pair;
+
+import java.util.Map;
+import java.util.List;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-22T21:47:05.989+08:00")
+public class OAuth implements Authentication {
+  @Override
+  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams) {
+    // TODO: support oauth
+  }
+}
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Category.java
similarity index 86%
rename from samples/client/petstore/java/src/main/java/io/swagger/client/model/Category.java
rename to samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Category.java
index d43f6a9758f..f0dab47c7f7 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Category.java
@@ -6,6 +6,7 @@
 
 
 @ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-22T21:47:05.989+08:00")
 public class Category  {
   
   private Long id = null;
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
new file mode 100644
index 00000000000..2477288848d
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java
@@ -0,0 +1,127 @@
+package io.swagger.client.model;
+
+import java.util.Date;
+
+
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+@ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-24T16:42:49.539+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
+  public String toString() {
+    return value;
+  }
+}
+
+  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 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/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
new file mode 100644
index 00000000000..1ed72947556
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java
@@ -0,0 +1,129 @@
+package io.swagger.client.model;
+
+import io.swagger.client.model.Category;
+import java.util.*;
+import io.swagger.client.model.Tag;
+
+
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+@ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-24T16:42:49.539+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
+  public String toString() {
+    return value;
+  }
+}
+
+  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 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/client/petstore/java/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Tag.java
similarity index 86%
rename from samples/client/petstore/java/src/main/java/io/swagger/client/model/Tag.java
rename to samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Tag.java
index 63a2ca3b739..3bf1b196e1d 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Tag.java
@@ -6,6 +6,7 @@
 
 
 @ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-22T21:47:05.989+08:00")
 public class Tag  {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java
similarity index 95%
rename from samples/client/petstore/java/src/main/java/io/swagger/client/model/User.java
rename to samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java
index 0ace5b7e30a..0d454ec95aa 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java
@@ -6,6 +6,7 @@
 
 
 @ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-22T21:47:05.989+08:00")
 public class User  {
   
   private Long id = null;
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
new file mode 100644
index 00000000000..802c0cae3b9
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/ApiClientTest.java
@@ -0,0 +1,193 @@
+package io.swagger.client;
+
+import io.swagger.client.auth.*;
+
+import java.util.*;
+
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class ApiClientTest {
+    ApiClient apiClient = null;
+
+    @Before
+    public void setup() {
+        apiClient = new ApiClient();
+    }
+
+    @Test
+    public void testSelectHeaderAccept() {
+        String[] accepts = {"APPLICATION/JSON", "APPLICATION/XML"};
+        assertEquals("application/json", apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{"application/json", "application/xml"};
+        assertEquals("application/json", apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{"application/xml", "application/json"};
+        assertEquals("application/json", apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{"text/plain", "application/xml"};
+        assertEquals("text/plain,application/xml", apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{};
+        assertNull(apiClient.selectHeaderAccept(accepts));
+    }
+
+    @Test
+    public void testSelectHeaderContentType() {
+        String[] contentTypes = {"APPLICATION/JSON", "APPLICATION/XML"};
+        assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{"application/json", "application/xml"};
+        assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{"application/xml", "application/json"};
+        assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{"text/plain", "application/xml"};
+        assertEquals("text/plain", apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{};
+        assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes));
+    }
+
+    @Test
+    public void testGetAuthentications() {
+        Map<String, Authentication> auths = apiClient.getAuthentications();
+
+        Authentication auth = auths.get("api_key");
+        assertNotNull(auth);
+        assertTrue(auth instanceof ApiKeyAuth);
+        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) auth;
+        assertEquals("header", apiKeyAuth.getLocation());
+        assertEquals("api_key", apiKeyAuth.getParamName());
+
+        auth = auths.get("petstore_auth");
+        assertTrue(auth instanceof OAuth);
+        assertSame(auth, apiClient.getAuthentication("petstore_auth"));
+
+        assertNull(auths.get("unknown"));
+
+        try {
+            auths.put("my_auth", new HttpBasicAuth());
+            fail("the authentications returned should not be modifiable");
+        } catch (UnsupportedOperationException e) {
+        }
+    }
+
+    @Test
+    public void testSetUsername() {
+        try {
+            apiClient.setUsername("my-username");
+            fail("there should be no HTTP basic authentications");
+        } catch (RuntimeException e) {
+        }
+    }
+
+    @Test
+    public void testSetPassword() {
+        try {
+            apiClient.setPassword("my-password");
+            fail("there should be no HTTP basic authentications");
+        } catch (RuntimeException e) {
+        }
+    }
+
+    @Test
+    public void testSetApiKeyAndPrefix() {
+        ApiKeyAuth auth = (ApiKeyAuth) apiClient.getAuthentications().get("api_key");
+        auth.setApiKey(null);
+        auth.setApiKeyPrefix(null);
+
+        apiClient.setApiKey("my-api-key");
+        apiClient.setApiKeyPrefix("Token");
+        assertEquals("my-api-key", auth.getApiKey());
+        assertEquals("Token", auth.getApiKeyPrefix());
+
+        // reset values
+        auth.setApiKey(null);
+        auth.setApiKeyPrefix(null);
+    }
+
+    @Test
+    public void testParameterToPairsWhenNameIsInvalid() throws Exception {
+        List<Pair> pairs_a = apiClient.parameterToPairs("csv", null, new Integer(1));
+        List<Pair> pairs_b = apiClient.parameterToPairs("csv", "", new Integer(1));
+
+        assertTrue(pairs_a.isEmpty());
+        assertTrue(pairs_b.isEmpty());
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsNull() throws Exception {
+        List<Pair> pairs = apiClient.parameterToPairs("csv", "param-a", null);
+
+        assertTrue(pairs.isEmpty());
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsEmptyStrings() throws Exception {
+
+        // single empty string
+        List<Pair> pairs = apiClient.parameterToPairs("csv", "param-a", " ");
+        assertEquals(1, pairs.size());
+
+        // list of empty strings
+        List<String> strs = new ArrayList<String>();
+        strs.add(" ");
+        strs.add(" ");
+        strs.add(" ");
+
+        List<Pair> concatStrings = apiClient.parameterToPairs("csv", "param-a", strs);
+
+        assertEquals(1, concatStrings.size());
+        assertFalse(concatStrings.get(0).getValue().isEmpty()); // should contain some delimiters
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsNotCollection() throws Exception {
+        String name = "param-a";
+        Integer value = 1;
+
+        List<Pair> pairs = apiClient.parameterToPairs("csv", name, value);
+
+        assertEquals(1, pairs.size());
+        assertEquals(value, Integer.valueOf(pairs.get(0).getValue()));
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsCollection() throws Exception {
+        Map<String, String> collectionFormatMap = new HashMap<String, String>();
+        collectionFormatMap.put("csv", ",");
+        collectionFormatMap.put("tsv", "\t");
+        collectionFormatMap.put("ssv", " ");
+        collectionFormatMap.put("pipes", "\\|");
+        collectionFormatMap.put("", ","); // no format, must default to csv
+        collectionFormatMap.put("unknown", ","); // all other formats, must default to csv
+
+        String name = "param-a";
+
+        List<Object> values = new ArrayList<Object>();
+        values.add("value-a");
+        values.add(123);
+        values.add(new Date());
+
+        // check for multi separately
+        List<Pair> multiPairs = apiClient.parameterToPairs("multi", name, values);
+        assertEquals(values.size(), multiPairs.size());
+
+        // all other formats
+        for (String collectionFormat : collectionFormatMap.keySet()) {
+            List<Pair> pairs = apiClient.parameterToPairs(collectionFormat, name, values);
+
+            assertEquals(1, pairs.size());
+
+            String delimiter = collectionFormatMap.get(collectionFormat);
+            String[] pairValueSplit = pairs.get(0).getValue().split(delimiter);
+
+            // must equal input values
+            assertEquals(values.size(), pairValueSplit.length);
+        }
+    }
+}
diff --git a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/ConfigurationTest.java b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/ConfigurationTest.java
new file mode 100644
index 00000000000..b95eb74605e
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/ConfigurationTest.java
@@ -0,0 +1,15 @@
+package io.swagger.client;
+
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class ConfigurationTest {
+    @Test
+    public void testDefaultApiClient() {
+        ApiClient apiClient = Configuration.getDefaultApiClient();
+        assertNotNull(apiClient);
+        assertEquals("http://petstore.swagger.io/v2", apiClient.getBasePath());
+        assertFalse(apiClient.isDebugging());
+    }
+}
diff --git a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/StringUtilTest.java b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/StringUtilTest.java
new file mode 100644
index 00000000000..4b03c7a9812
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/StringUtilTest.java
@@ -0,0 +1,33 @@
+package io.swagger.client;
+
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class StringUtilTest {
+    @Test
+    public void testContainsIgnoreCase() {
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{"abc"}, "abc"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{"abc"}, "ABC"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{"ABC"}, "abc"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{null, "abc"}, "ABC"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{null, "abc"}, null));
+
+        assertFalse(StringUtil.containsIgnoreCase(new String[]{"abc"}, "def"));
+        assertFalse(StringUtil.containsIgnoreCase(new String[]{}, "ABC"));
+        assertFalse(StringUtil.containsIgnoreCase(new String[]{}, null));
+    }
+
+    @Test
+    public void testJoin() {
+        String[] array = {"aa", "bb", "cc"};
+        assertEquals("aa,bb,cc", StringUtil.join(array, ","));
+        assertEquals("aa, bb, cc", StringUtil.join(array, ", "));
+        assertEquals("aabbcc", StringUtil.join(array, ""));
+        assertEquals("aa bb cc", StringUtil.join(array, " "));
+        assertEquals("aa\nbb\ncc", StringUtil.join(array, "\n"));
+
+        assertEquals("", StringUtil.join(new String[]{}, ","));
+        assertEquals("abc", StringUtil.join(new String[]{"abc"}, ","));
+    }
+}
diff --git a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/auth/ApiKeyAuthTest.java b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/auth/ApiKeyAuthTest.java
new file mode 100644
index 00000000000..5bdb4fb78fb
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/auth/ApiKeyAuthTest.java
@@ -0,0 +1,47 @@
+package io.swagger.client.auth;
+
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.List;
+
+import io.swagger.client.Pair;
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class ApiKeyAuthTest {
+    @Test
+    public void testApplyToParamsInQuery() {
+        List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+
+        ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
+        auth.setApiKey("my-api-key");
+        auth.applyToParams(queryParams, headerParams);
+
+        assertEquals(1, queryParams.size());
+        for (Pair queryParam : queryParams) {
+            assertEquals("my-api-key", queryParam.getValue());
+        }
+
+        // no changes to header parameters
+        assertEquals(0, headerParams.size());
+    }
+
+    @Test
+    public void testApplyToParamsInHeaderWithPrefix() {
+            List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+
+        ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
+        auth.setApiKey("my-api-token");
+        auth.setApiKeyPrefix("Token");
+        auth.applyToParams(queryParams, headerParams);
+
+        // no changes to query parameters
+        assertEquals(0, queryParams.size());
+        assertEquals(1, headerParams.size());
+        assertEquals("Token my-api-token", headerParams.get("X-API-TOKEN"));
+    }
+}
diff --git a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/auth/HttpBasicAuthTest.java b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/auth/HttpBasicAuthTest.java
new file mode 100644
index 00000000000..52c5497ba83
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/auth/HttpBasicAuthTest.java
@@ -0,0 +1,52 @@
+package io.swagger.client.auth;
+
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.List;
+
+import io.swagger.client.Pair;
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class HttpBasicAuthTest {
+    HttpBasicAuth auth = null;
+
+    @Before
+    public void setup() {
+        auth = new HttpBasicAuth();
+    }
+
+    @Test
+    public void testApplyToParams() {
+        List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+
+        auth.setUsername("my-username");
+        auth.setPassword("my-password");
+        auth.applyToParams(queryParams, headerParams);
+
+        // no changes to query parameters
+        assertEquals(0, queryParams.size());
+        assertEquals(1, headerParams.size());
+        // the string below is base64-encoded result of "my-username:my-password" with the "Basic " prefix
+        String expected = "Basic bXktdXNlcm5hbWU6bXktcGFzc3dvcmQ=";
+        assertEquals(expected, headerParams.get("Authorization"));
+
+        // null username should be treated as empty string
+        auth.setUsername(null);
+        auth.applyToParams(queryParams, headerParams);
+        // the string below is base64-encoded result of ":my-password" with the "Basic " prefix
+        expected = "Basic Om15LXBhc3N3b3Jk";
+        assertEquals(expected, headerParams.get("Authorization"));
+
+        // null password should be treated as empty string
+        auth.setUsername("my-username");
+        auth.setPassword(null);
+        auth.applyToParams(queryParams, headerParams);
+        // the string below is base64-encoded result of "my-username:" with the "Basic " prefix
+        expected = "Basic bXktdXNlcm5hbWU6";
+        assertEquals(expected, headerParams.get("Authorization"));
+    }
+}
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
new file mode 100644
index 00000000000..0a8f8a1665d
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/PetApiTest.java
@@ -0,0 +1,192 @@
+package io.swagger.petstore.test;
+
+import io.swagger.client.ApiClient;
+import io.swagger.client.ApiException;
+import io.swagger.client.Configuration;
+
+import io.swagger.client.api.*;
+import io.swagger.client.auth.*;
+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 static org.junit.Assert.*;
+
+public class PetApiTest {
+    PetApi api = null;
+
+    @Before
+    public void setup() {
+        api = new PetApi();
+        // setup authentication
+        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
+        apiKeyAuth.setApiKey("special-key");
+    }
+
+    @Test
+    public void testApiClient() {
+        // the default api client is used
+        assertEquals(Configuration.getDefaultApiClient(), api.getApiClient());
+        assertNotNull(api.getApiClient());
+        assertEquals("http://petstore.swagger.io/v2", api.getApiClient().getBasePath());
+        assertFalse(api.getApiClient().isDebugging());
+
+        ApiClient oldClient = api.getApiClient();
+
+        ApiClient newClient = new ApiClient();
+        newClient.setBasePath("http://example.com");
+        newClient.setDebugging(true);
+
+        // set api client via constructor
+        api = new PetApi(newClient);
+        assertNotNull(api.getApiClient());
+        assertEquals("http://example.com", api.getApiClient().getBasePath());
+        assertTrue(api.getApiClient().isDebugging());
+
+        // set api client via setter method
+        api.setApiClient(oldClient);
+        assertNotNull(api.getApiClient());
+        assertEquals("http://petstore.swagger.io/v2", api.getApiClient().getBasePath());
+        assertFalse(api.getApiClient().isDebugging());
+    }
+
+    @Test
+    public void testCreateAndGetPet() 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 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()));
+    }
+
+    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;
+    }
+}
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
new file mode 100644
index 00000000000..a1fd7e345a8
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/StoreApiTest.java
@@ -0,0 +1,72 @@
+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 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");
+    }
+
+    @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/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
new file mode 100644
index 00000000000..26e46bfa602
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/UserApiTest.java
@@ -0,0 +1,86 @@
+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.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/java/okhttp-gson/build.gradle b/samples/client/petstore/java/okhttp-gson/build.gradle
new file mode 100644
index 00000000000..96c8f7718d3
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/build.gradle
@@ -0,0 +1,28 @@
+apply plugin: 'java'
+apply plugin: 'maven'
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compile 'io.swagger:swagger-annotations:1.5.0'
+    compile 'com.squareup.okhttp:okhttp:2.4.0'
+    compile 'com.google.code.gson:gson:2.3.1'
+    compile 'com.brsanthu:migbase64:2.2'
+    testCompile 'junit:junit:4.8.1'
+}
+
+group = 'io.swagger'
+version = '1.0.0'
+
+install {
+    repositories.mavenInstaller {
+        pom.artifactId = 'swagger-petstore-okhttp-gson'
+    }
+}
+
+task execute(type:JavaExec) {
+   main = System.getProperty('mainClass')
+   classpath = sourceSets.main.runtimeClasspath
+}
diff --git a/samples/client/petstore/java/okhttp-gson/build.sbt b/samples/client/petstore/java/okhttp-gson/build.sbt
new file mode 100644
index 00000000000..f70c7ea41c7
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/build.sbt
@@ -0,0 +1,18 @@
+lazy val root = (project in file(".")).
+  settings(
+    organization := "io.swagger",
+    name := "swagger-petstore-okhttp-gson",
+    version := "1.0.0",
+    scalaVersion := "2.11.4",
+    scalacOptions ++= Seq("-feature"),
+    javacOptions in compile ++= Seq("-Xlint:deprecation"),
+    publishArtifact in (Compile, packageDoc) := false,
+    resolvers += Resolver.mavenLocal,
+    libraryDependencies ++= Seq(
+      "io.swagger" % "swagger-annotations" % "1.5.0",
+      "com.squareup.okhttp" % "okhttp" % "2.4.0",
+      "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/hello.txt b/samples/client/petstore/java/okhttp-gson/hello.txt
new file mode 100644
index 00000000000..6769dd60bdf
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/hello.txt
@@ -0,0 +1 @@
+Hello world!
\ No newline at end of file
diff --git a/samples/client/petstore/java/okhttp-gson/pom.xml b/samples/client/petstore/java/okhttp-gson/pom.xml
new file mode 100644
index 00000000000..2442e1c318e
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/pom.xml
@@ -0,0 +1,146 @@
+<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-okhttp-gson</artifactId>
+  <packaging>jar</packaging>
+  <name>swagger-petstore-okhttp-gson</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.6</source>
+          <target>1.6</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.okhttp</groupId>
+      <artifactId>okhttp</artifactId>
+      <version>${okhttp-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>${gson-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.brsanthu</groupId>
+      <artifactId>migbase64</artifactId>
+      <version>2.2</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>
+    <okhttp-version>2.4.0</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>
+  </properties>
+</project>
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiCallback.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiCallback.java
new file mode 100644
index 00000000000..f8254311bce
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiCallback.java
@@ -0,0 +1,22 @@
+package io.swagger.client;
+
+import java.io.IOException;
+
+/**
+ * Callback for asynchronous API call.
+ *
+ * @param <T> The return type
+ */
+public interface ApiCallback<T> {
+  /**
+   * This is called when the API call fails.
+   */
+  void onFailure(ApiException e);
+
+  /**
+   * This is called when the API call succeeded.
+   *
+   * @param result The result deserialized from response
+   */
+  void onSuccess(T result);
+}
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
new file mode 100644
index 00000000000..f189ea10238
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java
@@ -0,0 +1,761 @@
+package io.swagger.client;
+
+import com.squareup.okhttp.Call;
+import com.squareup.okhttp.Callback;
+import com.squareup.okhttp.OkHttpClient;
+import com.squareup.okhttp.Request;
+import com.squareup.okhttp.Response;
+import com.squareup.okhttp.RequestBody;
+import com.squareup.okhttp.FormEncodingBuilder;
+import com.squareup.okhttp.MultipartBuilder;
+import com.squareup.okhttp.MediaType;
+import com.squareup.okhttp.Headers;
+
+import java.lang.reflect.Type;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.TimeZone;
+import java.util.regex.Pattern;
+
+import java.net.URLEncoder;
+import java.net.URLConnection;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.text.ParseException;
+
+import io.swagger.client.auth.Authentication;
+import io.swagger.client.auth.HttpBasicAuth;
+import io.swagger.client.auth.ApiKeyAuth;
+import io.swagger.client.auth.OAuth;
+
+public class ApiClient {
+  private String basePath = "http://petstore.swagger.io/v2";
+  private boolean lenientOnJson = false;
+  private boolean debugging = false;
+  private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
+
+  private Map<String, Authentication> authentications;
+
+  private String dateFormat;
+  private DateFormat dateFormatter;
+  private int dateLength;
+
+  private String datetimeFormat;
+  private DateFormat datetimeFormatter;
+
+  private OkHttpClient httpClient;
+  private JSON json;
+
+  public ApiClient() {
+    httpClient = new OkHttpClient();
+
+    json = new JSON(this);
+
+    // Use ISO 8601 format for date and datetime.
+    // See https://en.wikipedia.org/wiki/ISO_8601
+    setDateFormat("yyyy-MM-dd");
+    setDatetimeFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
+
+    // Set default User-Agent.
+    setUserAgent("Java-Swagger");
+
+    // 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());
+    // Prevent the authentications from being modified.
+    authentications = Collections.unmodifiableMap(authentications);
+  }
+
+  public String getBasePath() {
+    return basePath;
+  }
+
+  public ApiClient setBasePath(String basePath) {
+    this.basePath = basePath;
+    return this;
+  }
+
+  public OkHttpClient getHttpClient() {
+    return httpClient;
+  }
+
+  public ApiClient setHttpClient(OkHttpClient httpClient) {
+    this.httpClient = httpClient;
+    return this;
+  }
+
+  public JSON getJSON() {
+    return json;
+  }
+
+  public ApiClient setJSON(JSON json) {
+    this.json = json;
+    return this;
+  }
+
+  public String getDateFormat() {
+    return dateFormat;
+  }
+
+  public ApiClient setDateFormat(String dateFormat) {
+    this.dateFormat = dateFormat;
+
+    this.dateFormatter = new SimpleDateFormat(dateFormat);
+    // Use UTC as the default time zone.
+    this.dateFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
+
+    this.dateLength = this.dateFormatter.format(new Date()).length();
+
+    return this;
+  }
+
+  public String getDatetimeFormat() {
+    return datetimeFormat;
+  }
+
+  public ApiClient setDatetimeFormat(String datetimeFormat) {
+    this.datetimeFormat = datetimeFormat;
+
+    this.datetimeFormatter = new SimpleDateFormat(datetimeFormat);
+    // Note: The datetime formatter uses the system's default time zone.
+
+    return this;
+  }
+
+  /**
+   * Parse the given date string into Date object.
+   * The default <code>dateFormat</code> supports these ISO 8601 date formats:
+   *   2015-08-16
+   *   2015-8-16
+   */
+  public Date parseDate(String str) {
+    if (str == null)
+      return null;
+    try {
+      return dateFormatter.parse(str);
+    } catch (ParseException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  /**
+   * Parse the given date-time string into Date object.
+   * The default <code>datetimeFormat</code> supports these ISO 8601 datetime formats:
+   *   2015-08-16T08:20:05Z
+   *   2015-8-16T8:20:05Z
+   *   2015-08-16T08:20:05+00:00
+   *   2015-08-16T08:20:05+0000
+   *   2015-08-16T08:20:05.376Z
+   *   2015-08-16T08:20:05.376+00:00
+   *   2015-08-16T08:20:05.376+00
+   * Note: The 3-digit milli-seconds is optional. Time zone is required and can be in one of
+   *   these formats:
+   *   Z (same with +0000)
+   *   +08:00 (same with +0800)
+   *   -02 (same with -0200)
+   *   -0200
+   * @see https://en.wikipedia.org/wiki/ISO_8601
+   */
+  public Date parseDatetime(String str) {
+    if (str == null)
+      return null;
+
+    if ("yyyy-MM-dd'T'HH:mm:ss.SSSZ".equals(datetimeFormat)) {
+      /*
+       * When the default datetime format is used, process the given string
+       * to support various formats defined by ISO 8601.
+       */
+      // normalize time zone
+      //   trailing "Z": 2015-08-16T08:20:05Z => 2015-08-16T08:20:05+0000
+      str = str.replaceAll("[zZ]\\z", "+0000");
+      //   remove colon: 2015-08-16T08:20:05+00:00 => 2015-08-16T08:20:05+0000
+      str = str.replaceAll("([+-]\\d{2}):(\\d{2})\\z", "$1$2");
+      //   expand time zone: 2015-08-16T08:20:05+00 => 2015-08-16T08:20:05+0000
+      str = str.replaceAll("([+-]\\d{2})\\z", "$100");
+      // add milliseconds when missing
+      //   2015-08-16T08:20:05+0000 => 2015-08-16T08:20:05.000+0000
+      str = str.replaceAll("(:\\d{1,2})([+-]\\d{4})\\z", "$1.000$2");
+    }
+
+    try {
+      return datetimeFormatter.parse(str);
+    } catch (ParseException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  public Date parseDateOrDatetime(String str) {
+    if (str == null)
+      return null;
+    else if (str.length() <= dateLength)
+      return parseDate(str);
+    else
+      return parseDatetime(str);
+  }
+
+  /**
+   * Format the given Date object into string.
+   */
+  public String formatDate(Date date) {
+    return dateFormatter.format(date);
+  }
+
+  /**
+   * Format the given Date object into string.
+   */
+  public String formatDatetime(Date date) {
+    return datetimeFormatter.format(date);
+  }
+
+  /**
+   * Get authentications (key: authentication name, value: authentication).
+   */
+  public Map<String, Authentication> getAuthentications() {
+    return authentications;
+  }
+
+  /**
+   * Get authentication for the given name.
+   *
+   * @param authName The authentication name
+   * @return The authentication, null if not found
+   */
+  public Authentication getAuthentication(String authName) {
+    return authentications.get(authName);
+  }
+
+  /**
+   * Helper method to set username for the first HTTP basic authentication.
+   */
+  public void setUsername(String username) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof HttpBasicAuth) {
+        ((HttpBasicAuth) auth).setUsername(username);
+        return;
+      }
+    }
+    throw new RuntimeException("No HTTP basic authentication configured!");
+  }
+
+  /**
+   * Helper method to set password for the first HTTP basic authentication.
+   */
+  public void setPassword(String password) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof HttpBasicAuth) {
+        ((HttpBasicAuth) auth).setPassword(password);
+        return;
+      }
+    }
+    throw new RuntimeException("No HTTP basic authentication configured!");
+  }
+
+  /**
+   * Helper method to set API key value for the first API key authentication.
+   */
+  public void setApiKey(String apiKey) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof ApiKeyAuth) {
+        ((ApiKeyAuth) auth).setApiKey(apiKey);
+        return;
+      }
+    }
+    throw new RuntimeException("No API key authentication configured!");
+  }
+
+  /**
+   * Helper method to set API key prefix for the first API key authentication.
+   */
+  public void setApiKeyPrefix(String apiKeyPrefix) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof ApiKeyAuth) {
+        ((ApiKeyAuth) auth).setApiKeyPrefix(apiKeyPrefix);
+        return;
+      }
+    }
+    throw new RuntimeException("No API key authentication configured!");
+  }
+
+  /**
+   * Set the User-Agent header's value (by adding to the default header map).
+   */
+  public ApiClient setUserAgent(String userAgent) {
+    addDefaultHeader("User-Agent", userAgent);
+    return this;
+  }
+
+  /**
+   * Add a default header.
+   *
+   * @param key The header's key
+   * @param value The header's value
+   */
+  public ApiClient addDefaultHeader(String key, String value) {
+    defaultHeaderMap.put(key, value);
+    return this;
+  }
+
+  /**
+   * @see https://google-gson.googlecode.com/svn/trunk/gson/docs/javadocs/com/google/gson/stream/JsonReader.html#setLenient(boolean)
+   */
+  public boolean isLenientOnJson() {
+    return lenientOnJson;
+  }
+
+  public ApiClient setLenientOnJson(boolean lenient) {
+    this.lenientOnJson = lenient;
+    return this;
+  }
+
+  /**
+   * Check that whether debugging is enabled for this API client.
+   */
+  public boolean isDebugging() {
+    return debugging;
+  }
+
+  /**
+   * Enable/disable debugging for this API client.
+   *
+   * @param debugging To enable (true) or disable (false) debugging
+   */
+  public ApiClient setDebugging(boolean debugging) {
+    this.debugging = debugging;
+    return this;
+  }
+
+  /**
+   * Format the given parameter object into string.
+   */
+  public String parameterToString(Object param) {
+    if (param == null) {
+      return "";
+    } else if (param instanceof Date) {
+      return formatDatetime((Date) param);
+    } else if (param instanceof Collection) {
+      StringBuilder b = new StringBuilder();
+      for (Object o : (Collection)param) {
+        if (b.length() > 0) {
+          b.append(",");
+        }
+        b.append(String.valueOf(o));
+      }
+      return b.toString();
+    } else {
+      return String.valueOf(param);
+    }
+  }
+
+  /*
+    Format to {@code Pair} objects.
+  */
+  public List<Pair> parameterToPairs(String collectionFormat, String name, Object value){
+    List<Pair> params = new ArrayList<Pair>();
+
+    // preconditions
+    if (name == null || name.isEmpty() || value == null) return params;
+
+    Collection valueCollection = null;
+    if (value instanceof Collection) {
+      valueCollection = (Collection) value;
+    } else {
+      params.add(new Pair(name, parameterToString(value)));
+      return params;
+    }
+
+    if (valueCollection.isEmpty()){
+      return params;
+    }
+
+    // get the collection format
+    collectionFormat = (collectionFormat == null || collectionFormat.isEmpty() ? "csv" : collectionFormat); // default: csv
+
+    // create the params based on the collection format
+    if (collectionFormat.equals("multi")) {
+      for (Object item : valueCollection) {
+        params.add(new Pair(name, parameterToString(item)));
+      }
+
+      return params;
+    }
+
+    String delimiter = ",";
+
+    if (collectionFormat.equals("csv")) {
+      delimiter = ",";
+    } else if (collectionFormat.equals("ssv")) {
+      delimiter = " ";
+    } else if (collectionFormat.equals("tsv")) {
+      delimiter = "\t";
+    } else if (collectionFormat.equals("pipes")) {
+      delimiter = "|";
+    }
+
+    StringBuilder sb = new StringBuilder() ;
+    for (Object item : valueCollection) {
+      sb.append(delimiter);
+      sb.append(parameterToString(item));
+    }
+
+    params.add(new Pair(name, sb.substring(1)));
+
+    return params;
+  }
+
+  /**
+   * Select the Accept header's value from the given accepts array:
+   *   if JSON exists in the given array, use it;
+   *   otherwise use all of them (joining into a string)
+   *
+   * @param accepts The accepts array to select from
+   * @return The Accept header to use. If the given array is empty,
+   *   null will be returned (not to set the Accept header explicitly).
+   */
+  public String selectHeaderAccept(String[] accepts) {
+    if (accepts.length == 0) return null;
+    if (StringUtil.containsIgnoreCase(accepts, "application/json")) return "application/json";
+    return StringUtil.join(accepts, ",");
+  }
+
+  /**
+   * Select the Content-Type header's value from the given array:
+   *   if JSON exists in the given array, use it;
+   *   otherwise use the first one of the array.
+   *
+   * @param contentTypes The Content-Type array to select from
+   * @return The Content-Type header to use. If the given array is empty,
+   *   JSON will be used.
+   */
+  public String selectHeaderContentType(String[] contentTypes) {
+    if (contentTypes.length == 0) return "application/json";
+    if (StringUtil.containsIgnoreCase(contentTypes, "application/json")) return "application/json";
+    return contentTypes[0];
+  }
+
+  /**
+   * Escape the given string to be used as URL query value.
+   */
+  public String escapeString(String str) {
+    try {
+      return URLEncoder.encode(str, "utf8").replaceAll("\\+", "%20");
+    } catch (UnsupportedEncodingException e) {
+      return str;
+    }
+  }
+
+  /**
+   * Deserialize response body to Java object, according the Content-Type
+   * response header.
+   *
+   * @param response HTTP response
+   * @param returnType The type of the Java object
+   * @return The deserialized Java object
+   */
+  public <T> T deserialize(Response response, Type returnType) throws ApiException {
+    if (response == null || returnType == null)
+      return null;
+
+    String respBody;
+    try {
+      if (response.body() != null)
+        respBody = response.body().string();
+      else
+        respBody = null;
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+
+    if (respBody == null || "".equals(respBody))
+      return null;
+
+    String contentType = response.headers().get("Content-Type");
+    if (contentType == null) {
+      // ensuring a default content type
+      contentType = "application/json";
+    }
+    if (contentType.startsWith("application/json")) {
+      return json.deserialize(respBody, returnType);
+    } else {
+      throw new ApiException(
+        "Content type \"" + contentType + "\" is not supported",
+        response.code(),
+        response.headers().toMultimap(),
+        respBody);
+    }
+  }
+
+  /**
+   * Serialize the given Java object into request body string, according to the
+   * request Content-Type.
+   *
+   * @param obj The Java object
+   * @param contentType The request Content-Type
+   * @return The serialized string
+   */
+  public String serialize(Object obj, String contentType) throws ApiException {
+    if (contentType.startsWith("application/json")) {
+      if (obj != null)
+        return json.serialize(obj);
+      else
+        return null;
+    } else {
+      throw new ApiException("Content type \"" + contentType + "\" is not supported");
+    }
+  }
+
+  /**
+   * @see #execute(Call, Type)
+   */
+  public <T> T execute(Call call) throws ApiException {
+    return execute(call, null);
+  }
+
+  /**
+   * Execute HTTP call and deserialize the HTTP response body into the given return type.
+   *
+   * @param returnType The return type used to deserialize HTTP response body
+   * @param <T> The return type corresponding to (same with) returnType
+   * @return The Java object deserialized from response body. Returns null if returnType is null.
+   */
+  public <T> T execute(Call call, Type returnType) throws ApiException {
+    try {
+      Response response = call.execute();
+      return handleResponse(response, returnType);
+    } catch (IOException e) {
+      throw new ApiException(e);
+    }
+  }
+
+  /**
+   * #see executeAsync(Call, Type, ApiCallback)
+   */
+  public <T> void executeAsync(Call call, ApiCallback<T> callback) throws ApiException {
+    executeAsync(call, null, callback);
+  }
+
+  /**
+   * Execute HTTP call asynchronously.
+   *
+   * @see #execute(Call, Type)
+   * @param The callback to be executed when the API call finishes
+   */
+  public <T> void executeAsync(Call call, final Type returnType, final ApiCallback<T> callback) {
+    call.enqueue(new Callback() {
+      @Override
+      public void onFailure(Request request, IOException e) {
+        callback.onFailure(new ApiException(e));
+      }
+
+      @Override
+      public void onResponse(Response response) throws IOException {
+        T result;
+        try {
+          result = (T) handleResponse(response, returnType);
+        } catch (ApiException e) {
+          callback.onFailure(e);
+          return;
+        }
+        callback.onSuccess(result);
+      }
+    });
+  }
+
+  public <T> T handleResponse(Response response, Type returnType) throws ApiException {
+    if (response.isSuccessful()) {
+      if (returnType == null || response.code() == 204) {
+        // returning null if the returnType is not defined,
+        // or the status code is 204 (No Content)
+        return null;
+      } else {
+        return deserialize(response, returnType);
+      }
+    } else {
+      String respBody = null;
+      if (response.body() != null) {
+        try {
+          respBody = response.body().string();
+        } catch (IOException e) {
+          throw new ApiException(response.message(), e, response.code(), response.headers().toMultimap());
+        }
+      }
+      throw new ApiException(response.message(), response.code(), response.headers().toMultimap(), respBody);
+    }
+  }
+
+  /**
+   * Build HTTP call with the given options.
+   *
+   * @param path The sub-path of the HTTP URL
+   * @param method The request method, one of "GET", "HEAD", "POST", "PUT", "PATCH" and "DELETE"
+   * @param queryParams The query parameters
+   * @param body The request body object
+   * @param headerParams The header parameters
+   * @param formParams The form parameters
+   * @param authNames The authentications to apply
+   * @return The HTTP call
+   */
+  public Call buildCall(String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, Object> formParams, String[] authNames) throws ApiException {
+    updateParamsForAuth(authNames, queryParams, headerParams);
+
+    final String url = buildUrl(path, queryParams);
+    final Request.Builder reqBuilder = new Request.Builder().url(url);
+    processHeaderParams(headerParams, reqBuilder);
+
+    String contentType = (String) headerParams.get("Content-Type");
+    // ensuring a default content type
+    if (contentType == null) contentType = "application/json";
+
+    RequestBody reqBody;
+    if ("GET".equals(method) || "HEAD".equals(method)) {
+      reqBody = null;
+    } else if ("application/x-www-form-urlencoded".equals(contentType)) {
+      reqBody = buildRequestBodyFormEncoding(formParams);
+    } else if ("multipart/form-data".equals(contentType)) {
+      reqBody = buildRequestBodyMultipart(formParams);
+    } else if (body == null) {
+      if ("DELETE".equals(method)) {
+        // allow calling DELETE without sending a request body
+        reqBody = null;
+      } else {
+        // use an empty request body (for POST, PUT and PATCH)
+        reqBody = RequestBody.create(MediaType.parse(contentType), "");
+      }
+    } else {
+      reqBody = RequestBody.create(MediaType.parse(contentType), serialize(body, contentType));
+    }
+
+    Request request;
+    if ("GET".equals(method)) {
+      request = reqBuilder.get().build();
+    } else if ("HEAD".equals(method)) {
+      request = reqBuilder.head().build();
+    } else if ("POST".equals(method)) {
+      request = reqBuilder.post(reqBody).build();
+    } else if ("PUT".equals(method)) {
+      request = reqBuilder.put(reqBody).build();
+    } else if ("PATCH".equals(method)) {
+      request = reqBuilder.patch(reqBody).build();
+    } else if ("DELETE".equals(method)) {
+      if (reqBody == null) {
+        // calling DELETE without sending a request body
+        request = reqBuilder.delete().build();
+      } else {
+        request = reqBuilder.delete(reqBody).build();
+      }
+    } else {
+      throw new ApiException("unknown method type: " + method);
+    }
+
+    return httpClient.newCall(request);
+  }
+
+  /**
+   * 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
+   */
+  public String buildUrl(String path, List<Pair> queryParams) {
+    StringBuilder query = new StringBuilder();
+    if (queryParams != null) {
+      for (Pair param : queryParams) {
+        if (param.getValue() != null) {
+          if (query.toString().length() == 0)
+            query.append("?");
+          else
+            query.append("&");
+          String value = parameterToString(param.getValue());
+          query.append(escapeString(param.getName())).append("=").append(escapeString(value));
+        }
+      }
+    }
+    return basePath + path + query.toString();
+  }
+
+  /**
+   * Set header parameters to the request builder, including default headers.
+   */
+  public void processHeaderParams(Map<String, String> headerParams, Request.Builder reqBuilder) {
+    for (Entry<String, String> param : headerParams.entrySet()) {
+      reqBuilder.header(param.getKey(), parameterToString(param.getValue()));
+    }
+    for (Entry<String, String> header : defaultHeaderMap.entrySet()) {
+      if (!headerParams.containsKey(header.getKey())) {
+        reqBuilder.header(header.getKey(), parameterToString(header.getValue()));
+      }
+    }
+  }
+
+  /**
+   * Update query and header parameters based on authentication settings.
+   *
+   * @param authNames The authentications to apply
+   */
+  public void updateParamsForAuth(String[] authNames, List<Pair> queryParams, Map<String, String> headerParams) {
+    for (String authName : authNames) {
+      Authentication auth = authentications.get(authName);
+      if (auth == null) throw new RuntimeException("Authentication undefined: " + authName);
+      auth.applyToParams(queryParams, headerParams);
+    }
+  }
+
+  /**
+   * Build a form-encoding request body with the given form parameters.
+   */
+  public RequestBody buildRequestBodyFormEncoding(Map<String, Object> formParams) {
+    FormEncodingBuilder formBuilder  = new FormEncodingBuilder();
+    for (Entry<String, Object> param : formParams.entrySet()) {
+      formBuilder.add(param.getKey(), parameterToString(param.getValue()));
+    }
+    return formBuilder.build();
+  }
+
+  /**
+   * Build a multipart (file uploading) request body with the given form parameters,
+   * which could contain text fields and file fields.
+   */
+  public RequestBody buildRequestBodyMultipart(Map<String, Object> formParams) {
+    MultipartBuilder mpBuilder = new MultipartBuilder().type(MultipartBuilder.FORM);
+    for (Entry<String, Object> param : formParams.entrySet()) {
+      if (param.getValue() instanceof File) {
+        File file = (File) param.getValue();
+        Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + param.getKey() + "\"; filename=\"" + file.getName() + "\"");
+        MediaType mediaType = MediaType.parse(guessContentTypeFromFile(file));
+        mpBuilder.addPart(partHeaders, RequestBody.create(mediaType, file));
+      } else {
+        Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + param.getKey() + "\"");
+        mpBuilder.addPart(partHeaders, RequestBody.create(null, parameterToString(param.getValue())));
+      }
+    }
+    return mpBuilder.build();
+  }
+
+  /**
+   * Guess Content-Type header from the given file (defaults to "application/octet-stream").
+   *
+   * @param file The given file
+   * @return The Content-Type guessed
+   */
+  public String guessContentTypeFromFile(File file) {
+    String contentType = URLConnection.guessContentTypeFromName(file.getName());
+    if (contentType == null) {
+      return "application/octet-stream";
+    } else {
+      return contentType;
+    }
+  }
+}
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
new file mode 100644
index 00000000000..d19aa8ebb3a
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiException.java
@@ -0,0 +1,69 @@
+package io.swagger.client;
+
+import java.util.Map;
+import java.util.List;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-31T19:27:38.337+08:00")
+public class ApiException extends Exception {
+  private int code = 0;
+  private Map<String, List<String>> responseHeaders = null;
+  private String responseBody = null;
+
+  public ApiException() {}
+
+  public ApiException(Throwable throwable) {
+    super(throwable);
+  }
+
+  public ApiException(String message) {
+    super(message);
+  }
+
+  public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders, String responseBody) {
+    super(message, throwable);
+    this.code = code;
+    this.responseHeaders = responseHeaders;
+    this.responseBody = responseBody;
+  }
+
+  public ApiException(String message, int code, Map<String, List<String>> responseHeaders, String responseBody) {
+    this(message, (Throwable) null, code, responseHeaders, responseBody);
+  }
+
+  public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders) {
+    this(message, throwable, code, responseHeaders, null);
+  }
+
+  public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
+    this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+  }
+
+  public ApiException(int code, String message) {
+    super(message);
+    this.code = code;
+  }
+
+  public ApiException(int code, String message, Map<String, List<String>> responseHeaders, String responseBody) {
+    this(code, message);
+    this.responseHeaders = responseHeaders;
+    this.responseBody = responseBody;
+  }
+
+  public int getCode() {
+    return code;
+  }
+
+  /**
+   * Get the HTTP response headers.
+   */
+  public Map<String, List<String>> getResponseHeaders() {
+    return responseHeaders;
+  }
+
+  /**
+   * Get the HTTP response body.
+   */
+  public String getResponseBody() {
+    return responseBody;
+  }
+}
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
new file mode 100644
index 00000000000..07c97e116d7
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Configuration.java
@@ -0,0 +1,22 @@
+package io.swagger.client;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-31T19:27:38.337+08:00")
+public class Configuration {
+  private static ApiClient defaultApiClient = new ApiClient();
+
+  /**
+   * Get the default API client, which would be used when creating API
+   * instances without providing an API client.
+   */
+  public static ApiClient getDefaultApiClient() {
+    return defaultApiClient;
+   }
+
+  /**
+   * Set the default API client, which would be used when creating API
+   * instances without providing an API client.
+   */
+  public static void setDefaultApiClient(ApiClient apiClient) {
+    defaultApiClient = apiClient;
+  }
+}
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java
new file mode 100644
index 00000000000..f88639b9c82
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java
@@ -0,0 +1,102 @@
+package io.swagger.client;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonNull;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import com.google.gson.stream.JsonReader;
+
+import java.io.StringReader;
+import java.lang.reflect.Type;
+import java.util.Date;
+
+public class JSON {
+  private ApiClient apiClient;
+  private Gson gson;
+
+  public JSON(ApiClient apiClient) {
+    this.apiClient = apiClient;
+    gson = new GsonBuilder()
+      .serializeNulls()
+      .registerTypeAdapter(Date.class, new DateAdapter(apiClient))
+      .create();
+	}
+
+  public Gson getGson() {
+    return gson;
+  }
+
+  public void setGson(Gson gson) {
+    this.gson = gson;
+  }
+
+  /**
+   * Serialize the given Java object into JSON string.
+   */
+  public String serialize(Object obj) {
+    return gson.toJson(obj);
+  }
+
+  /**
+   * Deserialize the given JSON string to Java object.
+   *
+   * @param body The JSON string
+   * @param returnType The type to deserialize inot
+   * @return The deserialized Java object
+   */
+  public <T> T deserialize(String body, Type returnType) {
+    try {
+      if (apiClient.isLenientOnJson()) {
+        JsonReader jsonReader = new JsonReader(new StringReader(body));
+        // see https://google-gson.googlecode.com/svn/trunk/gson/docs/javadocs/com/google/gson/stream/JsonReader.html#setLenient(boolean)
+        jsonReader.setLenient(true);
+        return gson.fromJson(jsonReader, returnType);
+      } else {
+        return gson.fromJson(body, returnType);
+      }
+    } catch (JsonParseException e) {
+      // Fallback processing when failed to parse JSON form response body:
+      //   return the response body string directly for the String return type;
+      //   parse response body into date or datetime for the Date return type.
+      if (returnType.equals(String.class))
+        return (T) body;
+      else if (returnType.equals(Date.class))
+        return (T) apiClient.parseDateOrDatetime(body);
+      else throw(e);
+    }
+  }
+}
+
+class DateAdapter implements JsonSerializer<Date>, JsonDeserializer<Date> {
+    private final ApiClient apiClient;
+
+    public DateAdapter(ApiClient apiClient) {
+        super();
+        this.apiClient = apiClient;
+    }
+
+    @Override
+    public JsonElement serialize(Date src, Type typeOfSrc, JsonSerializationContext context) {
+        if (src == null) {
+            return JsonNull.INSTANCE;
+        } else {
+            return new JsonPrimitive(apiClient.formatDatetime(src));
+        }
+    }
+
+    @Override
+    public Date deserialize(JsonElement json, Type date, JsonDeserializationContext context) throws JsonParseException {
+        String str = json.getAsJsonPrimitive().getAsString();
+        try {
+            return apiClient.parseDateOrDatetime(str);
+        } catch (RuntimeException e) {
+            throw new JsonParseException(e);
+        }
+    }
+}
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
new file mode 100644
index 00000000000..bb0cd823791
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Pair.java
@@ -0,0 +1,39 @@
+package io.swagger.client;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-31T19:27:38.337+08:00")
+public class Pair {
+    private String name = "";
+    private String value = "";
+
+    public Pair (String name, String value) {
+        setName(name);
+        setValue(value);
+    }
+
+    private void setName(String name) {
+        if (!isValidString(name)) return;
+
+        this.name = name;
+    }
+
+    private void setValue(String value) {
+        if (!isValidString(value)) return;
+
+        this.value = value;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    private boolean isValidString(String arg) {
+        if (arg == null) return false;
+        if (arg.trim().isEmpty()) return false;
+
+        return true;
+    }
+}
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
new file mode 100644
index 00000000000..9a58d6d5558
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/StringUtil.java
@@ -0,0 +1,51 @@
+package io.swagger.client;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-31T19:27:38.337+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();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  public static 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/api/PetApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/PetApi.java
new file mode 100644
index 00000000000..debe576dc9d
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/PetApi.java
@@ -0,0 +1,527 @@
+package io.swagger.client.api;
+
+import io.swagger.client.ApiCallback;
+import io.swagger.client.ApiClient;
+import io.swagger.client.ApiException;
+import io.swagger.client.Configuration;
+import io.swagger.client.Pair;
+
+import io.swagger.client.model.*;
+
+import com.google.gson.reflect.TypeToken;
+
+import com.squareup.okhttp.Call;
+
+import java.lang.reflect.Type;
+
+import java.util.*;
+
+import io.swagger.client.model.Pet;
+import java.io.File;
+
+import java.io.File;
+import java.util.Map;
+import java.util.HashMap;
+
+public class PetApi {
+  private ApiClient apiClient;
+
+  public PetApi() {
+    this(Configuration.getDefaultApiClient());
+  }
+
+  public PetApi(ApiClient apiClient) {
+    this.apiClient = apiClient;
+  }
+
+  public ApiClient getApiClient() {
+    return apiClient;
+  }
+
+  public void setApiClient(ApiClient apiClient) {
+    this.apiClient = apiClient;
+  }
+
+  
+  /* Build call for updatePet */
+  private Call updatePetCall(Pet body) 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);
+
+    String[] authNames = new String[] { "petstore_auth" };
+    return apiClient.buildCall(path, "PUT", queryParams, postBody, headerParams, formParams, authNames);
+  }
+
+  /**
+   * Update an existing pet
+   * 
+   * @param body Pet object that needs to be added to the store
+   */
+  public void updatePet(Pet body) throws ApiException {
+    Call call = updatePetCall(body);
+    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
+   */
+  public Call updatePetAsync(Pet body, ApiCallback<Void> callback) throws ApiException {
+    Call call = updatePetCall(body);
+    apiClient.executeAsync(call, callback);
+    return call;
+  }
+  
+  /* Build call for addPet */
+  private Call addPetCall(Pet body) 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);
+
+    String[] authNames = new String[] { "petstore_auth" };
+    return apiClient.buildCall(path, "POST", queryParams, postBody, headerParams, formParams, authNames);
+  }
+
+  /**
+   * Add a new pet to the store
+   * 
+   * @param body Pet object that needs to be added to the store
+   */
+  public void addPet(Pet body) throws ApiException {
+    Call call = addPetCall(body);
+    apiClient.execute(call);
+  }
+
+  /**
+   * Add a new pet to the store (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
+   */
+  public Call addPetAsync(Pet body, ApiCallback<Void> callback) throws ApiException {
+    Call call = addPetCall(body);
+    apiClient.executeAsync(call, callback);
+    return call;
+  }
+  
+  /* Build call for findPetsByStatus */
+  private Call findPetsByStatusCall(List<String> status) throws ApiException {
+    Object postBody = null;
+    
+
+    // create path and map variables
+    String path = "/pet/findByStatus".replaceAll("\\{format\\}","json");
+
+    List<Pair> queryParams = new ArrayList<Pair>();
+    if (status != null)
+      queryParams.addAll(apiClient.parameterToPairs("multi", "status", status));
+
+    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);
+
+    String[] authNames = new String[] { "petstore_auth" };
+    return apiClient.buildCall(path, "GET", queryParams, postBody, headerParams, formParams, authNames);
+  }
+
+  /**
+   * 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 {
+    Call call = findPetsByStatusCall(status);
+    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
+   */
+  public Call findPetsByStatusAsync(List<String> status, ApiCallback<List<Pet>> callback) throws ApiException {
+    Call call = findPetsByStatusCall(status);
+    Type returnType = new TypeToken<List<Pet>>(){}.getType();
+    apiClient.executeAsync(call, returnType, callback);
+    return call;
+  }
+  
+  /* Build call for findPetsByTags */
+  private Call findPetsByTagsCall(List<String> tags) 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);
+
+    String[] authNames = new String[] { "petstore_auth" };
+    return apiClient.buildCall(path, "GET", queryParams, postBody, headerParams, formParams, authNames);
+  }
+
+  /**
+   * 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 {
+    Call call = findPetsByTagsCall(tags);
+    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
+   */
+  public Call findPetsByTagsAsync(List<String> tags, ApiCallback<List<Pet>> callback) throws ApiException {
+    Call call = findPetsByTagsCall(tags);
+    Type returnType = new TypeToken<List<Pet>>(){}.getType();
+    apiClient.executeAsync(call, returnType, callback);
+    return call;
+  }
+  
+  /* Build call for getPetById */
+  private Call getPetByIdCall(Long petId) 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);
+
+    String[] authNames = new String[] { "petstore_auth", "api_key" };
+    return apiClient.buildCall(path, "GET", queryParams, postBody, headerParams, formParams, authNames);
+  }
+
+  /**
+   * 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 {
+    Call call = getPetByIdCall(petId);
+    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
+   */
+  public Call getPetByIdAsync(Long petId, ApiCallback<Pet> callback) throws ApiException {
+    Call call = getPetByIdCall(petId);
+    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) 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);
+
+    String[] authNames = new String[] { "petstore_auth" };
+    return apiClient.buildCall(path, "POST", queryParams, postBody, headerParams, formParams, authNames);
+  }
+
+  /**
+   * 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) throws ApiException {
+    Call call = updatePetWithFormCall(petId, name, status);
+    apiClient.execute(call);
+  }
+
+  /**
+   * Updates a pet in the store with form data (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 callback The callback to be executed when the API call finishes
+   * @return The request call
+   */
+  public Call updatePetWithFormAsync(String petId, String name, String status, ApiCallback<Void> callback) throws ApiException {
+    Call call = updatePetWithFormCall(petId, name, status);
+    apiClient.executeAsync(call, callback);
+    return call;
+  }
+  
+  /* Build call for deletePet */
+  private Call deletePetCall(Long petId, String apiKey) 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 deletePet(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>();
+    if (apiKey != null)
+      headerParams.put("api_key", apiClient.parameterToString(apiKey));
+
+    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);
+
+    String[] authNames = new String[] { "petstore_auth" };
+    return apiClient.buildCall(path, "DELETE", queryParams, postBody, headerParams, formParams, authNames);
+  }
+
+  /**
+   * Deletes a pet
+   * 
+   * @param petId Pet id to delete
+   * @param apiKey 
+   */
+  public void deletePet(Long petId, String apiKey) throws ApiException {
+    Call call = deletePetCall(petId, apiKey);
+    apiClient.execute(call);
+  }
+
+  /**
+   * Deletes a pet (asynchronously)
+   * 
+   * @param petId Pet id to delete
+   * @param apiKey 
+   * @param callback The callback to be executed when the API call finishes
+   * @return The request call
+   */
+  public Call deletePetAsync(Long petId, String apiKey, ApiCallback<Void> callback) throws ApiException {
+    Call call = deletePetCall(petId, apiKey);
+    apiClient.executeAsync(call, callback);
+    return call;
+  }
+  
+  /* Build call for uploadFile */
+  private Call uploadFileCall(Long petId, String additionalMetadata, File file) 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)");
+    }
+    
+
+    // create path and map variables
+    String path = "/pet/{petId}/uploadImage".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 (additionalMetadata != null)
+      formParams.put("additionalMetadata", additionalMetadata);
+    if (file != null)
+      formParams.put("file", file);
+
+    final String[] accepts = {
+      "application/json", "application/xml"
+    };
+    final String accept = apiClient.selectHeaderAccept(accepts);
+    if (accept != null) headerParams.put("Accept", accept);
+
+    final String[] contentTypes = {
+      "multipart/form-data"
+    };
+    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+    headerParams.put("Content-Type", contentType);
+
+    String[] authNames = new String[] { "petstore_auth" };
+    return apiClient.buildCall(path, "POST", queryParams, postBody, headerParams, formParams, authNames);
+  }
+
+  /**
+   * 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) throws ApiException {
+    Call call = uploadFileCall(petId, additionalMetadata, file);
+    apiClient.execute(call);
+  }
+
+  /**
+   * 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 callback The callback to be executed when the API call finishes
+   * @return The request call
+   */
+  public Call uploadFileAsync(Long petId, String additionalMetadata, File file, ApiCallback<Void> callback) throws ApiException {
+    Call call = uploadFileCall(petId, additionalMetadata, file);
+    apiClient.executeAsync(call, callback);
+    return call;
+  }
+  
+}
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
new file mode 100644
index 00000000000..a3fb14bb521
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/StoreApi.java
@@ -0,0 +1,277 @@
+package io.swagger.client.api;
+
+import io.swagger.client.ApiCallback;
+import io.swagger.client.ApiClient;
+import io.swagger.client.ApiException;
+import io.swagger.client.Configuration;
+import io.swagger.client.Pair;
+
+import io.swagger.client.model.*;
+
+import com.google.gson.reflect.TypeToken;
+
+import com.squareup.okhttp.Call;
+
+import java.lang.reflect.Type;
+
+import java.util.*;
+
+import java.util.Map;
+import io.swagger.client.model.Order;
+
+import java.io.File;
+import java.util.Map;
+import java.util.HashMap;
+
+public class StoreApi {
+  private ApiClient apiClient;
+
+  public StoreApi() {
+    this(Configuration.getDefaultApiClient());
+  }
+
+  public StoreApi(ApiClient apiClient) {
+    this.apiClient = apiClient;
+  }
+
+  public ApiClient getApiClient() {
+    return apiClient;
+  }
+
+  public void setApiClient(ApiClient apiClient) {
+    this.apiClient = apiClient;
+  }
+
+  
+  /* Build call for getInventory */
+  private Call getInventoryCall() throws ApiException {
+    Object postBody = null;
+    
+
+    // create path and map variables
+    String path = "/store/inventory".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 = {
+      
+    };
+    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+    headerParams.put("Content-Type", contentType);
+
+    String[] authNames = new String[] { "api_key" };
+    return apiClient.buildCall(path, "GET", queryParams, postBody, headerParams, formParams, authNames);
+  }
+
+  /**
+   * Returns pet inventories by status
+   * Returns a map of status codes to quantities
+   * @return Map<String, Integer>
+   */
+  public Map<String, Integer> getInventory() throws ApiException {
+    Call call = getInventoryCall();
+    Type returnType = new TypeToken<Map<String, Integer>>(){}.getType();
+    return apiClient.execute(call, returnType);
+  }
+
+  /**
+   * Returns pet inventories by status (asynchronously)
+   * Returns a map of status codes to quantities
+   * @param callback The callback to be executed when the API call finishes
+   * @return The request call
+   */
+  public Call getInventoryAsync(ApiCallback<Map<String, Integer>> callback) throws ApiException {
+    Call call = getInventoryCall();
+    Type returnType = new TypeToken<Map<String, Integer>>(){}.getType();
+    apiClient.executeAsync(call, returnType, callback);
+    return call;
+  }
+  
+  /* Build call for placeOrder */
+  private Call placeOrderCall(Order body) throws ApiException {
+    Object postBody = body;
+    
+
+    // create path and map variables
+    String path = "/store/order".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 = {
+      
+    };
+    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+    headerParams.put("Content-Type", contentType);
+
+    String[] authNames = new String[] {  };
+    return apiClient.buildCall(path, "POST", queryParams, postBody, headerParams, formParams, authNames);
+  }
+
+  /**
+   * Place an order for a pet
+   * 
+   * @param body order placed for purchasing the pet
+   * @return Order
+   */
+  public Order placeOrder(Order body) throws ApiException {
+    Call call = placeOrderCall(body);
+    Type returnType = new TypeToken<Order>(){}.getType();
+    return apiClient.execute(call, returnType);
+  }
+
+  /**
+   * Place an order for a pet (asynchronously)
+   * 
+   * @param body order placed for purchasing the pet
+   * @param callback The callback to be executed when the API call finishes
+   * @return The request call
+   */
+  public Call placeOrderAsync(Order body, ApiCallback<Order> callback) throws ApiException {
+    Call call = placeOrderCall(body);
+    Type returnType = new TypeToken<Order>(){}.getType();
+    apiClient.executeAsync(call, returnType, callback);
+    return call;
+  }
+  
+  /* Build call for getOrderById */
+  private Call getOrderByIdCall(String orderId) 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 getOrderById(Async)");
+    }
+    
+
+    // create path and map variables
+    String path = "/store/order/{orderId}".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.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);
+
+    String[] authNames = new String[] {  };
+    return apiClient.buildCall(path, "GET", queryParams, postBody, headerParams, formParams, authNames);
+  }
+
+  /**
+   * 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 {
+    Call call = getOrderByIdCall(orderId);
+    Type returnType = new TypeToken<Order>(){}.getType();
+    return apiClient.execute(call, returnType);
+  }
+
+  /**
+   * 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 callback The callback to be executed when the API call finishes
+   * @return The request call
+   */
+  public Call getOrderByIdAsync(String orderId, ApiCallback<Order> callback) throws ApiException {
+    Call call = getOrderByIdCall(orderId);
+    Type returnType = new TypeToken<Order>(){}.getType();
+    apiClient.executeAsync(call, returnType, callback);
+    return call;
+  }
+  
+  /* Build call for deleteOrder */
+  private Call deleteOrderCall(String orderId) 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)");
+    }
+    
+
+    // create path and map variables
+    String path = "/store/order/{orderId}".replaceAll("\\{format\\}","json")
+      .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.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);
+
+    String[] authNames = new String[] {  };
+    return apiClient.buildCall(path, "DELETE", queryParams, postBody, headerParams, formParams, authNames);
+  }
+
+  /**
+   * 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 void deleteOrder(String orderId) throws ApiException {
+    Call call = deleteOrderCall(orderId);
+    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
+   * @param callback The callback to be executed when the API call finishes
+   * @return The request call
+   */
+  public Call deleteOrderAsync(String orderId, ApiCallback<Void> callback) throws ApiException {
+    Call call = deleteOrderCall(orderId);
+    apiClient.executeAsync(call, 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
new file mode 100644
index 00000000000..27429765069
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/UserApi.java
@@ -0,0 +1,500 @@
+package io.swagger.client.api;
+
+import io.swagger.client.ApiCallback;
+import io.swagger.client.ApiClient;
+import io.swagger.client.ApiException;
+import io.swagger.client.Configuration;
+import io.swagger.client.Pair;
+
+import io.swagger.client.model.*;
+
+import com.google.gson.reflect.TypeToken;
+
+import com.squareup.okhttp.Call;
+
+import java.lang.reflect.Type;
+
+import java.util.*;
+
+import io.swagger.client.model.User;
+import java.util.*;
+
+import java.io.File;
+import java.util.Map;
+import java.util.HashMap;
+
+public class UserApi {
+  private ApiClient apiClient;
+
+  public UserApi() {
+    this(Configuration.getDefaultApiClient());
+  }
+
+  public UserApi(ApiClient apiClient) {
+    this.apiClient = apiClient;
+  }
+
+  public ApiClient getApiClient() {
+    return apiClient;
+  }
+
+  public void setApiClient(ApiClient apiClient) {
+    this.apiClient = apiClient;
+  }
+
+  
+  /* Build call for createUser */
+  private Call createUserCall(User body) throws ApiException {
+    Object postBody = body;
+    
+
+    // create path and map variables
+    String path = "/user".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 = {
+      
+    };
+    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+    headerParams.put("Content-Type", contentType);
+
+    String[] authNames = new String[] {  };
+    return apiClient.buildCall(path, "POST", queryParams, postBody, headerParams, formParams, authNames);
+  }
+
+  /**
+   * Create user
+   * This can only be done by the logged in user.
+   * @param body Created user object
+   */
+  public void createUser(User body) throws ApiException {
+    Call call = createUserCall(body);
+    apiClient.execute(call);
+  }
+
+  /**
+   * Create user (asynchronously)
+   * This can only be done by the logged in user.
+   * @param body Created user object
+   * @param callback The callback to be executed when the API call finishes
+   * @return The request call
+   */
+  public Call createUserAsync(User body, ApiCallback<Void> callback) throws ApiException {
+    Call call = createUserCall(body);
+    apiClient.executeAsync(call, callback);
+    return call;
+  }
+  
+  /* Build call for createUsersWithArrayInput */
+  private Call createUsersWithArrayInputCall(List<User> body) throws ApiException {
+    Object postBody = body;
+    
+
+    // create path and map variables
+    String path = "/user/createWithArray".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 = {
+      
+    };
+    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+    headerParams.put("Content-Type", contentType);
+
+    String[] authNames = new String[] {  };
+    return apiClient.buildCall(path, "POST", queryParams, postBody, headerParams, formParams, authNames);
+  }
+
+  /**
+   * Creates list of users with given input array
+   * 
+   * @param body List of user object
+   */
+  public void createUsersWithArrayInput(List<User> body) throws ApiException {
+    Call call = createUsersWithArrayInputCall(body);
+    apiClient.execute(call);
+  }
+
+  /**
+   * Creates list of users with given input array (asynchronously)
+   * 
+   * @param body List of user object
+   * @param callback The callback to be executed when the API call finishes
+   * @return The request call
+   */
+  public Call createUsersWithArrayInputAsync(List<User> body, ApiCallback<Void> callback) throws ApiException {
+    Call call = createUsersWithArrayInputCall(body);
+    apiClient.executeAsync(call, callback);
+    return call;
+  }
+  
+  /* Build call for createUsersWithListInput */
+  private Call createUsersWithListInputCall(List<User> body) throws ApiException {
+    Object postBody = body;
+    
+
+    // create path and map variables
+    String path = "/user/createWithList".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 = {
+      
+    };
+    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+    headerParams.put("Content-Type", contentType);
+
+    String[] authNames = new String[] {  };
+    return apiClient.buildCall(path, "POST", queryParams, postBody, headerParams, formParams, authNames);
+  }
+
+  /**
+   * Creates list of users with given input array
+   * 
+   * @param body List of user object
+   */
+  public void createUsersWithListInput(List<User> body) throws ApiException {
+    Call call = createUsersWithListInputCall(body);
+    apiClient.execute(call);
+  }
+
+  /**
+   * Creates list of users with given input array (asynchronously)
+   * 
+   * @param body List of user object
+   * @param callback The callback to be executed when the API call finishes
+   * @return The request call
+   */
+  public Call createUsersWithListInputAsync(List<User> body, ApiCallback<Void> callback) throws ApiException {
+    Call call = createUsersWithListInputCall(body);
+    apiClient.executeAsync(call, callback);
+    return call;
+  }
+  
+  /* Build call for loginUser */
+  private Call loginUserCall(String username, String password) throws ApiException {
+    Object postBody = null;
+    
+
+    // create path and map variables
+    String path = "/user/login".replaceAll("\\{format\\}","json");
+
+    List<Pair> queryParams = new ArrayList<Pair>();
+    if (username != null)
+      queryParams.addAll(apiClient.parameterToPairs("", "username", username));
+    if (password != null)
+      queryParams.addAll(apiClient.parameterToPairs("", "password", password));
+
+    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);
+
+    String[] authNames = new String[] {  };
+    return apiClient.buildCall(path, "GET", queryParams, postBody, headerParams, formParams, authNames);
+  }
+
+  /**
+   * 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 {
+    Call call = loginUserCall(username, password);
+    Type returnType = new TypeToken<String>(){}.getType();
+    return apiClient.execute(call, returnType);
+  }
+
+  /**
+   * Logs user into the system (asynchronously)
+   * 
+   * @param username The user name for login
+   * @param password The password for login in clear text
+   * @param callback The callback to be executed when the API call finishes
+   * @return The request call
+   */
+  public Call loginUserAsync(String username, String password, ApiCallback<String> callback) throws ApiException {
+    Call call = loginUserCall(username, password);
+    Type returnType = new TypeToken<String>(){}.getType();
+    apiClient.executeAsync(call, returnType, callback);
+    return call;
+  }
+  
+  /* Build call for logoutUser */
+  private Call logoutUserCall() throws ApiException {
+    Object postBody = null;
+    
+
+    // create path and map variables
+    String path = "/user/logout".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 = {
+      
+    };
+    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+    headerParams.put("Content-Type", contentType);
+
+    String[] authNames = new String[] {  };
+    return apiClient.buildCall(path, "GET", queryParams, postBody, headerParams, formParams, authNames);
+  }
+
+  /**
+   * Logs out current logged in user session
+   * 
+   */
+  public void logoutUser() throws ApiException {
+    Call call = logoutUserCall();
+    apiClient.execute(call);
+  }
+
+  /**
+   * Logs out current logged in user session (asynchronously)
+   * 
+   * @param callback The callback to be executed when the API call finishes
+   * @return The request call
+   */
+  public Call logoutUserAsync(ApiCallback<Void> callback) throws ApiException {
+    Call call = logoutUserCall();
+    apiClient.executeAsync(call, callback);
+    return call;
+  }
+  
+  /* Build call for getUserByName */
+  private Call getUserByNameCall(String username) 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);
+
+    String[] authNames = new String[] {  };
+    return apiClient.buildCall(path, "GET", queryParams, postBody, headerParams, formParams, authNames);
+  }
+
+  /**
+   * 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 {
+    Call call = getUserByNameCall(username);
+    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
+   */
+  public Call getUserByNameAsync(String username, ApiCallback<User> callback) throws ApiException {
+    Call call = getUserByNameCall(username);
+    Type returnType = new TypeToken<User>(){}.getType();
+    apiClient.executeAsync(call, returnType, callback);
+    return call;
+  }
+  
+  /* Build call for updateUser */
+  private Call updateUserCall(String username, User body) throws ApiException {
+    Object postBody = body;
+    
+    // verify the required parameter 'username' is set
+    if (username == null) {
+       throw new ApiException("Missing the required parameter 'username' when calling updateUser(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);
+
+    String[] authNames = new String[] {  };
+    return apiClient.buildCall(path, "PUT", queryParams, postBody, headerParams, formParams, authNames);
+  }
+
+  /**
+   * 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) throws ApiException {
+    Call call = updateUserCall(username, body);
+    apiClient.execute(call);
+  }
+
+  /**
+   * 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 callback The callback to be executed when the API call finishes
+   * @return The request call
+   */
+  public Call updateUserAsync(String username, User body, ApiCallback<Void> callback) throws ApiException {
+    Call call = updateUserCall(username, body);
+    apiClient.executeAsync(call, callback);
+    return call;
+  }
+  
+  /* Build call for deleteUser */
+  private Call deleteUserCall(String username) 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);
+
+    String[] authNames = new String[] {  };
+    return apiClient.buildCall(path, "DELETE", queryParams, postBody, headerParams, formParams, authNames);
+  }
+
+  /**
+   * Delete user
+   * This can only be done by the logged in user.
+   * @param username The name that needs to be deleted
+   */
+  public void deleteUser(String username) throws ApiException {
+    Call call = deleteUserCall(username);
+    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
+   */
+  public Call deleteUserAsync(String username, ApiCallback<Void> callback) throws ApiException {
+    Call call = deleteUserCall(username);
+    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
new file mode 100644
index 00000000000..20ebbf17e74
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
@@ -0,0 +1,59 @@
+package io.swagger.client.auth;
+
+import io.swagger.client.Pair;
+
+import java.util.Map;
+import java.util.List;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-31T19:27:38.337+08:00")
+public class ApiKeyAuth implements Authentication {
+  private final String location;
+  private final String paramName;
+
+  private String apiKey;
+  private String apiKeyPrefix;
+
+  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;
+  }
+
+  public String getApiKeyPrefix() {
+    return apiKeyPrefix;
+  }
+
+  public void setApiKeyPrefix(String apiKeyPrefix) {
+    this.apiKeyPrefix = apiKeyPrefix;
+  }
+
+  @Override
+  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams) {
+    String value;
+    if (apiKeyPrefix != null) {
+      value = apiKeyPrefix + " " + apiKey;
+    } else {
+      value = apiKey;
+    }
+    if (location == "query") {
+      queryParams.add(new Pair(paramName, value));
+    } else if (location == "header") {
+      headerParams.put(paramName, value);
+    }
+  }
+}
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/Authentication.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/Authentication.java
new file mode 100644
index 00000000000..9197d04b1b7
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/Authentication.java
@@ -0,0 +1,12 @@
+package io.swagger.client.auth;
+
+import io.swagger.client.Pair;
+
+import java.util.Map;
+import java.util.List;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-31T19:27:38.337+08:00")
+public interface Authentication {
+  /** Apply authentication settings to header and query params. */
+  void applyToParams(List<Pair> queryParams, Map<String, String> headerParams);
+}
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
new file mode 100644
index 00000000000..d2b56433169
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
@@ -0,0 +1,41 @@
+package io.swagger.client.auth;
+
+import io.swagger.client.Pair;
+
+import com.migcomponents.migbase64.Base64;
+
+import java.util.Map;
+import java.util.List;
+
+import java.io.UnsupportedEncodingException;
+
+public class HttpBasicAuth implements Authentication {
+  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;
+  }
+
+  @Override
+  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams) {
+    String str = (username == null ? "" : username) + ":" + (password == null ? "" : password);
+    try {
+      headerParams.put("Authorization", "Basic " + Base64.encodeToString(str.getBytes("UTF-8"), false));
+    } catch (UnsupportedEncodingException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
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
new file mode 100644
index 00000000000..184b9e82ca7
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java
@@ -0,0 +1,14 @@
+package io.swagger.client.auth;
+
+import io.swagger.client.Pair;
+
+import java.util.Map;
+import java.util.List;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-31T19:27:38.337+08:00")
+public class OAuth implements Authentication {
+  @Override
+  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams) {
+    // TODO: support oauth
+  }
+}
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
new file mode 100644
index 00000000000..0a7023ac7a5
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Category.java
@@ -0,0 +1,57 @@
+package io.swagger.client.model;
+
+import io.swagger.client.StringUtil;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+import io.swagger.annotations.*;
+
+
+
+@ApiModel(description = "")
+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 String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Category {\n");
+    
+    sb.append("    id: ").append(StringUtil.toIndentedString(id)).append("\n");
+    sb.append("    name: ").append(StringUtil.toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+}
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
new file mode 100644
index 00000000000..df8e77b6fb3
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Order.java
@@ -0,0 +1,142 @@
+package io.swagger.client.model;
+
+import io.swagger.client.StringUtil;
+import java.util.Date;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+import io.swagger.annotations.*;
+
+
+
+@ApiModel(description = "")
+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;
+  }
+  public void setId(Long id) {
+    this.id = 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 String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Order {\n");
+    
+    sb.append("    id: ").append(StringUtil.toIndentedString(id)).append("\n");
+    sb.append("    petId: ").append(StringUtil.toIndentedString(petId)).append("\n");
+    sb.append("    quantity: ").append(StringUtil.toIndentedString(quantity)).append("\n");
+    sb.append("    shipDate: ").append(StringUtil.toIndentedString(shipDate)).append("\n");
+    sb.append("    status: ").append(StringUtil.toIndentedString(status)).append("\n");
+    sb.append("    complete: ").append(StringUtil.toIndentedString(complete)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+}
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
new file mode 100644
index 00000000000..9ab5457e26a
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Pet.java
@@ -0,0 +1,144 @@
+package io.swagger.client.model;
+
+import io.swagger.client.StringUtil;
+import io.swagger.client.model.Category;
+import java.util.*;
+import io.swagger.client.model.Tag;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+import io.swagger.annotations.*;
+
+
+
+@ApiModel(description = "")
+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 String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Pet {\n");
+    
+    sb.append("    id: ").append(StringUtil.toIndentedString(id)).append("\n");
+    sb.append("    category: ").append(StringUtil.toIndentedString(category)).append("\n");
+    sb.append("    name: ").append(StringUtil.toIndentedString(name)).append("\n");
+    sb.append("    photoUrls: ").append(StringUtil.toIndentedString(photoUrls)).append("\n");
+    sb.append("    tags: ").append(StringUtil.toIndentedString(tags)).append("\n");
+    sb.append("    status: ").append(StringUtil.toIndentedString(status)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+}
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
new file mode 100644
index 00000000000..9935b744f2d
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Tag.java
@@ -0,0 +1,57 @@
+package io.swagger.client.model;
+
+import io.swagger.client.StringUtil;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+import io.swagger.annotations.*;
+
+
+
+@ApiModel(description = "")
+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 String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Tag {\n");
+    
+    sb.append("    id: ").append(StringUtil.toIndentedString(id)).append("\n");
+    sb.append("    name: ").append(StringUtil.toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+}
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
new file mode 100644
index 00000000000..cba6abef8dd
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/User.java
@@ -0,0 +1,148 @@
+package io.swagger.client.model;
+
+import io.swagger.client.StringUtil;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+import io.swagger.annotations.*;
+
+
+
+@ApiModel(description = "")
+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 String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class User {\n");
+    
+    sb.append("    id: ").append(StringUtil.toIndentedString(id)).append("\n");
+    sb.append("    username: ").append(StringUtil.toIndentedString(username)).append("\n");
+    sb.append("    firstName: ").append(StringUtil.toIndentedString(firstName)).append("\n");
+    sb.append("    lastName: ").append(StringUtil.toIndentedString(lastName)).append("\n");
+    sb.append("    email: ").append(StringUtil.toIndentedString(email)).append("\n");
+    sb.append("    password: ").append(StringUtil.toIndentedString(password)).append("\n");
+    sb.append("    phone: ").append(StringUtil.toIndentedString(phone)).append("\n");
+    sb.append("    userStatus: ").append(StringUtil.toIndentedString(userStatus)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+}
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
new file mode 100644
index 00000000000..802c0cae3b9
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/ApiClientTest.java
@@ -0,0 +1,193 @@
+package io.swagger.client;
+
+import io.swagger.client.auth.*;
+
+import java.util.*;
+
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class ApiClientTest {
+    ApiClient apiClient = null;
+
+    @Before
+    public void setup() {
+        apiClient = new ApiClient();
+    }
+
+    @Test
+    public void testSelectHeaderAccept() {
+        String[] accepts = {"APPLICATION/JSON", "APPLICATION/XML"};
+        assertEquals("application/json", apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{"application/json", "application/xml"};
+        assertEquals("application/json", apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{"application/xml", "application/json"};
+        assertEquals("application/json", apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{"text/plain", "application/xml"};
+        assertEquals("text/plain,application/xml", apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{};
+        assertNull(apiClient.selectHeaderAccept(accepts));
+    }
+
+    @Test
+    public void testSelectHeaderContentType() {
+        String[] contentTypes = {"APPLICATION/JSON", "APPLICATION/XML"};
+        assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{"application/json", "application/xml"};
+        assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{"application/xml", "application/json"};
+        assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{"text/plain", "application/xml"};
+        assertEquals("text/plain", apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{};
+        assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes));
+    }
+
+    @Test
+    public void testGetAuthentications() {
+        Map<String, Authentication> auths = apiClient.getAuthentications();
+
+        Authentication auth = auths.get("api_key");
+        assertNotNull(auth);
+        assertTrue(auth instanceof ApiKeyAuth);
+        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) auth;
+        assertEquals("header", apiKeyAuth.getLocation());
+        assertEquals("api_key", apiKeyAuth.getParamName());
+
+        auth = auths.get("petstore_auth");
+        assertTrue(auth instanceof OAuth);
+        assertSame(auth, apiClient.getAuthentication("petstore_auth"));
+
+        assertNull(auths.get("unknown"));
+
+        try {
+            auths.put("my_auth", new HttpBasicAuth());
+            fail("the authentications returned should not be modifiable");
+        } catch (UnsupportedOperationException e) {
+        }
+    }
+
+    @Test
+    public void testSetUsername() {
+        try {
+            apiClient.setUsername("my-username");
+            fail("there should be no HTTP basic authentications");
+        } catch (RuntimeException e) {
+        }
+    }
+
+    @Test
+    public void testSetPassword() {
+        try {
+            apiClient.setPassword("my-password");
+            fail("there should be no HTTP basic authentications");
+        } catch (RuntimeException e) {
+        }
+    }
+
+    @Test
+    public void testSetApiKeyAndPrefix() {
+        ApiKeyAuth auth = (ApiKeyAuth) apiClient.getAuthentications().get("api_key");
+        auth.setApiKey(null);
+        auth.setApiKeyPrefix(null);
+
+        apiClient.setApiKey("my-api-key");
+        apiClient.setApiKeyPrefix("Token");
+        assertEquals("my-api-key", auth.getApiKey());
+        assertEquals("Token", auth.getApiKeyPrefix());
+
+        // reset values
+        auth.setApiKey(null);
+        auth.setApiKeyPrefix(null);
+    }
+
+    @Test
+    public void testParameterToPairsWhenNameIsInvalid() throws Exception {
+        List<Pair> pairs_a = apiClient.parameterToPairs("csv", null, new Integer(1));
+        List<Pair> pairs_b = apiClient.parameterToPairs("csv", "", new Integer(1));
+
+        assertTrue(pairs_a.isEmpty());
+        assertTrue(pairs_b.isEmpty());
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsNull() throws Exception {
+        List<Pair> pairs = apiClient.parameterToPairs("csv", "param-a", null);
+
+        assertTrue(pairs.isEmpty());
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsEmptyStrings() throws Exception {
+
+        // single empty string
+        List<Pair> pairs = apiClient.parameterToPairs("csv", "param-a", " ");
+        assertEquals(1, pairs.size());
+
+        // list of empty strings
+        List<String> strs = new ArrayList<String>();
+        strs.add(" ");
+        strs.add(" ");
+        strs.add(" ");
+
+        List<Pair> concatStrings = apiClient.parameterToPairs("csv", "param-a", strs);
+
+        assertEquals(1, concatStrings.size());
+        assertFalse(concatStrings.get(0).getValue().isEmpty()); // should contain some delimiters
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsNotCollection() throws Exception {
+        String name = "param-a";
+        Integer value = 1;
+
+        List<Pair> pairs = apiClient.parameterToPairs("csv", name, value);
+
+        assertEquals(1, pairs.size());
+        assertEquals(value, Integer.valueOf(pairs.get(0).getValue()));
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsCollection() throws Exception {
+        Map<String, String> collectionFormatMap = new HashMap<String, String>();
+        collectionFormatMap.put("csv", ",");
+        collectionFormatMap.put("tsv", "\t");
+        collectionFormatMap.put("ssv", " ");
+        collectionFormatMap.put("pipes", "\\|");
+        collectionFormatMap.put("", ","); // no format, must default to csv
+        collectionFormatMap.put("unknown", ","); // all other formats, must default to csv
+
+        String name = "param-a";
+
+        List<Object> values = new ArrayList<Object>();
+        values.add("value-a");
+        values.add(123);
+        values.add(new Date());
+
+        // check for multi separately
+        List<Pair> multiPairs = apiClient.parameterToPairs("multi", name, values);
+        assertEquals(values.size(), multiPairs.size());
+
+        // all other formats
+        for (String collectionFormat : collectionFormatMap.keySet()) {
+            List<Pair> pairs = apiClient.parameterToPairs(collectionFormat, name, values);
+
+            assertEquals(1, pairs.size());
+
+            String delimiter = collectionFormatMap.get(collectionFormat);
+            String[] pairValueSplit = pairs.get(0).getValue().split(delimiter);
+
+            // must equal input values
+            assertEquals(values.size(), pairValueSplit.length);
+        }
+    }
+}
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/ConfigurationTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/ConfigurationTest.java
new file mode 100644
index 00000000000..b95eb74605e
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/ConfigurationTest.java
@@ -0,0 +1,15 @@
+package io.swagger.client;
+
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class ConfigurationTest {
+    @Test
+    public void testDefaultApiClient() {
+        ApiClient apiClient = Configuration.getDefaultApiClient();
+        assertNotNull(apiClient);
+        assertEquals("http://petstore.swagger.io/v2", apiClient.getBasePath());
+        assertFalse(apiClient.isDebugging());
+    }
+}
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/StringUtilTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/StringUtilTest.java
new file mode 100644
index 00000000000..4b03c7a9812
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/StringUtilTest.java
@@ -0,0 +1,33 @@
+package io.swagger.client;
+
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class StringUtilTest {
+    @Test
+    public void testContainsIgnoreCase() {
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{"abc"}, "abc"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{"abc"}, "ABC"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{"ABC"}, "abc"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{null, "abc"}, "ABC"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{null, "abc"}, null));
+
+        assertFalse(StringUtil.containsIgnoreCase(new String[]{"abc"}, "def"));
+        assertFalse(StringUtil.containsIgnoreCase(new String[]{}, "ABC"));
+        assertFalse(StringUtil.containsIgnoreCase(new String[]{}, null));
+    }
+
+    @Test
+    public void testJoin() {
+        String[] array = {"aa", "bb", "cc"};
+        assertEquals("aa,bb,cc", StringUtil.join(array, ","));
+        assertEquals("aa, bb, cc", StringUtil.join(array, ", "));
+        assertEquals("aabbcc", StringUtil.join(array, ""));
+        assertEquals("aa bb cc", StringUtil.join(array, " "));
+        assertEquals("aa\nbb\ncc", StringUtil.join(array, "\n"));
+
+        assertEquals("", StringUtil.join(new String[]{}, ","));
+        assertEquals("abc", StringUtil.join(new String[]{"abc"}, ","));
+    }
+}
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/auth/ApiKeyAuthTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/auth/ApiKeyAuthTest.java
new file mode 100644
index 00000000000..5bdb4fb78fb
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/auth/ApiKeyAuthTest.java
@@ -0,0 +1,47 @@
+package io.swagger.client.auth;
+
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.List;
+
+import io.swagger.client.Pair;
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class ApiKeyAuthTest {
+    @Test
+    public void testApplyToParamsInQuery() {
+        List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+
+        ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
+        auth.setApiKey("my-api-key");
+        auth.applyToParams(queryParams, headerParams);
+
+        assertEquals(1, queryParams.size());
+        for (Pair queryParam : queryParams) {
+            assertEquals("my-api-key", queryParam.getValue());
+        }
+
+        // no changes to header parameters
+        assertEquals(0, headerParams.size());
+    }
+
+    @Test
+    public void testApplyToParamsInHeaderWithPrefix() {
+            List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+
+        ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
+        auth.setApiKey("my-api-token");
+        auth.setApiKeyPrefix("Token");
+        auth.applyToParams(queryParams, headerParams);
+
+        // no changes to query parameters
+        assertEquals(0, queryParams.size());
+        assertEquals(1, headerParams.size());
+        assertEquals("Token my-api-token", headerParams.get("X-API-TOKEN"));
+    }
+}
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/auth/HttpBasicAuthTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/auth/HttpBasicAuthTest.java
new file mode 100644
index 00000000000..52c5497ba83
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/auth/HttpBasicAuthTest.java
@@ -0,0 +1,52 @@
+package io.swagger.client.auth;
+
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.List;
+
+import io.swagger.client.Pair;
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class HttpBasicAuthTest {
+    HttpBasicAuth auth = null;
+
+    @Before
+    public void setup() {
+        auth = new HttpBasicAuth();
+    }
+
+    @Test
+    public void testApplyToParams() {
+        List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+
+        auth.setUsername("my-username");
+        auth.setPassword("my-password");
+        auth.applyToParams(queryParams, headerParams);
+
+        // no changes to query parameters
+        assertEquals(0, queryParams.size());
+        assertEquals(1, headerParams.size());
+        // the string below is base64-encoded result of "my-username:my-password" with the "Basic " prefix
+        String expected = "Basic bXktdXNlcm5hbWU6bXktcGFzc3dvcmQ=";
+        assertEquals(expected, headerParams.get("Authorization"));
+
+        // null username should be treated as empty string
+        auth.setUsername(null);
+        auth.applyToParams(queryParams, headerParams);
+        // the string below is base64-encoded result of ":my-password" with the "Basic " prefix
+        expected = "Basic Om15LXBhc3N3b3Jk";
+        assertEquals(expected, headerParams.get("Authorization"));
+
+        // null password should be treated as empty string
+        auth.setUsername("my-username");
+        auth.setPassword(null);
+        auth.applyToParams(queryParams, headerParams);
+        // the string below is base64-encoded result of "my-username:" with the "Basic " prefix
+        expected = "Basic bXktdXNlcm5hbWU6";
+        assertEquals(expected, headerParams.get("Authorization"));
+    }
+}
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
new file mode 100644
index 00000000000..0a8f8a1665d
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/PetApiTest.java
@@ -0,0 +1,192 @@
+package io.swagger.petstore.test;
+
+import io.swagger.client.ApiClient;
+import io.swagger.client.ApiException;
+import io.swagger.client.Configuration;
+
+import io.swagger.client.api.*;
+import io.swagger.client.auth.*;
+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 static org.junit.Assert.*;
+
+public class PetApiTest {
+    PetApi api = null;
+
+    @Before
+    public void setup() {
+        api = new PetApi();
+        // setup authentication
+        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
+        apiKeyAuth.setApiKey("special-key");
+    }
+
+    @Test
+    public void testApiClient() {
+        // the default api client is used
+        assertEquals(Configuration.getDefaultApiClient(), api.getApiClient());
+        assertNotNull(api.getApiClient());
+        assertEquals("http://petstore.swagger.io/v2", api.getApiClient().getBasePath());
+        assertFalse(api.getApiClient().isDebugging());
+
+        ApiClient oldClient = api.getApiClient();
+
+        ApiClient newClient = new ApiClient();
+        newClient.setBasePath("http://example.com");
+        newClient.setDebugging(true);
+
+        // set api client via constructor
+        api = new PetApi(newClient);
+        assertNotNull(api.getApiClient());
+        assertEquals("http://example.com", api.getApiClient().getBasePath());
+        assertTrue(api.getApiClient().isDebugging());
+
+        // set api client via setter method
+        api.setApiClient(oldClient);
+        assertNotNull(api.getApiClient());
+        assertEquals("http://petstore.swagger.io/v2", api.getApiClient().getBasePath());
+        assertFalse(api.getApiClient().isDebugging());
+    }
+
+    @Test
+    public void testCreateAndGetPet() 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 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()));
+    }
+
+    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;
+    }
+}
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
new file mode 100644
index 00000000000..a1fd7e345a8
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/StoreApiTest.java
@@ -0,0 +1,72 @@
+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 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");
+    }
+
+    @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/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
new file mode 100644
index 00000000000..26e46bfa602
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/UserApiTest.java
@@ -0,0 +1,86 @@
+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.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/java/src/main/java/io/swagger/client/JsonUtil.java b/samples/client/petstore/java/src/main/java/io/swagger/client/JsonUtil.java
deleted file mode 100644
index 8e7e686dd0c..00000000000
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/JsonUtil.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.swagger.client;
-
-import com.fasterxml.jackson.annotation.*;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.core.JsonGenerator.Feature;
-
-import com.fasterxml.jackson.datatype.joda.*;
-
-public class JsonUtil {
-  public static ObjectMapper mapper;
-
-  static {
-  	mapper = new ObjectMapper();
-	  mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-	  mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-	  mapper.registerModule(new JodaModule());
-	}
-
-	public static ObjectMapper getJsonMapper() {
-		return mapper;
-	}
-}
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/Authentication.java b/samples/client/petstore/java/src/main/java/io/swagger/client/auth/Authentication.java
deleted file mode 100644
index 3f372404c8d..00000000000
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/Authentication.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.swagger.client.auth;
-
-import java.util.Map;
-
-public interface Authentication {
-  /** Apply authentication settings to header and query params. */
-  void applyToParams(Map<String, String> queryParams, Map<String, String> headerParams);
-}
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/src/main/java/io/swagger/client/auth/OAuth.java
deleted file mode 100644
index d834f4580c2..00000000000
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/OAuth.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package io.swagger.client.auth;
-
-import java.util.Map;
-
-public class OAuth implements Authentication {
-  @Override
-  public void applyToParams(Map<String, String> queryParams, Map<String, String> headerParams) {
-    // TODO: support oauth
-  }
-}
diff --git a/samples/client/petstore/objc/PetstoreClient.xcworkspace/contents.xcworkspacedata b/samples/client/petstore/objc/PetstoreClient.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 4ea15119171..00000000000
--- a/samples/client/petstore/objc/PetstoreClient.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "group:PetstoreClient/PetstoreClient.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "group:Pods/Pods.xcodeproj">
-   </FileRef>
-</Workspace>
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/project.pbxproj
deleted file mode 100644
index 5c1bfabf608..00000000000
--- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,674 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 46;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		BA525648922D4C0E9F44D4F1 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73DA4F1067C343C3962F1542 /* libPods.a */; };
-		CF0560EB1B1855CF00C0D4EC /* SWGConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = CF0560EA1B1855CF00C0D4EC /* SWGConfiguration.m */; };
-		CF31D0991B105E4B00509935 /* SWGApiClientTest.m in Sources */ = {isa = PBXBuildFile; fileRef = CF31D0981B105E4B00509935 /* SWGApiClientTest.m */; };
-		CFD1B6701B05EC7D00DCCD51 /* JSONValueTransformer+ISO8601.m in Sources */ = {isa = PBXBuildFile; fileRef = CFD1B66F1B05EC7D00DCCD51 /* JSONValueTransformer+ISO8601.m */; };
-		CFD1B6711B05EC7D00DCCD51 /* JSONValueTransformer+ISO8601.m in Sources */ = {isa = PBXBuildFile; fileRef = CFD1B66F1B05EC7D00DCCD51 /* JSONValueTransformer+ISO8601.m */; };
-		EA66999A1811D2FA00A70D03 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA6699991811D2FA00A70D03 /* Foundation.framework */; };
-		EA66999C1811D2FA00A70D03 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA66999B1811D2FA00A70D03 /* CoreGraphics.framework */; };
-		EA66999E1811D2FA00A70D03 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA66999D1811D2FA00A70D03 /* UIKit.framework */; };
-		EA6699A41811D2FA00A70D03 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = EA6699A21811D2FA00A70D03 /* InfoPlist.strings */; };
-		EA6699A61811D2FA00A70D03 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = EA6699A51811D2FA00A70D03 /* main.m */; };
-		EA6699AA1811D2FA00A70D03 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = EA6699A91811D2FA00A70D03 /* AppDelegate.m */; };
-		EA6699AD1811D2FA00A70D03 /* Main_iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EA6699AB1811D2FA00A70D03 /* Main_iPhone.storyboard */; };
-		EA6699B01811D2FA00A70D03 /* Main_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EA6699AE1811D2FA00A70D03 /* Main_iPad.storyboard */; };
-		EA6699B31811D2FA00A70D03 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = EA6699B21811D2FA00A70D03 /* ViewController.m */; };
-		EA6699B51811D2FA00A70D03 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EA6699B41811D2FA00A70D03 /* Images.xcassets */; };
-		EA6699BD1811D2FB00A70D03 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA6699991811D2FA00A70D03 /* Foundation.framework */; };
-		EA6699BE1811D2FB00A70D03 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA66999D1811D2FA00A70D03 /* UIKit.framework */; };
-		EA6699C61811D2FB00A70D03 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = EA6699C41811D2FB00A70D03 /* InfoPlist.strings */; };
-		EA8B8AA41AC6683700638FBB /* SWGQueryParamCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = EA8B8AA31AC6683700638FBB /* SWGQueryParamCollection.m */; };
-		EA8CD3ED1AC2763600C47D0B /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA8CD3EC1AC2763600C47D0B /* SenTestingKit.framework */; };
-		EAB26B091AC8DE24002F5C7A /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EAB26B081AC8DE24002F5C7A /* libPods.a */; };
-		EAB26B0C1AC8DF78002F5C7A /* PetApiTest.h in Sources */ = {isa = PBXBuildFile; fileRef = EA8CD3EB1AC274BE00C47D0B /* PetApiTest.h */; };
-		EAB26B0D1AC8DF78002F5C7A /* PetApiTest.m in Sources */ = {isa = PBXBuildFile; fileRef = EA6699C71811D2FB00A70D03 /* PetApiTest.m */; };
-		EAEA85E41811D3AE00F06E69 /* SWGApiClient.m in Sources */ = {isa = PBXBuildFile; fileRef = EAEA85CD1811D3AE00F06E69 /* SWGApiClient.m */; };
-		EAEA85E51811D3AE00F06E69 /* SWGCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = EAEA85CF1811D3AE00F06E69 /* SWGCategory.m */; };
-		EAEA85E71811D3AE00F06E69 /* SWGFile.m in Sources */ = {isa = PBXBuildFile; fileRef = EAEA85D31811D3AE00F06E69 /* SWGFile.m */; };
-		EAEA85E81811D3AE00F06E69 /* SWGObject.m in Sources */ = {isa = PBXBuildFile; fileRef = EAEA85D51811D3AE00F06E69 /* SWGObject.m */; };
-		EAEA85E91811D3AE00F06E69 /* SWGOrder.m in Sources */ = {isa = PBXBuildFile; fileRef = EAEA85D71811D3AE00F06E69 /* SWGOrder.m */; };
-		EAEA85EA1811D3AE00F06E69 /* SWGPet.m in Sources */ = {isa = PBXBuildFile; fileRef = EAEA85D91811D3AE00F06E69 /* SWGPet.m */; };
-		EAEA85EB1811D3AE00F06E69 /* SWGPetApi.m in Sources */ = {isa = PBXBuildFile; fileRef = EAEA85DB1811D3AE00F06E69 /* SWGPetApi.m */; };
-		EAEA85EC1811D3AE00F06E69 /* SWGStoreApi.m in Sources */ = {isa = PBXBuildFile; fileRef = EAEA85DD1811D3AE00F06E69 /* SWGStoreApi.m */; };
-		EAEA85ED1811D3AE00F06E69 /* SWGTag.m in Sources */ = {isa = PBXBuildFile; fileRef = EAEA85DF1811D3AE00F06E69 /* SWGTag.m */; };
-		EAEA85EE1811D3AE00F06E69 /* SWGUser.m in Sources */ = {isa = PBXBuildFile; fileRef = EAEA85E11811D3AE00F06E69 /* SWGUser.m */; };
-		EAEA85EF1811D3AE00F06E69 /* SWGUserApi.m in Sources */ = {isa = PBXBuildFile; fileRef = EAEA85E31811D3AE00F06E69 /* SWGUserApi.m */; };
-		EAFBEABB1A925B8500A27431 /* test-1.png in Resources */ = {isa = PBXBuildFile; fileRef = EAFBEABA1A925B8500A27431 /* test-1.png */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		EA6699BF1811D2FB00A70D03 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = EA66998E1811D2FA00A70D03 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = EA6699951811D2FA00A70D03;
-			remoteInfo = PetstoreClient;
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXFileReference section */
-		73DA4F1067C343C3962F1542 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		A425648B5C0A4849C7668069 /* 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>"; };
-		CF0560E91B1855CF00C0D4EC /* SWGConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGConfiguration.h; sourceTree = "<group>"; };
-		CF0560EA1B1855CF00C0D4EC /* SWGConfiguration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGConfiguration.m; sourceTree = "<group>"; };
-		CF31D0981B105E4B00509935 /* SWGApiClientTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGApiClientTest.m; sourceTree = "<group>"; };
-		CFD1B66E1B05EC7D00DCCD51 /* JSONValueTransformer+ISO8601.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "JSONValueTransformer+ISO8601.h"; sourceTree = "<group>"; };
-		CFD1B66F1B05EC7D00DCCD51 /* JSONValueTransformer+ISO8601.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "JSONValueTransformer+ISO8601.m"; sourceTree = "<group>"; };
-		E2B6DA00BE52336E23783686 /* 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>"; };
-		EA6699961811D2FA00A70D03 /* PetstoreClient.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PetstoreClient.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		EA6699991811D2FA00A70D03 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		EA66999B1811D2FA00A70D03 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
-		EA66999D1811D2FA00A70D03 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
-		EA6699A11811D2FA00A70D03 /* PetstoreClient-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PetstoreClient-Info.plist"; sourceTree = "<group>"; };
-		EA6699A31811D2FA00A70D03 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		EA6699A51811D2FA00A70D03 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-		EA6699A71811D2FA00A70D03 /* PetstoreClient-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-Prefix.pch"; sourceTree = "<group>"; };
-		EA6699A81811D2FA00A70D03 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
-		EA6699A91811D2FA00A70D03 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-		EA6699AC1811D2FA00A70D03 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main_iPhone.storyboard; sourceTree = "<group>"; };
-		EA6699AF1811D2FA00A70D03 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main_iPad.storyboard; sourceTree = "<group>"; };
-		EA6699B11811D2FA00A70D03 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
-		EA6699B21811D2FA00A70D03 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
-		EA6699B41811D2FA00A70D03 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
-		EA6699BA1811D2FB00A70D03 /* PetstoreClientTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PetstoreClientTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		EA6699C31811D2FB00A70D03 /* PetstoreClientTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PetstoreClientTests-Info.plist"; sourceTree = "<group>"; };
-		EA6699C51811D2FB00A70D03 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		EA6699C71811D2FB00A70D03 /* PetApiTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PetApiTest.m; sourceTree = "<group>"; };
-		EA8B8AA21AC6683700638FBB /* SWGQueryParamCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGQueryParamCollection.h; sourceTree = "<group>"; };
-		EA8B8AA31AC6683700638FBB /* SWGQueryParamCollection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGQueryParamCollection.m; sourceTree = "<group>"; };
-		EA8CD3EB1AC274BE00C47D0B /* PetApiTest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PetApiTest.h; sourceTree = "<group>"; };
-		EA8CD3EC1AC2763600C47D0B /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
-		EAB26B081AC8DE24002F5C7A /* libPods.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libPods.a; path = "/Users/tony/dev/projects/swagger-api/swagger-codegen/samples/client/petstore/objc/Pods/../build/Debug-iphoneos/libPods.a"; sourceTree = "<absolute>"; };
-		EAB26B0E1AC8E692002F5C7A /* SWGPet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGPet.h; sourceTree = "<group>"; };
-		EAEA85CC1811D3AE00F06E69 /* SWGApiClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGApiClient.h; sourceTree = "<group>"; };
-		EAEA85CD1811D3AE00F06E69 /* SWGApiClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGApiClient.m; sourceTree = "<group>"; };
-		EAEA85CE1811D3AE00F06E69 /* SWGCategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGCategory.h; sourceTree = "<group>"; };
-		EAEA85CF1811D3AE00F06E69 /* SWGCategory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGCategory.m; sourceTree = "<group>"; };
-		EAEA85D21811D3AE00F06E69 /* SWGFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGFile.h; sourceTree = "<group>"; };
-		EAEA85D31811D3AE00F06E69 /* SWGFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGFile.m; sourceTree = "<group>"; };
-		EAEA85D41811D3AE00F06E69 /* SWGObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGObject.h; sourceTree = "<group>"; };
-		EAEA85D51811D3AE00F06E69 /* SWGObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGObject.m; sourceTree = "<group>"; };
-		EAEA85D61811D3AE00F06E69 /* SWGOrder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGOrder.h; sourceTree = "<group>"; };
-		EAEA85D71811D3AE00F06E69 /* SWGOrder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGOrder.m; sourceTree = "<group>"; };
-		EAEA85D91811D3AE00F06E69 /* SWGPet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGPet.m; sourceTree = "<group>"; };
-		EAEA85DA1811D3AE00F06E69 /* SWGPetApi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGPetApi.h; sourceTree = "<group>"; };
-		EAEA85DB1811D3AE00F06E69 /* SWGPetApi.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGPetApi.m; sourceTree = "<group>"; };
-		EAEA85DC1811D3AE00F06E69 /* SWGStoreApi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGStoreApi.h; sourceTree = "<group>"; };
-		EAEA85DD1811D3AE00F06E69 /* SWGStoreApi.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGStoreApi.m; sourceTree = "<group>"; };
-		EAEA85DE1811D3AE00F06E69 /* SWGTag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGTag.h; sourceTree = "<group>"; };
-		EAEA85DF1811D3AE00F06E69 /* SWGTag.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGTag.m; sourceTree = "<group>"; };
-		EAEA85E01811D3AE00F06E69 /* SWGUser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGUser.h; sourceTree = "<group>"; };
-		EAEA85E11811D3AE00F06E69 /* SWGUser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGUser.m; sourceTree = "<group>"; };
-		EAEA85E21811D3AE00F06E69 /* SWGUserApi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGUserApi.h; sourceTree = "<group>"; };
-		EAEA85E31811D3AE00F06E69 /* SWGUserApi.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGUserApi.m; sourceTree = "<group>"; };
-		EAFBEABA1A925B8500A27431 /* test-1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "test-1.png"; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		EA6699931811D2FA00A70D03 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				EA66999C1811D2FA00A70D03 /* CoreGraphics.framework in Frameworks */,
-				EA66999E1811D2FA00A70D03 /* UIKit.framework in Frameworks */,
-				EA66999A1811D2FA00A70D03 /* Foundation.framework in Frameworks */,
-				BA525648922D4C0E9F44D4F1 /* libPods.a in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		EA6699B71811D2FB00A70D03 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				EA8CD3ED1AC2763600C47D0B /* SenTestingKit.framework in Frameworks */,
-				EA6699BE1811D2FB00A70D03 /* UIKit.framework in Frameworks */,
-				EA6699BD1811D2FB00A70D03 /* Foundation.framework in Frameworks */,
-				EAB26B091AC8DE24002F5C7A /* libPods.a in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		1A15B3DE4358A178ABAEC251 /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				E2B6DA00BE52336E23783686 /* Pods.debug.xcconfig */,
-				A425648B5C0A4849C7668069 /* Pods.release.xcconfig */,
-			);
-			name = Pods;
-			sourceTree = "<group>";
-		};
-		EA66998D1811D2FA00A70D03 = {
-			isa = PBXGroup;
-			children = (
-				EAEA85CB1811D3AE00F06E69 /* client */,
-				EA66999F1811D2FA00A70D03 /* PetstoreClient */,
-				EA6699C11811D2FB00A70D03 /* PetstoreClientTests */,
-				EA6699981811D2FA00A70D03 /* Frameworks */,
-				EA6699971811D2FA00A70D03 /* Products */,
-				1A15B3DE4358A178ABAEC251 /* Pods */,
-			);
-			sourceTree = "<group>";
-		};
-		EA6699971811D2FA00A70D03 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				EA6699961811D2FA00A70D03 /* PetstoreClient.app */,
-				EA6699BA1811D2FB00A70D03 /* PetstoreClientTests.xctest */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		EA6699981811D2FA00A70D03 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				EAB26B081AC8DE24002F5C7A /* libPods.a */,
-				EA8CD3EC1AC2763600C47D0B /* SenTestingKit.framework */,
-				EA6699991811D2FA00A70D03 /* Foundation.framework */,
-				EA66999B1811D2FA00A70D03 /* CoreGraphics.framework */,
-				EA66999D1811D2FA00A70D03 /* UIKit.framework */,
-				73DA4F1067C343C3962F1542 /* libPods.a */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		EA66999F1811D2FA00A70D03 /* PetstoreClient */ = {
-			isa = PBXGroup;
-			children = (
-				EA6699A81811D2FA00A70D03 /* AppDelegate.h */,
-				EA6699A91811D2FA00A70D03 /* AppDelegate.m */,
-				EA6699AB1811D2FA00A70D03 /* Main_iPhone.storyboard */,
-				EA6699AE1811D2FA00A70D03 /* Main_iPad.storyboard */,
-				EA6699B11811D2FA00A70D03 /* ViewController.h */,
-				EA6699B21811D2FA00A70D03 /* ViewController.m */,
-				EA6699B41811D2FA00A70D03 /* Images.xcassets */,
-				EA6699A01811D2FA00A70D03 /* Supporting Files */,
-			);
-			path = PetstoreClient;
-			sourceTree = "<group>";
-		};
-		EA6699A01811D2FA00A70D03 /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				EAFBEABA1A925B8500A27431 /* test-1.png */,
-				EA6699A11811D2FA00A70D03 /* PetstoreClient-Info.plist */,
-				EA6699A21811D2FA00A70D03 /* InfoPlist.strings */,
-				EA6699A51811D2FA00A70D03 /* main.m */,
-				EA6699A71811D2FA00A70D03 /* PetstoreClient-Prefix.pch */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
-		EA6699C11811D2FB00A70D03 /* PetstoreClientTests */ = {
-			isa = PBXGroup;
-			children = (
-				EA8CD3EB1AC274BE00C47D0B /* PetApiTest.h */,
-				CF31D0981B105E4B00509935 /* SWGApiClientTest.m */,
-				EA6699C71811D2FB00A70D03 /* PetApiTest.m */,
-				EA6699C21811D2FB00A70D03 /* Supporting Files */,
-			);
-			path = PetstoreClientTests;
-			sourceTree = "<group>";
-		};
-		EA6699C21811D2FB00A70D03 /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				EA6699C31811D2FB00A70D03 /* PetstoreClientTests-Info.plist */,
-				EA6699C41811D2FB00A70D03 /* InfoPlist.strings */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
-		EAEA85CB1811D3AE00F06E69 /* client */ = {
-			isa = PBXGroup;
-			children = (
-				CFD1B66E1B05EC7D00DCCD51 /* JSONValueTransformer+ISO8601.h */,
-				CFD1B66F1B05EC7D00DCCD51 /* JSONValueTransformer+ISO8601.m */,
-				EA8B8AA21AC6683700638FBB /* SWGQueryParamCollection.h */,
-				EA8B8AA31AC6683700638FBB /* SWGQueryParamCollection.m */,
-				EAEA85CC1811D3AE00F06E69 /* SWGApiClient.h */,
-				EAEA85CD1811D3AE00F06E69 /* SWGApiClient.m */,
-				CF0560E91B1855CF00C0D4EC /* SWGConfiguration.h */,
-				CF0560EA1B1855CF00C0D4EC /* SWGConfiguration.m */,
-				EAEA85CE1811D3AE00F06E69 /* SWGCategory.h */,
-				EAEA85CF1811D3AE00F06E69 /* SWGCategory.m */,
-				EAEA85D21811D3AE00F06E69 /* SWGFile.h */,
-				EAEA85D31811D3AE00F06E69 /* SWGFile.m */,
-				EAEA85D41811D3AE00F06E69 /* SWGObject.h */,
-				EAEA85D51811D3AE00F06E69 /* SWGObject.m */,
-				EAEA85D61811D3AE00F06E69 /* SWGOrder.h */,
-				EAEA85D71811D3AE00F06E69 /* SWGOrder.m */,
-				EAB26B0E1AC8E692002F5C7A /* SWGPet.h */,
-				EAEA85D91811D3AE00F06E69 /* SWGPet.m */,
-				EAEA85DA1811D3AE00F06E69 /* SWGPetApi.h */,
-				EAEA85DB1811D3AE00F06E69 /* SWGPetApi.m */,
-				EAEA85DC1811D3AE00F06E69 /* SWGStoreApi.h */,
-				EAEA85DD1811D3AE00F06E69 /* SWGStoreApi.m */,
-				EAEA85DE1811D3AE00F06E69 /* SWGTag.h */,
-				EAEA85DF1811D3AE00F06E69 /* SWGTag.m */,
-				EAEA85E01811D3AE00F06E69 /* SWGUser.h */,
-				EAEA85E11811D3AE00F06E69 /* SWGUser.m */,
-				EAEA85E21811D3AE00F06E69 /* SWGUserApi.h */,
-				EAEA85E31811D3AE00F06E69 /* SWGUserApi.m */,
-			);
-			name = client;
-			path = ../client;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		EA6699951811D2FA00A70D03 /* PetstoreClient */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = EA6699CB1811D2FB00A70D03 /* Build configuration list for PBXNativeTarget "PetstoreClient" */;
-			buildPhases = (
-				04DAA264FD78471BBAD25173 /* Check Pods Manifest.lock */,
-				EA6699921811D2FA00A70D03 /* Sources */,
-				EA6699931811D2FA00A70D03 /* Frameworks */,
-				3692D11BB04F489DAA7C0B6A /* Copy Pods Resources */,
-				EA6699941811D2FA00A70D03 /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = PetstoreClient;
-			productName = PetstoreClient;
-			productReference = EA6699961811D2FA00A70D03 /* PetstoreClient.app */;
-			productType = "com.apple.product-type.application";
-		};
-		EA6699B91811D2FB00A70D03 /* PetstoreClientTests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = EA6699CE1811D2FB00A70D03 /* Build configuration list for PBXNativeTarget "PetstoreClientTests" */;
-			buildPhases = (
-				EA6699B61811D2FB00A70D03 /* Sources */,
-				EA6699B71811D2FB00A70D03 /* Frameworks */,
-				EA6699B81811D2FB00A70D03 /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				EA6699C01811D2FB00A70D03 /* PBXTargetDependency */,
-			);
-			name = PetstoreClientTests;
-			productName = PetstoreClientTests;
-			productReference = EA6699BA1811D2FB00A70D03 /* PetstoreClientTests.xctest */;
-			productType = "com.apple.product-type.bundle.unit-test";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		EA66998E1811D2FA00A70D03 /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastTestingUpgradeCheck = 0620;
-				LastUpgradeCheck = 0500;
-				ORGANIZATIONNAME = Reverb;
-				TargetAttributes = {
-					EA6699B91811D2FB00A70D03 = {
-						TestTargetID = EA6699951811D2FA00A70D03;
-					};
-				};
-			};
-			buildConfigurationList = EA6699911811D2FA00A70D03 /* Build configuration list for PBXProject "PetstoreClient" */;
-			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-				Base,
-			);
-			mainGroup = EA66998D1811D2FA00A70D03;
-			productRefGroup = EA6699971811D2FA00A70D03 /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				EA6699951811D2FA00A70D03 /* PetstoreClient */,
-				EA6699B91811D2FB00A70D03 /* PetstoreClientTests */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		EA6699941811D2FA00A70D03 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				EA6699B01811D2FA00A70D03 /* Main_iPad.storyboard in Resources */,
-				EA6699B51811D2FA00A70D03 /* Images.xcassets in Resources */,
-				EA6699AD1811D2FA00A70D03 /* Main_iPhone.storyboard in Resources */,
-				EAFBEABB1A925B8500A27431 /* test-1.png in Resources */,
-				EA6699A41811D2FA00A70D03 /* InfoPlist.strings in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		EA6699B81811D2FB00A70D03 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				EA6699C61811D2FB00A70D03 /* InfoPlist.strings in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
-		04DAA264FD78471BBAD25173 /* 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;
-		};
-		3692D11BB04F489DAA7C0B6A /* 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 */
-		EA6699921811D2FA00A70D03 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				EAEA85E51811D3AE00F06E69 /* SWGCategory.m in Sources */,
-				CF0560EB1B1855CF00C0D4EC /* SWGConfiguration.m in Sources */,
-				EAEA85ED1811D3AE00F06E69 /* SWGTag.m in Sources */,
-				EA6699B31811D2FA00A70D03 /* ViewController.m in Sources */,
-				EA6699AA1811D2FA00A70D03 /* AppDelegate.m in Sources */,
-				EAEA85EE1811D3AE00F06E69 /* SWGUser.m in Sources */,
-				EAEA85EF1811D3AE00F06E69 /* SWGUserApi.m in Sources */,
-				EAEA85EB1811D3AE00F06E69 /* SWGPetApi.m in Sources */,
-				EA6699A61811D2FA00A70D03 /* main.m in Sources */,
-				CFD1B6701B05EC7D00DCCD51 /* JSONValueTransformer+ISO8601.m in Sources */,
-				EAEA85EA1811D3AE00F06E69 /* SWGPet.m in Sources */,
-				EAEA85E41811D3AE00F06E69 /* SWGApiClient.m in Sources */,
-				EAEA85EC1811D3AE00F06E69 /* SWGStoreApi.m in Sources */,
-				EAEA85E91811D3AE00F06E69 /* SWGOrder.m in Sources */,
-				EAEA85E81811D3AE00F06E69 /* SWGObject.m in Sources */,
-				EA8B8AA41AC6683700638FBB /* SWGQueryParamCollection.m in Sources */,
-				EAEA85E71811D3AE00F06E69 /* SWGFile.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		EA6699B61811D2FB00A70D03 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				EAB26B0C1AC8DF78002F5C7A /* PetApiTest.h in Sources */,
-				CFD1B6711B05EC7D00DCCD51 /* JSONValueTransformer+ISO8601.m in Sources */,
-				EAB26B0D1AC8DF78002F5C7A /* PetApiTest.m in Sources */,
-				CF31D0991B105E4B00509935 /* SWGApiClientTest.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-		EA6699C01811D2FB00A70D03 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = EA6699951811D2FA00A70D03 /* PetstoreClient */;
-			targetProxy = EA6699BF1811D2FB00A70D03 /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
-/* Begin PBXVariantGroup section */
-		EA6699A21811D2FA00A70D03 /* InfoPlist.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				EA6699A31811D2FA00A70D03 /* en */,
-			);
-			name = InfoPlist.strings;
-			sourceTree = "<group>";
-		};
-		EA6699AB1811D2FA00A70D03 /* Main_iPhone.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				EA6699AC1811D2FA00A70D03 /* Base */,
-			);
-			name = Main_iPhone.storyboard;
-			sourceTree = "<group>";
-		};
-		EA6699AE1811D2FA00A70D03 /* Main_iPad.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				EA6699AF1811D2FA00A70D03 /* Base */,
-			);
-			name = Main_iPad.storyboard;
-			sourceTree = "<group>";
-		};
-		EA6699C41811D2FB00A70D03 /* InfoPlist.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				EA6699C51811D2FB00A70D03 /* en */,
-			);
-			name = InfoPlist.strings;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		EA6699C91811D2FB00A70D03 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
-				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__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				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_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Debug;
-		};
-		EA6699CA1811D2FB00A70D03 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
-				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__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = YES;
-				ENABLE_NS_ASSERTIONS = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				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;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
-				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Release;
-		};
-		EA6699CC1811D2FB00A70D03 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = E2B6DA00BE52336E23783686 /* Pods.debug.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "PetstoreClient/PetstoreClient-Prefix.pch";
-				INFOPLIST_FILE = "PetstoreClient/PetstoreClient-Info.plist";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"/Users/tony/dev/projects/swagger-api/swagger-codegen/samples/client/petstore/objc/Pods/../build/Debug-iphoneos",
-				);
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				WRAPPER_EXTENSION = app;
-			};
-			name = Debug;
-		};
-		EA6699CD1811D2FB00A70D03 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = A425648B5C0A4849C7668069 /* Pods.release.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "PetstoreClient/PetstoreClient-Prefix.pch";
-				INFOPLIST_FILE = "PetstoreClient/PetstoreClient-Info.plist";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"/Users/tony/dev/projects/swagger-api/swagger-codegen/samples/client/petstore/objc/Pods/../build/Debug-iphoneos",
-				);
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				WRAPPER_EXTENSION = app;
-			};
-			name = Release;
-		};
-		EA6699CF1811D2FB00A70D03 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = E2B6DA00BE52336E23783686 /* Pods.debug.xcconfig */;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
-				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/PetstoreClient.app/PetstoreClient";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-					"$(DEVELOPER_FRAMEWORKS_DIR)",
-				);
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "PetstoreClient/PetstoreClient-Prefix.pch";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				INFOPLIST_FILE = "PetstoreClientTests/PetstoreClientTests-Info.plist";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"/Users/tony/dev/projects/swagger-api/swagger-codegen/samples/client/petstore/objc/Pods/../build/Debug-iphoneos",
-				);
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TEST_HOST = "$(BUNDLE_LOADER)";
-				WRAPPER_EXTENSION = xctest;
-			};
-			name = Debug;
-		};
-		EA6699D01811D2FB00A70D03 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = A425648B5C0A4849C7668069 /* Pods.release.xcconfig */;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
-				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/PetstoreClient.app/PetstoreClient";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-					"$(DEVELOPER_FRAMEWORKS_DIR)",
-				);
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "PetstoreClient/PetstoreClient-Prefix.pch";
-				INFOPLIST_FILE = "PetstoreClientTests/PetstoreClientTests-Info.plist";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"/Users/tony/dev/projects/swagger-api/swagger-codegen/samples/client/petstore/objc/Pods/../build/Debug-iphoneos",
-				);
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TEST_HOST = "$(BUNDLE_LOADER)";
-				WRAPPER_EXTENSION = xctest;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		EA6699911811D2FA00A70D03 /* Build configuration list for PBXProject "PetstoreClient" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				EA6699C91811D2FB00A70D03 /* Debug */,
-				EA6699CA1811D2FB00A70D03 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		EA6699CB1811D2FB00A70D03 /* Build configuration list for PBXNativeTarget "PetstoreClient" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				EA6699CC1811D2FB00A70D03 /* Debug */,
-				EA6699CD1811D2FB00A70D03 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		EA6699CE1811D2FB00A70D03 /* Build configuration list for PBXNativeTarget "PetstoreClientTests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				EA6699CF1811D2FB00A70D03 /* Debug */,
-				EA6699D01811D2FB00A70D03 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = EA66998E1811D2FA00A70D03 /* Project object */;
-}
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/project.xcworkspace/xcshareddata/PetstoreClient.xccheckout b/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/project.xcworkspace/xcshareddata/PetstoreClient.xccheckout
deleted file mode 100644
index bbe327e168b..00000000000
--- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/project.xcworkspace/xcshareddata/PetstoreClient.xccheckout
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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>IDESourceControlProjectFavoriteDictionaryKey</key>
-	<false/>
-	<key>IDESourceControlProjectIdentifier</key>
-	<string>7A33CEA3-5D3F-4B6D-8F47-84701AB3E283</string>
-	<key>IDESourceControlProjectName</key>
-	<string>PetstoreClient</string>
-	<key>IDESourceControlProjectOriginsDictionary</key>
-	<dict>
-		<key>92840518-904D-4771-AA3D-9AF52CA48B71</key>
-		<string>ssh://github.com/wordnik/swagger-codegen.git</string>
-	</dict>
-	<key>IDESourceControlProjectPath</key>
-	<string>samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/project.xcworkspace</string>
-	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
-	<dict>
-		<key>92840518-904D-4771-AA3D-9AF52CA48B71</key>
-		<string>../../../../../../..</string>
-	</dict>
-	<key>IDESourceControlProjectURL</key>
-	<string>ssh://github.com/wordnik/swagger-codegen.git</string>
-	<key>IDESourceControlProjectVersion</key>
-	<integer>110</integer>
-	<key>IDESourceControlProjectWCCIdentifier</key>
-	<string>92840518-904D-4771-AA3D-9AF52CA48B71</string>
-	<key>IDESourceControlProjectWCConfigurations</key>
-	<array>
-		<dict>
-			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
-			<string>public.vcs.git</string>
-			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>92840518-904D-4771-AA3D-9AF52CA48B71</string>
-			<key>IDESourceControlWCCName</key>
-			<string>swagger-codegen</string>
-		</dict>
-	</array>
-</dict>
-</plist>
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/project.xcworkspace/xcuserdata/tony.xcuserdatad/UserInterfaceState.xcuserstate b/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/project.xcworkspace/xcuserdata/tony.xcuserdatad/UserInterfaceState.xcuserstate
deleted file mode 100644
index 53cb85903b2..00000000000
Binary files a/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/project.xcworkspace/xcuserdata/tony.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/xcuserdata/geekerzp.xcuserdatad/xcschemes/PetstoreClient.xcscheme b/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/xcuserdata/geekerzp.xcuserdatad/xcschemes/PetstoreClient.xcscheme
deleted file mode 100644
index 1a2a738abea..00000000000
--- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/xcuserdata/geekerzp.xcuserdatad/xcschemes/PetstoreClient.xcscheme
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0630"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "EA6699951811D2FA00A70D03"
-               BuildableName = "PetstoreClient.app"
-               BlueprintName = "PetstoreClient"
-               ReferencedContainer = "container:PetstoreClient.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "EA6699B91811D2FB00A70D03"
-               BuildableName = "PetstoreClientTests.xctest"
-               BlueprintName = "PetstoreClientTests"
-               ReferencedContainer = "container:PetstoreClient.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "EA6699B91811D2FB00A70D03"
-               BuildableName = "PetstoreClientTests.xctest"
-               BlueprintName = "PetstoreClientTests"
-               ReferencedContainer = "container:PetstoreClient.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "EA6699951811D2FA00A70D03"
-            BuildableName = "PetstoreClient.app"
-            BlueprintName = "PetstoreClient"
-            ReferencedContainer = "container:PetstoreClient.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "EA6699951811D2FA00A70D03"
-            BuildableName = "PetstoreClient.app"
-            BlueprintName = "PetstoreClient"
-            ReferencedContainer = "container:PetstoreClient.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "EA6699951811D2FA00A70D03"
-            BuildableName = "PetstoreClient.app"
-            BlueprintName = "PetstoreClient"
-            ReferencedContainer = "container:PetstoreClient.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/xcuserdata/tony.xcuserdatad/xcschemes/xcschememanagement.plist b/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/xcuserdata/tony.xcuserdatad/xcschemes/xcschememanagement.plist
deleted file mode 100644
index 163c84ef64d..00000000000
--- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/xcuserdata/tony.xcuserdatad/xcschemes/xcschememanagement.plist
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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>SchemeUserState</key>
-	<dict>
-		<key>PetstoreClient.xcscheme</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-	<key>SuppressBuildableAutocreation</key>
-	<dict>
-		<key>EA6699951811D2FA00A70D03</key>
-		<dict>
-			<key>primary</key>
-			<true/>
-		</dict>
-		<key>EA6699B91811D2FB00A70D03</key>
-		<dict>
-			<key>primary</key>
-			<true/>
-		</dict>
-	</dict>
-</dict>
-</plist>
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/AppDelegate.h b/samples/client/petstore/objc/PetstoreClient/PetstoreClient/AppDelegate.h
deleted file mode 100644
index 622ab1d3916..00000000000
--- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/AppDelegate.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-//  AppDelegate.h
-//  PetstoreClient
-//
-//  Created by Tony Tam on 10/18/13.
-//  Copyright (c) 2015 SmartBear Software. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface AppDelegate : UIResponder <UIApplicationDelegate>
-
-@property (strong, nonatomic) UIWindow *window;
-
-@end
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/Base.lproj/Main_iPad.storyboard b/samples/client/petstore/objc/PetstoreClient/PetstoreClient/Base.lproj/Main_iPad.storyboard
deleted file mode 100644
index a185e8a5dfa..00000000000
--- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/Base.lproj/Main_iPad.storyboard
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4451" systemVersion="13A461" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" initialViewController="BYZ-38-t0r">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3676"/>
-    </dependencies>
-    <scenes>
-        <!--class Prefix:identifier View Controller-->
-        <scene sceneID="tne-QT-ifu">
-            <objects>
-                <viewController id="BYZ-38-t0r" customClass="ViewController" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="20" width="768" height="1004"/>
-                        <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>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar" statusBarStyle="blackOpaque"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination"/>
-    </simulatedMetricsContainer>
-</document>
\ No newline at end of file
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/Base.lproj/Main_iPhone.storyboard b/samples/client/petstore/objc/PetstoreClient/PetstoreClient/Base.lproj/Main_iPhone.storyboard
deleted file mode 100644
index b99208bd774..00000000000
--- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/Base.lproj/Main_iPhone.storyboard
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4451" systemVersion="13A461" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="vXZ-lx-hvc">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3676"/>
-    </dependencies>
-    <scenes>
-        <!--class Prefix:identifier View Controller-->
-        <scene sceneID="ufC-wZ-h7g">
-            <objects>
-                <viewController id="vXZ-lx-hvc" customClass="ViewController" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="kh9-bI-dsS">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="x5A-6p-PRh" sceneMemberID="firstResponder"/>
-            </objects>
-        </scene>
-    </scenes>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
-</document>
\ No newline at end of file
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/Images.xcassets/AppIcon.appiconset/Contents.json b/samples/client/petstore/objc/PetstoreClient/PetstoreClient/Images.xcassets/AppIcon.appiconset/Contents.json
deleted file mode 100644
index 64224a68564..00000000000
--- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/Images.xcassets/AppIcon.appiconset/Contents.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "images": [
-    {
-      "idiom": "iphone",
-      "size": "29x29",
-      "scale": "2x"
-    },
-    {
-      "idiom": "iphone",
-      "size": "40x40",
-      "scale": "2x"
-    },
-    {
-      "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/objc/PetstoreClient/PetstoreClient/Images.xcassets/LaunchImage.launchimage/Contents.json b/samples/client/petstore/objc/PetstoreClient/PetstoreClient/Images.xcassets/LaunchImage.launchimage/Contents.json
deleted file mode 100644
index eaa3ad8a5dc..00000000000
--- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/Images.xcassets/LaunchImage.launchimage/Contents.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "images": [
-    {
-      "orientation": "portrait",
-      "idiom": "iphone",
-      "extent": "full-screen",
-      "minimum-system-version": "7.0",
-      "scale": "2x"
-    },
-    {
-      "orientation": "portrait",
-      "idiom": "iphone",
-      "subtype": "retina4",
-      "extent": "full-screen",
-      "minimum-system-version": "7.0",
-      "scale": "2x"
-    },
-    {
-      "orientation": "portrait",
-      "idiom": "ipad",
-      "extent": "full-screen",
-      "minimum-system-version": "7.0",
-      "scale": "1x"
-    },
-    {
-      "orientation": "landscape",
-      "idiom": "ipad",
-      "extent": "full-screen",
-      "minimum-system-version": "7.0",
-      "scale": "1x"
-    },
-    {
-      "orientation": "portrait",
-      "idiom": "ipad",
-      "extent": "full-screen",
-      "minimum-system-version": "7.0",
-      "scale": "2x"
-    },
-    {
-      "orientation": "landscape",
-      "idiom": "ipad",
-      "extent": "full-screen",
-      "minimum-system-version": "7.0",
-      "scale": "2x"
-    }
-  ],
-  "info": {
-    "version": 1,
-    "author": "xcode"
-  }
-}
\ No newline at end of file
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/ViewController.h b/samples/client/petstore/objc/PetstoreClient/PetstoreClient/ViewController.h
deleted file mode 100644
index f6e0cde9cd6..00000000000
--- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/ViewController.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  ViewController.h
-//  PetstoreClient
-//
-//  Created by Tony Tam on 10/18/13.
-//  Copyright (c) 2015 SmartBear Software. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface ViewController : UIViewController
-
-@end
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/ViewController.m b/samples/client/petstore/objc/PetstoreClient/PetstoreClient/ViewController.m
deleted file mode 100644
index fd15f391f49..00000000000
--- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/ViewController.m
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-//  ViewController.m
-//  PetstoreClient
-//
-//  Created by Tony Tam on 10/18/13.
-//  Copyright (c) 2015 SmartBear Software. All rights reserved.
-//
-
-#import "ViewController.h"
-#import "SWGPetApi.h"
-#import "SWGConfiguration.h"
-
-@interface ViewController ()
-
-@end
-
-@implementation ViewController
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-	// Do any additional setup after loading the view, typically from a nib.
-    
-/*
-    SWGPetApi * api = [[SWGPetApi alloc] init];
-    [api getPetByIdWithCompletionBlock:@10 completionHandler:^(SWGPet *output, NSError *error) {
-        NSLog(@"%@", [output asDictionary]);
-        [output set_id:@101];
-        [api addPetWithCompletionBlock:output completionHandler:^(NSError *error) {
-            NSLog(@"Done!");
-        }];
-
-//         load data into file
-    }];
-    NSString *filePath = [[NSBundle mainBundle] pathForResource:@"test-1" ofType:@"png"];
-    NSData *myData = [NSData dataWithContentsOfFile:filePath];
-    
-    SWGFile *file = [[SWGFile alloc] initWithNameData:@"test-2.png" mimeType:@"image/png" data:myData];
-    [api uploadFileWithCompletionBlock:@1
-                    additionalMetadata:@"some metadata"
-                                  file:file
-                     completionHandler:^(NSError *error) {
-                        if(error) {
-                          NSLog(@"%@", error);
-                        }
-                     }
-//                     completionHandler:^(SWGApiResponse *output, NSError *error) {
-//                         if(error) {
-//                             NSLog(@"%@", error);
-//                         }
-//                         else {
-//                             NSLog(@"%@", [output asDictionary]);
-//                         }
-//                     }
-     ];
-    */
-    SWGConfiguration *config = [SWGConfiguration sharedConfig];
-    config.username = @"foo";
-    config.password = @"bar";
-    SWGPetApi *api = [[SWGPetApi alloc] init];
-    [api addPetWithCompletionBlock:nil
-                 completionHandler:^(NSError *error) {
-                     
-                 }];
-}
-
-- (void)didReceiveMemoryWarning
-{
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
-}
-
-@end
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/main.m b/samples/client/petstore/objc/PetstoreClient/PetstoreClient/main.m
deleted file mode 100644
index d351099cbe1..00000000000
--- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/main.m
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-//  main.m
-//  PetstoreClient
-//
-//  Created by Tony Tam on 10/18/13.
-//  Copyright (c) 2015 SmartBear Software. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-#import "AppDelegate.h"
-
-int main(int argc, char * argv[])
-{
-    @autoreleasepool {
-        return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
-    }
-}
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/test-1.png b/samples/client/petstore/objc/PetstoreClient/PetstoreClient/test-1.png
deleted file mode 100644
index 1da243e1d23..00000000000
Binary files a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/test-1.png and /dev/null differ
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/PetApiTest.h b/samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/PetApiTest.h
deleted file mode 100644
index a9a924467d3..00000000000
--- a/samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/PetApiTest.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#import <XCTest/XCTest.h>
-#import "SWGPetApi.h"
-
-@interface PetApiTest : XCTestCase {
-@private
-    SWGPetApi * api;
-}
-
-@end
\ No newline at end of file
diff --git a/samples/client/petstore/objc/PetstoreClient/pom.xml b/samples/client/petstore/objc/PetstoreClient/pom.xml
deleted file mode 100644
index 5cb5024538c..00000000000
--- a/samples/client/petstore/objc/PetstoreClient/pom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>de.felixschulze.my-project</groupId>
-    <artifactId>PetstoreClient</artifactId>
-    <packaging>xcode</packaging>
-    <version>1.0-SNAPSHOT</version>
-    <name>Swagger Petstore Client</name>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>de.felixschulze.maven.plugins.xcode</groupId>
-                <artifactId>xcode-maven-plugin</artifactId>
-                <version>1.2</version>
-                <configuration>
-                    <xcodeProject>PetstoreClient.xcodeproj</xcodeProject>
-                    <xcodeTarget>PetstoreClient</xcodeTarget>
-                    <xcodeConfiguration>Debug</xcodeConfiguration>
-                    <xcodeSdk>iphoneos</xcodeSdk>
-                </configuration>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/samples/client/petstore/objc/Podfile b/samples/client/petstore/objc/Podfile
deleted file mode 100644
index 69e4c26ca1b..00000000000
--- a/samples/client/petstore/objc/Podfile
+++ /dev/null
@@ -1,5 +0,0 @@
-platform :ios, '6.0'
-xcodeproj 'swaggerClient/PetstoreClient.xcodeproj'
-pod 'AFNetworking', '~> 2.1'
-pod 'JSONModel', '~> 1.0'
-pod 'ISO8601'
diff --git a/samples/client/petstore/objc/Podfile.lock b/samples/client/petstore/objc/Podfile.lock
deleted file mode 100644
index ceb0fad1a42..00000000000
--- a/samples/client/petstore/objc/Podfile.lock
+++ /dev/null
@@ -1,36 +0,0 @@
-PODS:
-  - AFNetworking (2.5.4):
-    - AFNetworking/NSURLConnection
-    - AFNetworking/NSURLSession
-    - AFNetworking/Reachability
-    - AFNetworking/Security
-    - AFNetworking/Serialization
-    - AFNetworking/UIKit
-  - AFNetworking/NSURLConnection (2.5.4):
-    - AFNetworking/Reachability
-    - AFNetworking/Security
-    - AFNetworking/Serialization
-  - AFNetworking/NSURLSession (2.5.4):
-    - AFNetworking/Reachability
-    - AFNetworking/Security
-    - AFNetworking/Serialization
-  - AFNetworking/Reachability (2.5.4)
-  - AFNetworking/Security (2.5.4)
-  - AFNetworking/Serialization (2.5.4)
-  - AFNetworking/UIKit (2.5.4):
-    - AFNetworking/NSURLConnection
-    - AFNetworking/NSURLSession
-  - ISO8601 (0.3.0)
-  - JSONModel (1.1.0)
-
-DEPENDENCIES:
-  - AFNetworking (~> 2.1)
-  - ISO8601
-  - JSONModel (~> 1.0)
-
-SPEC CHECKSUMS:
-  AFNetworking: 05edc0ac4c4c8cf57bcf4b84be5b0744b6d8e71e
-  ISO8601: 8d8a22d5edf0554a1cf75bac028c76c1dc0ffaef
-  JSONModel: ec77e9865236a7a09d9cf7668df6b4b328d9ec1d
-
-COCOAPODS: 0.33.1
diff --git a/samples/client/petstore/objc/README.md b/samples/client/petstore/objc/README.md
new file mode 100644
index 00000000000..4cce2c882bb
--- /dev/null
+++ b/samples/client/petstore/objc/README.md
@@ -0,0 +1,19 @@
+# SwaggerClient
+
+## Requirements
+
+The API client library requires ARC (Automatic Reference Counting) to be enabled in your Xcode project.
+
+## Installation
+
+To install it, put the API client library in your project and then simply add the following line to your Podfile:
+
+```ruby
+pod "SwaggerClient", :path => "/path/to/lib"
+```
+
+## Author
+
+apiteam@swagger.io
+
+
diff --git a/samples/client/petstore/objc/SwaggerClient.podspec b/samples/client/petstore/objc/SwaggerClient.podspec
new file mode 100644
index 00000000000..d9b02841cf9
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient.podspec
@@ -0,0 +1,31 @@
+#
+# Be sure to run `pod lib lint SwaggerClient.podspec' to ensure this is a
+# valid spec and remove all comments before submitting the spec.
+#
+# Any lines starting with a # are optional, but encouraged
+#
+# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html
+#
+
+Pod::Spec.new do |s|
+    s.name             = "SwaggerClient"
+    s.version          = "1.0.0"
+
+    s.summary          = "Swagger Petstore"
+    s.description      = <<-DESC
+                         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
+                         DESC
+
+    s.platform     = :ios, '7.0'
+    s.requires_arc = true
+
+    s.framework    = 'SystemConfiguration'
+
+    s.source_files = 'SwaggerClient/**/*'
+    s.public_header_files = 'SwaggerClient/**/*.h'
+
+    s.dependency 'AFNetworking', '~> 2.3'
+    s.dependency 'JSONModel', '~> 1.1'
+    s.dependency 'ISO8601', '~> 0.3'
+end
+
diff --git a/samples/client/petstore/objc/client/JSONValueTransformer+ISO8601.h b/samples/client/petstore/objc/SwaggerClient/JSONValueTransformer+ISO8601.h
similarity index 100%
rename from samples/client/petstore/objc/client/JSONValueTransformer+ISO8601.h
rename to samples/client/petstore/objc/SwaggerClient/JSONValueTransformer+ISO8601.h
diff --git a/samples/client/petstore/objc/client/JSONValueTransformer+ISO8601.m b/samples/client/petstore/objc/SwaggerClient/JSONValueTransformer+ISO8601.m
similarity index 100%
rename from samples/client/petstore/objc/client/JSONValueTransformer+ISO8601.m
rename to samples/client/petstore/objc/SwaggerClient/JSONValueTransformer+ISO8601.m
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGApiClient.h b/samples/client/petstore/objc/SwaggerClient/SWGApiClient.h
new file mode 100644
index 00000000000..84f28faa8c6
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/SWGApiClient.h
@@ -0,0 +1,207 @@
+#import <Foundation/Foundation.h>
+#import <ISO8601/ISO8601.h>
+#import <AFNetworking/AFHTTPRequestOperationManager.h>
+#import "SWGJSONResponseSerializer.h"
+#import "SWGJSONRequestSerializer.h"
+#import "SWGQueryParamCollection.h"
+#import "SWGConfiguration.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 "SWGUser.h"
+#import "SWGCategory.h"
+#import "SWGPet.h"
+#import "SWGTag.h"
+#import "SWGOrder.h"
+
+
+@class SWGConfiguration;
+
+/**
+ * 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, readonly) NSOperationQueue* queue;
+
+/**
+ * Clears Cache
+ */
++(void)clearCache;
+
+/**
+ * Turns on cache
+ *
+ * @param enabled If the cached is enable, must be `YES` or `NO`
+ */
++(void)setCacheEnabled:(BOOL) enabled;
+
+/**
+ * Gets the request queue size
+ *
+ * @return The size of `queuedRequests` static variable.
+ */
++(unsigned long)requestQueueSize;
+
+/**
+ * Sets the client unreachable
+ *
+ * @param state off line state, must be `YES` or `NO`
+ */
++(void) setOfflineState:(BOOL) state;
+
+/**
+ * Gets the client reachability
+ *
+ * @return The client reachability.
+ */
++(AFNetworkReachabilityStatus) getReachabilityStatus;
+
+/**
+ * Gets the next request id
+ *
+ * @return The next executed request id.
+ */
++(NSNumber*) nextRequestId;
+
+/**
+ * Generates request id and add it to the queue
+ *
+ * @return The next executed request id.
+ */
++(NSNumber*) queueRequest;
+
+/**
+ * Removes request id from the queue
+ *
+ * @param requestId The request which will be removed.
+ */
++(void) cancelRequest:(NSNumber*)requestId;
+
+/**
+ * Gets URL encoded NSString
+ *
+ * @param unescaped The string which will be escaped.
+ *
+ * @return The escaped string.
+ */
++(NSString*) escape:(id)unescaped;
+
+/**
+ * Customizes the behavior when the reachability changed
+ *
+ * @param changeBlock The block will be executed when the reachability changed.
+ */
++(void) setReachabilityChangeBlock:(void(^)(int))changeBlock;
+
+/**
+ * Sets the api client reachability strategy
+ */
+- (void)configureCacheReachibility;
+
+/**
+ * Detects Accept header from accepts NSArray
+ *
+ * @param accepts NSArray of header
+ *
+ * @return The Accept header
+ */
++(NSString *) selectHeaderAccept:(NSArray *)accepts;
+
+/**
+ * Detects Content-Type header from contentTypes NSArray
+ *
+ * @param contentTypes NSArray of header
+ *
+ * @return The Content-Type header
+ */
++(NSString *) selectHeaderContentType:(NSArray *)contentTypes;
+
+/**
+ * Sets header for request
+ *
+ * @param value The header value
+ * @param forKey The header key
+ */
+-(void)setHeaderValue:(NSString*) value
+               forKey:(NSString*) forKey;
+
+/**
+ * Updates header parameters and query parameters for authentication
+ *
+ * @param headers The header parameter will be udpated, passed by pointer to pointer.
+ * @param querys The query parameters will be updated, passed by pointer to pointer.
+ * @param authSettings The authentication names NSArray.
+ */
+- (void) updateHeaderParams:(NSDictionary **)headers
+                queryParams:(NSDictionary **)querys
+           WithAuthSettings:(NSArray *)authSettings;
+
+/**
+ * Deserializes the given data to Objective-C object.
+ *
+ * @param data The data will be deserialized.
+ * @param class The type of objective-c object.
+ */
+- (id) deserialize:(id) data class:(NSString *) class;
+
+/**
+ * Logs request and response
+ *
+ * @param operation AFHTTPRequestOperation for the HTTP request.
+ * @param request   The HTTP request.
+ * @param error     The error of the HTTP request.
+ */
+- (void)logResponse:(AFHTTPRequestOperation *)operation
+         forRequest:(NSURLRequest *)request
+              error:(NSError *)error;
+
+/**
+ * Performs request
+ *
+ * @param path Request url.
+ * @param method Request method.
+ * @param pathParams Request path parameters.
+ * @param queryParams Request query parameters.
+ * @param body Request body.
+ * @param headerParams Request header parameters.
+ * @param authSettings Request authentication names.
+ * @param requestContentType Request content-type.
+ * @param responseContentType Response content-type.
+ * @param completionBlock The block will be executed when the request completed.
+ *
+ * @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;
+
+/**
+ * Sanitize object for request
+ *
+ * @param object The query/path/header/form/body param to be sanitized.
+ */
+- (id) sanitizeForSerialization:(id) object;
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGApiClient.m b/samples/client/petstore/objc/SwaggerClient/SWGApiClient.m
new file mode 100644
index 00000000000..906169f4d12
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/SWGApiClient.m
@@ -0,0 +1,729 @@
+#import "SWGApiClient.h"
+
+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 void (^reachabilityChangeBlock)(int);
+
+@implementation SWGApiClient
+
+- (instancetype)init {
+    NSString *baseUrl = [[SWGConfiguration sharedConfig] host];
+    return [self initWithBaseURL:[NSURL URLWithString:baseUrl]];
+}
+
+- (instancetype)initWithBaseURL:(NSURL *)url {
+    self = [super initWithBaseURL:url];
+    if (self) {
+        self.requestSerializer = [AFJSONRequestSerializer serializer];
+        self.responseSerializer = [AFJSONResponseSerializer serializer];
+        // configure reachability
+        [self configureCacheReachibility];
+    }
+    return self;
+}
+
++ (void)initialize {
+    if (self == [SWGApiClient class]) {
+        queuedRequests = [[NSMutableSet alloc] init];
+        // initialize URL cache
+        [self configureCacheWithMemoryAndDiskCapacity:4*1024*1024 diskSize:32*1024*1024];
+    }
+}
+
+#pragma mark - Setter Methods
+
++ (void) setOfflineState:(BOOL) state {
+    offlineState = state;
+}
+
++ (void) setCacheEnabled:(BOOL)enabled {
+    cacheEnabled = enabled;
+}
+
+- (void)setHeaderValue:(NSString*) value
+                forKey:(NSString*) forKey {
+    [self.requestSerializer setValue:value forHTTPHeaderField:forKey];
+}
+
+#pragma mark - Log Methods
+
+- (void)logResponse:(AFHTTPRequestOperation *)operation
+         forRequest:(NSURLRequest *)request
+              error:(NSError*)error {
+    SWGConfiguration *config = [SWGConfiguration sharedConfig];
+
+    NSString *message = [NSString stringWithFormat:@"\n[DEBUG] Request body \n~BEGIN~\n %@\n~END~\n"\
+                         "[DEBUG] HTTP Response body \n~BEGIN~\n %@\n~END~\n",
+                        [[NSString alloc] initWithData:request.HTTPBody encoding:NSUTF8StringEncoding],
+                        operation.responseString];
+
+    if (config.loggingFileHanlder) {
+        [config.loggingFileHanlder seekToEndOfFile];
+        [config.loggingFileHanlder writeData:[message dataUsingEncoding:NSUTF8StringEncoding]];
+    }
+
+    NSLog(@"%@", message);
+}
+
+#pragma mark - Cache Methods
+
++(void)clearCache {
+    [[NSURLCache sharedURLCache] removeAllCachedResponses];
+}
+
++(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];
+}
+
+#pragma mark - Utility Methods
+
+/*
+ * Detect `Accept` from accepts
+ */
++ (NSString *) selectHeaderAccept:(NSArray *)accepts
+{
+    if (accepts == nil || [accepts count] == 0) {
+        return @"";
+    }
+
+    NSMutableArray *lowerAccepts = [[NSMutableArray alloc] initWithCapacity:[accepts count]];
+    [accepts enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+        [lowerAccepts addObject:[obj lowercaseString]];
+    }];
+
+
+    if ([lowerAccepts containsObject:@"application/json"]) {
+        return @"application/json";
+    }
+    else {
+        return [lowerAccepts componentsJoinedByString:@", "];
+    }
+}
+
+/*
+ * Detect `Content-Type` from contentTypes
+ */
++ (NSString *) selectHeaderContentType:(NSArray *)contentTypes
+{
+    if (contentTypes == nil || [contentTypes count] == 0) {
+        return @"application/json";
+    }
+
+    NSMutableArray *lowerContentTypes = [[NSMutableArray alloc] initWithCapacity:[contentTypes count]];
+    [contentTypes enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+        [lowerContentTypes addObject:[obj lowercaseString]];
+    }];
+
+    if ([lowerContentTypes containsObject:@"application/json"]) {
+        return @"application/json";
+    }
+    else {
+        return lowerContentTypes[0];
+    }
+}
+
++ (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];
+    }
+}
+
+#pragma mark - Request Methods
+
++(unsigned long)requestQueueSize {
+    return [queuedRequests count];
+}
+
++(NSNumber*) nextRequestId {
+    @synchronized(self) {
+        long nextId = ++requestId;
+        if([[SWGConfiguration sharedConfig] debug])
+            NSLog(@"got id %ld", nextId);
+        return [NSNumber numberWithLong:nextId];
+    }
+}
+
++(NSNumber*) queueRequest {
+    NSNumber* requestId = [SWGApiClient nextRequestId];
+    if([[SWGConfiguration sharedConfig] debug])
+        NSLog(@"added %@ to request queue", requestId);
+    [queuedRequests addObject:requestId];
+    return requestId;
+}
+
++(void) cancelRequest:(NSNumber*)requestId {
+    [queuedRequests removeObject:requestId];
+}
+
+-(Boolean) executeRequestWithId:(NSNumber*) requestId {
+    NSSet* matchingItems = [queuedRequests objectsPassingTest:^BOOL(id obj, BOOL *stop) {
+        if([obj intValue]  == [requestId intValue]) {
+            return YES;
+        }
+        else {
+            return NO;
+        }
+    }];
+
+    if(matchingItems.count == 1) {
+        if([[SWGConfiguration sharedConfig] debug])
+            NSLog(@"removing request id %@", requestId);
+        [queuedRequests removeObject:requestId];
+        return YES;
+    }
+    else {
+        return NO;
+    }
+}
+
+#pragma mark - Reachability Methods
+
++(AFNetworkReachabilityStatus) getReachabilityStatus {
+    return reachabilityStatus;
+}
+
++(void) setReachabilityChangeBlock:(void(^)(int))changeBlock {
+    reachabilityChangeBlock = changeBlock;
+}
+
+- (void) configureCacheReachibility {
+    [self.reachabilityManager setReachabilityStatusChangeBlock:^(AFNetworkReachabilityStatus status) {
+        reachabilityStatus = status;
+        switch (status) {
+            case AFNetworkReachabilityStatusUnknown:
+                if([[SWGConfiguration sharedConfig] debug])
+                    NSLog(@"reachability changed to AFNetworkReachabilityStatusUnknown");
+                [SWGApiClient setOfflineState:true];
+                break;
+
+            case AFNetworkReachabilityStatusNotReachable:
+                if([[SWGConfiguration sharedConfig] debug])
+                    NSLog(@"reachability changed to AFNetworkReachabilityStatusNotReachable");
+                [SWGApiClient setOfflineState:true];
+                break;
+
+            case AFNetworkReachabilityStatusReachableViaWWAN:
+                if([[SWGConfiguration sharedConfig] debug])
+                    NSLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWWAN");
+                [SWGApiClient setOfflineState:false];
+                break;
+
+            case AFNetworkReachabilityStatusReachableViaWiFi:
+                if([[SWGConfiguration sharedConfig] debug])
+                    NSLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWiFi");
+                [SWGApiClient setOfflineState:false];
+                break;
+            default:
+                break;
+        }
+
+        // call the reachability block, if configured
+        if(reachabilityChangeBlock != nil) {
+            reachabilityChangeBlock(status);
+        }
+    }];
+
+    [self.reachabilityManager startMonitoring];
+}
+
+#pragma mark - Deserialize methods
+
+- (id) deserialize:(id) data class:(NSString *) class {
+    NSRegularExpression *regexp = nil;
+    NSTextCheckingResult *match = nil;
+    NSMutableArray *resultArray = nil;
+    NSMutableDictionary *resultDict = nil;
+    NSString *innerType = nil;
+
+    // return nil if data is nil or class is nil
+    if (!data || !class) {
+        return nil;
+    }
+
+    // remove "*" from class, if ends with "*"
+    if ([class hasSuffix:@"*"]) {
+        class = [class substringToIndex:[class length] - 1];
+    }
+
+    // pure object
+    if ([class isEqualToString:@"NSObject"]) {
+        return [[NSObject alloc] init];
+    }
+
+    // list of models
+    NSString *arrayOfModelsPat = @"NSArray<(.+)>";
+    regexp = [NSRegularExpression regularExpressionWithPattern:arrayOfModelsPat
+                                                      options:NSRegularExpressionCaseInsensitive
+                                                        error:nil];
+
+    match = [regexp firstMatchInString:class
+                               options:0
+                                 range:NSMakeRange(0, [class length])];
+
+    if (match) {
+        innerType = [class substringWithRange:[match rangeAtIndex:1]];
+
+        resultArray = [NSMutableArray arrayWithCapacity:[data count]];
+        [data enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+                [resultArray addObject:[self deserialize:obj class:innerType]];
+            }
+        ];
+
+        return resultArray;
+    }
+
+    // list of primitives
+    NSString *arrayOfPrimitivesPat = @"NSArray\\* /\\* (.+) \\*/";
+    regexp = [NSRegularExpression regularExpressionWithPattern:arrayOfPrimitivesPat
+                                                       options:NSRegularExpressionCaseInsensitive
+                                                         error:nil];
+    match = [regexp firstMatchInString:class
+                               options:0
+                                 range:NSMakeRange(0, [class length])];
+
+    if (match) {
+        innerType = [class substringWithRange:[match rangeAtIndex:1]];
+
+        resultArray = [NSMutableArray arrayWithCapacity:[data count]];
+        [data enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+            [resultArray addObject:[self deserialize:obj class:innerType]];
+        }];
+
+        return resultArray;
+    }
+
+    // map
+    NSString *dictPat = @"NSDictionary\\* /\\* (.+?), (.+) \\*/";
+    regexp = [NSRegularExpression regularExpressionWithPattern:dictPat
+                                                       options:NSRegularExpressionCaseInsensitive
+                                                         error:nil];
+    match = [regexp firstMatchInString:class
+                               options:0
+                                 range:NSMakeRange(0, [class length])];
+
+    if (match) {
+        NSString *valueType = [class substringWithRange:[match rangeAtIndex:2]];
+
+        resultDict = [NSMutableDictionary dictionaryWithCapacity:[data count]];
+        [data enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
+            [resultDict setValue:[self deserialize:obj class:valueType] forKey:key];
+        }];
+
+        return resultDict;
+    }
+
+    // primitives
+    NSArray *primitiveTypes = @[@"NSString", @"NSDate", @"NSNumber"];
+
+    if ([primitiveTypes containsObject:class]) {
+        if ([class isEqualToString:@"NSString"]) {
+            return [NSString stringWithString:data];
+        }
+        else if ([class isEqualToString:@"NSDate"]) {
+            return [NSDate dateWithISO8601String:data];
+        }
+        else if ([class isEqualToString:@"NSNumber"]) {
+            // NSNumber from NSNumber
+            if ([data isKindOfClass:[NSNumber class]]) {
+                return data;
+            }
+            else if ([data isKindOfClass:[NSString class]]) {
+                // NSNumber (NSCFBoolean) from NSString
+                if ([[data lowercaseString] isEqualToString:@"true"] || [[data lowercaseString] isEqualToString:@"false"]) {
+                    return [NSNumber numberWithBool:[data boolValue]];
+                // NSNumber from NSString
+                } else {
+                    NSNumberFormatter *formatter = [[NSNumberFormatter alloc] init];
+                    formatter.numberStyle = NSNumberFormatterDecimalStyle;
+                    return [formatter numberFromString:data];
+                }
+            }
+        }
+    }
+
+   // model
+    Class ModelClass = NSClassFromString(class);
+    if ([ModelClass instancesRespondToSelector:@selector(initWithDictionary:error:)]) {
+        return [[ModelClass alloc] initWithDictionary:data error:nil];
+    }
+
+    return nil;
+}
+
+#pragma mark - Operation Methods
+
+- (void) operationWithCompletionBlock: (NSURLRequest *)request
+                            requestId: (NSNumber *) requestId
+                      completionBlock: (void (^)(id, NSError *))completionBlock {
+    AFHTTPRequestOperation *op = [self HTTPRequestOperationWithRequest:request
+                                                               success:^(AFHTTPRequestOperation *operation, id response) {
+                                                                   if([self executeRequestWithId:requestId]) {
+                                                                       if([[SWGConfiguration sharedConfig] debug]) {
+                                                                           [self logResponse:operation 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([[SWGConfiguration sharedConfig] debug])
+                                                                           [self logResponse:nil forRequest:request error:augmentedError];
+                                                                       completionBlock(nil, augmentedError);
+                                                                   }
+                                                               }];
+
+    [self.operationQueue addOperation:op];
+}
+
+- (void) downloadOperationWithCompletionBlock: (NSURLRequest *)request
+                                    requestId: (NSNumber *) requestId
+                              completionBlock: (void (^)(id, NSError *))completionBlock {
+    AFHTTPRequestOperation *op = [self HTTPRequestOperationWithRequest:request
+                                                               success:^(AFHTTPRequestOperation *operation, id responseObject) {
+                                                                   SWGConfiguration *config = [SWGConfiguration sharedConfig];
+                                                                   NSString *directory = nil;
+                                                                   if (config.tempFolderPath) {
+                                                                       directory = config.tempFolderPath;
+                                                                   }
+                                                                   else {
+                                                                       directory = NSTemporaryDirectory();
+                                                                   }
+
+                                                                   NSDictionary *headers = operation.response.allHeaderFields;
+                                                                   NSString *filename = nil;
+                                                                   if ([headers objectForKey:@"Content-Disposition"]) {
+
+                                                                       NSString *pattern = @"filename=['\"]?([^'\"\\s]+)['\"]?";
+                                                                       NSRegularExpression *regexp = [NSRegularExpression regularExpressionWithPattern:pattern
+                                                                                                                                               options:NSRegularExpressionCaseInsensitive
+                                                                                                                                                 error:nil];
+                                                                       NSString *contentDispositionHeader = [headers objectForKey:@"Content-Disposition"];
+                                                                       NSTextCheckingResult *match = [regexp firstMatchInString:contentDispositionHeader
+                                                                                                                        options:0
+                                                                                                                          range:NSMakeRange(0, [contentDispositionHeader length])];
+                                                                       filename = [contentDispositionHeader substringWithRange:[match rangeAtIndex:1]];
+                                                                   }
+                                                                   else {
+                                                                       filename = [NSString stringWithFormat:@"%@", [[NSProcessInfo processInfo] globallyUniqueString]];
+                                                                   }
+
+                                                                   NSString *filepath = [directory stringByAppendingPathComponent:filename];
+                                                                   NSURL *file = [NSURL fileURLWithPath:filepath];
+
+                                                                   [operation.responseData writeToURL:file atomically:YES];
+                                                                   completionBlock(file, nil);
+                                                               } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
+
+                                                                   if ([self executeRequestWithId:requestId]) {
+                                                                       NSMutableDictionary *userInfo = [error.userInfo mutableCopy];
+                                                                       if (operation.responseObject) {
+                                                                           userInfo[SWGResponseObjectErrorKey] = operation.responseObject;
+                                                                       }
+
+                                                                       NSError *augmentedError = [error initWithDomain:error.domain code:error.code userInfo:userInfo];
+
+                                                                       if ([[SWGConfiguration sharedConfig] debug]) {
+                                                                           [self logResponse:nil forRequest:request error:augmentedError];
+                                                                       }
+
+                                                                       completionBlock(nil, augmentedError);
+                                                                   }
+                                                               }];
+
+    [self.operationQueue addOperation:op];
+}
+
+#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 {
+    // setting request serializer
+    if ([requestContentType isEqualToString:@"application/json"]) {
+        self.requestSerializer = [SWGJSONRequestSerializer serializer];
+    }
+    else if ([requestContentType isEqualToString:@"application/x-www-form-urlencoded"]) {
+        self.requestSerializer = [AFHTTPRequestSerializer serializer];
+    }
+    else if ([requestContentType isEqualToString:@"multipart/form-data"]) {
+        self.requestSerializer = [AFHTTPRequestSerializer serializer];
+    }
+    else {
+        NSAssert(false, @"unsupport request type %@", requestContentType);
+    }
+
+    // setting response serializer
+    if ([responseContentType isEqualToString:@"application/json"]) {
+        self.responseSerializer = [SWGJSONResponseSerializer serializer];
+    }
+    else {
+        self.responseSerializer = [AFHTTPResponseSerializer serializer];
+    }
+
+    // sanitize parameters
+    pathParams = [self sanitizeForSerialization:pathParams];
+    queryParams = [self sanitizeForSerialization:queryParams];
+    headerParams = [self sanitizeForSerialization:headerParams];
+    formParams = [self sanitizeForSerialization:formParams];
+    body = [self sanitizeForSerialization:body];
+
+    // auth setting
+    [self updateHeaderParams:&headerParams queryParams:&queryParams WithAuthSettings:authSettings];
+
+    NSMutableString *resourcePath = [NSMutableString stringWithString:path];
+    [pathParams enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
+        [resourcePath replaceCharactersInRange:[resourcePath rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", key, @"}"]]
+                                    withString:[SWGApiClient escape:obj]];
+    }];
+
+    NSMutableURLRequest * request = nil;
+
+    NSString* pathWithQueryParams = [self pathWithQueryParamsToString:resourcePath queryParams:queryParams];
+    if ([pathWithQueryParams hasPrefix:@"/"]) {
+        pathWithQueryParams = [pathWithQueryParams substringFromIndex:1];
+    }
+
+    NSString* urlString = [[NSURL URLWithString:pathWithQueryParams relativeToURL:self.baseURL] absoluteString];
+    if (files.count > 0) {
+        request = [self.requestSerializer multipartFormRequestWithMethod:@"POST"
+                                                               URLString:urlString
+                                                              parameters:nil
+                                               constructingBodyWithBlock:^(id<AFMultipartFormData> formData) {
+                                                   [formParams enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
+                                                       NSData *data = [obj dataUsingEncoding:NSUTF8StringEncoding];
+                                                       [formData appendPartWithFormData:data name:key];
+                                                   }];
+                                                   [files enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
+                                                       NSURL *filePath = (NSURL *)obj;
+                                                       [formData appendPartWithFileURL:filePath name:key error:nil];
+                                                   }];
+                                               } error:nil];
+    }
+    else {
+        if (formParams) {
+            request = [self.requestSerializer requestWithMethod:method
+                                                      URLString:urlString
+                                                     parameters:formParams
+                                                          error:nil];
+        }
+        if (body) {
+            request = [self.requestSerializer requestWithMethod:method
+                                                      URLString:urlString
+                                                     parameters:body
+                                                          error:nil];
+        }
+    }
+
+    // request cache
+    BOOL hasHeaderParams = false;
+    if(headerParams != nil && [headerParams count] > 0) {
+        hasHeaderParams = true;
+    }
+    if(offlineState) {
+        NSLog(@"%@ cache forced", resourcePath);
+        [request setCachePolicy:NSURLRequestReturnCacheDataDontLoad];
+    }
+    else if(!hasHeaderParams && [method isEqualToString:@"GET"] && cacheEnabled) {
+        NSLog(@"%@ cache enabled", resourcePath);
+        [request setCachePolicy:NSURLRequestUseProtocolCachePolicy];
+    }
+    else {
+        NSLog(@"%@ cache disabled", resourcePath);
+        [request setCachePolicy:NSURLRequestReloadIgnoringLocalCacheData];
+    }
+
+    if(hasHeaderParams){
+        for(NSString * key in [headerParams keyEnumerator]){
+            [request setValue:[headerParams valueForKey:key] forHTTPHeaderField:key];
+        }
+    }
+    [self.requestSerializer setValue:responseContentType forHTTPHeaderField:@"Accept"];
+
+
+    // Always disable cookies!
+    [request setHTTPShouldHandleCookies:NO];
+
+    NSNumber* requestId = [SWGApiClient queueRequest];
+    if ([responseType isEqualToString:@"NSURL*"]) {
+        [self downloadOperationWithCompletionBlock:request requestId:requestId completionBlock:^(id data, NSError *error) {
+            completionBlock(data, error);
+        }];
+    }
+    else {
+        [self operationWithCompletionBlock:request requestId:requestId completionBlock:^(id data, NSError *error) {
+            completionBlock([self deserialize:data class:responseType], error);
+        }];
+    }
+    return requestId;
+}
+
+#pragma mark -
+
+- (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 = @"&";
+            id queryParam = [queryParams valueForKey:key];
+            if([queryParam isKindOfClass:[NSString class]]){
+                [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
+                                          [SWGApiClient escape:key], [SWGApiClient escape:[queryParams valueForKey:key]]]];
+            }
+            else if([queryParam isKindOfClass:[SWGQueryParamCollection class]]){
+                SWGQueryParamCollection * coll = (SWGQueryParamCollection*) queryParam;
+                NSArray* values = [coll values];
+                NSString* format = [coll format];
+
+                if([format isEqualToString:@"csv"]) {
+                    [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
+                        [SWGApiClient escape:key], [NSString stringWithFormat:@"%@", [values componentsJoinedByString:@","]]]];
+
+                }
+                else if([format isEqualToString:@"tsv"]) {
+                    [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
+                        [SWGApiClient escape:key], [NSString stringWithFormat:@"%@", [values componentsJoinedByString:@"\t"]]]];
+
+                }
+                else if([format isEqualToString:@"pipes"]) {
+                    [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
+                        [SWGApiClient escape:key], [NSString stringWithFormat:@"%@", [values componentsJoinedByString:@"|"]]]];
+
+                }
+                else if([format isEqualToString:@"multi"]) {
+                    for(id obj in values) {
+                        [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
+                            [SWGApiClient escape:key], [NSString stringWithFormat:@"%@", obj]]];
+                        counter += 1;
+                    }
+
+                }
+            }
+            else {
+                [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
+                                          [SWGApiClient escape:key], [NSString stringWithFormat:@"%@", [queryParams valueForKey:key]]]];
+            }
+
+            counter += 1;
+        }
+    }
+    return requestUrl;
+}
+
+/**
+ * Update header and query params based on authentication settings
+ */
+- (void) updateHeaderParams:(NSDictionary *__autoreleasing *)headers
+                queryParams:(NSDictionary *__autoreleasing *)querys
+           WithAuthSettings:(NSArray *)authSettings {
+
+    if (!authSettings || [authSettings count] == 0) {
+        return;
+    }
+
+    NSMutableDictionary *headersWithAuth = [NSMutableDictionary dictionaryWithDictionary:*headers];
+    NSMutableDictionary *querysWithAuth = [NSMutableDictionary dictionaryWithDictionary:*querys];
+
+    SWGConfiguration *config = [SWGConfiguration sharedConfig];
+    for (NSString *auth in authSettings) {
+        NSDictionary *authSetting = [[config authSettings] objectForKey:auth];
+
+        if (authSetting) {
+            if ([authSetting[@"in"] isEqualToString:@"header"]) {
+                [headersWithAuth setObject:authSetting[@"value"] forKey:authSetting[@"key"]];
+            }
+            else if ([authSetting[@"in"] isEqualToString:@"query"]) {
+                [querysWithAuth setObject:authSetting[@"value"] forKey:authSetting[@"key"]];
+            }
+        }
+    }
+
+    *headers = [NSDictionary dictionaryWithDictionary:headersWithAuth];
+    *querys = [NSDictionary dictionaryWithDictionary:querysWithAuth];
+}
+
+- (id) sanitizeForSerialization:(id) object {
+    if (object == nil) {
+        return nil;
+    }
+    else if ([object isKindOfClass:[NSString class]] || [object isKindOfClass:[NSNumber class]] || [object isKindOfClass:[SWGQueryParamCollection class]]) {
+        return object;
+    }
+    else if ([object isKindOfClass:[NSDate class]]) {
+        return [object ISO8601String];
+    }
+    else if ([object isKindOfClass:[NSArray class]]) {
+        NSMutableArray *sanitizedObjs = [NSMutableArray arrayWithCapacity:[object count]];
+        [object enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+            if (obj) {
+                [sanitizedObjs addObject:[self sanitizeForSerialization:obj]];
+            }
+        }];
+        return sanitizedObjs;
+    }
+    else if ([object isKindOfClass:[NSDictionary class]]) {
+        NSMutableDictionary *sanitizedObjs = [NSMutableDictionary dictionaryWithCapacity:[object count]];
+        [object enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
+            if (obj) {
+                [sanitizedObjs setValue:[self sanitizeForSerialization:obj] forKey:key];
+            }
+        }];
+        return sanitizedObjs;
+    }
+    else if ([object isKindOfClass:[SWGObject class]]) {
+        return [object toDictionary];
+    }
+    else {
+        NSException *e = [NSException
+                          exceptionWithName:@"InvalidObjectArgumentException"
+                          reason:[NSString stringWithFormat:@"*** The argument object: %@ is invalid", object]
+                          userInfo:nil];
+        @throw e;
+    }
+}
+  
+@end
diff --git a/samples/client/petstore/objc/client/SWGCategory.h b/samples/client/petstore/objc/SwaggerClient/SWGCategory.h
similarity index 53%
rename from samples/client/petstore/objc/client/SWGCategory.h
rename to samples/client/petstore/objc/SwaggerClient/SWGCategory.h
index a2fed79b4a3..983fd610123 100644
--- a/samples/client/petstore/objc/client/SWGCategory.h
+++ b/samples/client/petstore/objc/SwaggerClient/SWGCategory.h
@@ -1,10 +1,17 @@
 #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 SWGCategory
 @end
-  
+
 @interface SWGCategory : SWGObject
 
 
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGCategory.m b/samples/client/petstore/objc/SwaggerClient/SWGCategory.m
new file mode 100644
index 00000000000..fb3ccecf176
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/SWGCategory.m
@@ -0,0 +1,39 @@
+#import "SWGCategory.h"
+
+@implementation SWGCategory
+
+/**
+ * Maps json key to property name.
+ * This method is used by `JSONModel`.
+ */
++ (JSONKeyMapper *)keyMapper
+{
+  return [[JSONKeyMapper alloc] initWithDictionary:@{ @"id": @"_id", @"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 = @[@"_id", @"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/SWGConfiguration.h b/samples/client/petstore/objc/SwaggerClient/SWGConfiguration.h
new file mode 100644
index 00000000000..99f97cdec1b
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/SWGConfiguration.h
@@ -0,0 +1,128 @@
+#import <Foundation/Foundation.h>
+#import "SWGApiClient.h"
+  
+/** The `SWGConfiguration` class manages the configurations for the sdk.
+ *
+ * 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.
+ */
+
+@class SWGApiClient;
+  
+@interface SWGConfiguration : NSObject
+
+/**
+ * Default api client
+ */
+@property (nonatomic) SWGApiClient *apiClient;
+  
+/**
+ * Default base url
+ */
+@property (nonatomic) NSString *host;
+
+/**
+ * Api key values for Api Key type Authentication
+ *
+ * To add or remove api key, use `setApiKey:forApiKeyIdentifier:`.
+ */
+@property (readonly, nonatomic, strong) NSDictionary *apiKey;
+
+/**
+ * Api key prefix values to be prepend to the respective api key
+ *
+ * To add or remove prefix, use `setApiKeyPrefix:forApiKeyPrefixIdentifier:`.
+ */
+@property (readonly, nonatomic, strong) NSDictionary *apiKeyPrefix;
+
+/**
+ * Usename for HTTP Basic Authentication
+ */
+ @property (nonatomic) NSString *username;
+
+/**
+ * Password for HTTP Basic Authentication
+ */
+@property (nonatomic) NSString *password;
+
+/**
+ * Temp folder for file download
+ */
+@property (nonatomic) NSString *tempFolderPath;
+
+/**
+ * Logging Settings
+ */
+
+/**
+ * Debug switch, default false
+ */
+@property (nonatomic) BOOL debug;
+
+/**
+ * Debug file location, default log in console
+ */
+@property (nonatomic) NSString *loggingFile;
+
+/**
+ * Log file handler, this property is used by sdk internally.
+ */
+@property (nonatomic, readonly) NSFileHandle *loggingFileHanlder;
+
+/**
+ * Gets configuration singleton instance
+ */
++ (instancetype) sharedConfig;
+
+/**
+ * Sets API key
+ *
+ * To remove a apiKey for an identifier, just set the apiKey to nil.
+ *
+ * @param apiKey     API key or token.
+ * @param identifier API key identifier (authentication schema).
+ *
+ */
+- (void) setApiKey:(NSString *)apiKey forApiKeyIdentifier:(NSString*)identifier;
+
+/**
+ * Removes api key
+ *
+ * @param identifier API key identifier.
+ */
+- (void) removeApiKey:(NSString *)identifier;
+
+/**
+ * Sets the prefix for API key
+ *
+ * To remove a apiKeyPrefix for an identifier, just set the apiKeyPrefix to nil.
+ *
+ * @param apiKeyPrefix API key prefix.
+ * @param identifier   API key identifier.
+ */
+- (void) setApiKeyPrefix:(NSString *)prefix forApiKeyPrefixIdentifier:(NSString *)identifier;
+
+/**
+ * Removes api key prefix
+ *
+ * @param identifier API key identifier.
+ */
+- (void) removeApiKeyPrefix:(NSString *)identifier;
+
+/**
+ * Gets API key (with prefix if set)
+ */
+- (NSString *) getApiKeyWithPrefix:(NSString *) key;
+
+/**
+ * Gets Basic Auth token
+ */
+- (NSString *) getBasicAuthToken;
+
+/**
+ * Gets Authentication Setings
+ */
+- (NSDictionary *) authSettings;
+
+@end
diff --git a/samples/client/petstore/objc/client/SWGConfiguration.m b/samples/client/petstore/objc/SwaggerClient/SWGConfiguration.m
similarity index 56%
rename from samples/client/petstore/objc/client/SWGConfiguration.m
rename to samples/client/petstore/objc/SwaggerClient/SWGConfiguration.m
index 89d5a597946..9cc1c07d9f9 100644
--- a/samples/client/petstore/objc/client/SWGConfiguration.m
+++ b/samples/client/petstore/objc/SwaggerClient/SWGConfiguration.m
@@ -25,8 +25,13 @@ + (instancetype) sharedConfig {
 - (instancetype) init {
     self = [super init];
     if (self) {
+        self.apiClient = nil;
+        self.host = @"http://petstore.swagger.io/v2";
         self.username = @"";
         self.password = @"";
+        self.tempFolderPath = nil;
+        self.debug = NO;
+        self.loggingFile = nil;
         self.mutableApiKey = [NSMutableDictionary dictionary];
         self.mutableApiKeyPrefix = [NSMutableDictionary dictionary];
     }
@@ -51,18 +56,40 @@ - (NSString *) getBasicAuthToken {
     NSString *basicAuthCredentials = [NSString stringWithFormat:@"%@:%@", self.username, self.password];
     NSData *data = [basicAuthCredentials dataUsingEncoding:NSUTF8StringEncoding];
     basicAuthCredentials = [NSString stringWithFormat:@"Basic %@", [data base64EncodedStringWithOptions:0]];
-    
+
     return basicAuthCredentials;
 }
 
 #pragma mark - Setter Methods
 
-- (void) setValue:(NSString *)value forApiKeyField:(NSString *)field {
-    [self.mutableApiKey setValue:value forKey:field];
+- (void) setApiKey:(NSString *)apiKey forApiKeyIdentifier:(NSString *)identifier {
+    [self.mutableApiKey setValue:apiKey forKey:identifier];
+}
+
+- (void) removeApiKey:(NSString *)identifier {
+    [self.mutableApiKey removeObjectForKey:identifier];
+}
+
+- (void) setApiKeyPrefix:(NSString *)prefix forApiKeyPrefixIdentifier:(NSString *)identifier {
+    [self.mutableApiKeyPrefix setValue:prefix forKey:identifier];
 }
 
-- (void) setValue:(NSString *)value forApiKeyPrefixField:(NSString *)field {
-    [self.mutableApiKeyPrefix setValue:value forKey:field];
+- (void) removeApiKeyPrefix:(NSString *)identifier {
+    [self.mutableApiKeyPrefix removeObjectForKey:identifier];
+}
+
+- (void) setLoggingFile:(NSString *)loggingFile {
+    // close old file handler
+    if ([self.loggingFileHanlder isKindOfClass:[NSFileHandle class]]) {
+        [self.loggingFileHanlder closeFile];
+    }
+
+    _loggingFile = loggingFile;
+    _loggingFileHanlder = [NSFileHandle fileHandleForWritingAtPath:_loggingFile];
+    if (_loggingFileHanlder == nil) {
+        [[NSFileManager defaultManager] createFileAtPath:_loggingFile contents:nil attributes:nil];
+        _loggingFileHanlder = [NSFileHandle fileHandleForWritingAtPath:_loggingFile];
+    }
 }
 
 #pragma mark - Getter Methods
@@ -78,15 +105,15 @@ - (NSDictionary *) apiKeyPrefix {
 #pragma mark -
 
 - (NSDictionary *) authSettings {
-    return @{ 
-                @"api_key": @{
-                    @"type": @"api_key",
-                    @"in": @"header",
-                    @"key": @"api_key",
-                    @"value": [self getApiKeyWithPrefix:@"api_key"]
-                },
-              
-            };
+    return @{
+               @"api_key":
+                   @{
+                       @"type": @"api_key",
+                       @"in": @"header",
+                       @"key": @"api_key",
+                       @"value": [self getApiKeyWithPrefix:@"api_key"]
+                   },
+               };
 }
 
 @end
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGJSONRequestSerializer.h b/samples/client/petstore/objc/SwaggerClient/SWGJSONRequestSerializer.h
new file mode 100644
index 00000000000..49dd7fca3e2
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/SWGJSONRequestSerializer.h
@@ -0,0 +1,5 @@
+#import <Foundation/Foundation.h>
+#import <AFNetworking/AFURLRequestSerialization.h>
+
+@interface SWGJSONRequestSerializer : AFJSONRequestSerializer
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGJSONRequestSerializer.m b/samples/client/petstore/objc/SwaggerClient/SWGJSONRequestSerializer.m
new file mode 100644
index 00000000000..631a20a5a6e
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/SWGJSONRequestSerializer.m
@@ -0,0 +1,35 @@
+#import "SWGJSONRequestSerializer.h"
+
+@implementation SWGJSONRequestSerializer
+
+///
+/// When customize a request serializer,
+/// the serializer must conform the protocol `AFURLRequestSerialization`
+/// and implements the protocol method `requestBySerializingRequest:withParameters:error:`
+///
+/// @param request    The original request.
+/// @param parameters The parameters to be encoded.
+/// @param error      The error that occurred while attempting to encode the request parameters.
+///
+/// @return A serialized request.
+///
+- (NSURLRequest *)requestBySerializingRequest:(NSURLRequest *)request
+                               withParameters:(id)parameters
+                                        error:(NSError *__autoreleasing *)error
+{
+    // If the body data which will be serialized isn't NSArray or NSDictionary
+    // then put the data in the http request body directly.
+    if ([parameters isKindOfClass:[NSArray class]] || [parameters isKindOfClass:[NSDictionary class]]) {
+        return [super requestBySerializingRequest:request withParameters:parameters error:error];
+    } else {
+        NSMutableURLRequest *mutableRequest = [request mutableCopy];
+        
+        if (parameters) {
+            [mutableRequest setHTTPBody:[parameters dataUsingEncoding:self.stringEncoding]];
+        }
+        
+        return mutableRequest;
+    }
+}
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGJSONResponseSerializer.h b/samples/client/petstore/objc/SwaggerClient/SWGJSONResponseSerializer.h
new file mode 100644
index 00000000000..16cda122217
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/SWGJSONResponseSerializer.h
@@ -0,0 +1,6 @@
+#import <Foundation/Foundation.h>
+#import <AFNetworking/AFURLResponseSerialization.h>
+
+@interface SWGJSONResponseSerializer : AFJSONResponseSerializer
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGJSONResponseSerializer.m b/samples/client/petstore/objc/SwaggerClient/SWGJSONResponseSerializer.m
new file mode 100644
index 00000000000..a2dd21bcf5d
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/SWGJSONResponseSerializer.m
@@ -0,0 +1,39 @@
+#import "SWGJSONResponseSerializer.h"
+
+static BOOL JSONParseError(NSError *error) {
+    if ([error.domain isEqualToString:NSCocoaErrorDomain] && error.code == 3840) {
+        return YES;
+    }
+    
+    return NO;
+}
+
+@implementation SWGJSONResponseSerializer
+
+///
+/// When customize a response serializer,
+/// the serializer must conform the protocol `AFURLResponseSerialization`
+/// and implements the protocol method `responseObjectForResponse:error:`
+///
+/// @param response The response to be processed.
+/// @param data     The response data to be decoded.
+/// @param error    The error that occurred while attempting to decode the respnse data.
+///
+/// @return The object decoded from the specified response data.
+///
+- (id) responseObjectForResponse:(NSURLResponse *)response
+                            data:(NSData *)data
+                           error:(NSError *__autoreleasing *)error {
+    NSDictionary *responseJson = [super responseObjectForResponse:response data:data error:error];
+
+    // if response data is not a valid json, return string of data.
+    if (JSONParseError(*error)) {
+        *error = nil;
+        NSString *responseString = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+        return responseString;
+    }
+    
+    return responseJson;
+}
+
+@end
diff --git a/modules/swagger-codegen/src/main/resources/objc/SWGObject.h b/samples/client/petstore/objc/SwaggerClient/SWGObject.h
similarity index 69%
rename from modules/swagger-codegen/src/main/resources/objc/SWGObject.h
rename to samples/client/petstore/objc/SwaggerClient/SWGObject.h
index ccec208abc0..fb27b4a4ebb 100644
--- a/modules/swagger-codegen/src/main/resources/objc/SWGObject.h
+++ b/samples/client/petstore/objc/SwaggerClient/SWGObject.h
@@ -1,5 +1,5 @@
 #import <Foundation/Foundation.h>
-#import "JSONModel.h"
+#import <JSONModel/JSONModel.h>
 
 @interface SWGObject : JSONModel
 @end
diff --git a/modules/swagger-codegen/src/main/resources/objc/SWGObject.m b/samples/client/petstore/objc/SwaggerClient/SWGObject.m
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/objc/SWGObject.m
rename to samples/client/petstore/objc/SwaggerClient/SWGObject.m
diff --git a/samples/client/petstore/objc/client/SWGOrder.h b/samples/client/petstore/objc/SwaggerClient/SWGOrder.h
similarity index 62%
rename from samples/client/petstore/objc/client/SWGOrder.h
rename to samples/client/petstore/objc/SwaggerClient/SWGOrder.h
index c4f4f6e81ad..48a7cf0d6c1 100644
--- a/samples/client/petstore/objc/client/SWGOrder.h
+++ b/samples/client/petstore/objc/SwaggerClient/SWGOrder.h
@@ -1,10 +1,17 @@
 #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 SWGOrder
 @end
-  
+
 @interface SWGOrder : SWGObject
 
 
@@ -19,6 +26,6 @@
  */
 @property(nonatomic) NSString* status;
 
-@property(nonatomic) BOOL complete;
+@property(nonatomic) NSNumber* complete;
 
 @end
diff --git a/samples/client/petstore/objc/client/SWGOrder.m b/samples/client/petstore/objc/SwaggerClient/SWGOrder.m
similarity index 53%
rename from samples/client/petstore/objc/client/SWGOrder.m
rename to samples/client/petstore/objc/SwaggerClient/SWGOrder.m
index 5d3179446ed..83fe5741cd7 100644
--- a/samples/client/petstore/objc/client/SWGOrder.m
+++ b/samples/client/petstore/objc/SwaggerClient/SWGOrder.m
@@ -1,12 +1,21 @@
 #import "SWGOrder.h"
 
 @implementation SWGOrder
-  
+
+/**
+ * Maps json key to property name.
+ * This method is used by `JSONModel`.
+ */
 + (JSONKeyMapper *)keyMapper
 {
   return [[JSONKeyMapper alloc] initWithDictionary:@{ @"id": @"_id", @"petId": @"petId", @"quantity": @"quantity", @"shipDate": @"shipDate", @"status": @"status", @"complete": @"complete" }];
 }
 
+/**
+ * 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 = @[@"_id", @"petId", @"quantity", @"shipDate", @"status", @"complete"];
@@ -19,4 +28,12 @@ + (BOOL)propertyIsOptional:(NSString *)propertyName
   }
 }
 
+/**
+ * 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/client/SWGPet.h b/samples/client/petstore/objc/SwaggerClient/SWGPet.h
similarity index 63%
rename from samples/client/petstore/objc/client/SWGPet.h
rename to samples/client/petstore/objc/SwaggerClient/SWGPet.h
index 73ff540386d..84f10969e5b 100644
--- a/samples/client/petstore/objc/client/SWGPet.h
+++ b/samples/client/petstore/objc/SwaggerClient/SWGPet.h
@@ -1,12 +1,19 @@
 #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 "SWGCategory.h"
 #import "SWGTag.h"
 
 
 @protocol SWGPet
 @end
-  
+
 @interface SWGPet : SWGObject
 
 
@@ -16,7 +23,7 @@
 
 @property(nonatomic) NSString* name;
 
-@property(nonatomic) NSArray* photoUrls;
+@property(nonatomic) NSArray* /* NSString */ photoUrls;
 
 @property(nonatomic) NSArray<SWGTag>* tags;
 /* pet status in the store [optional]
diff --git a/samples/client/petstore/objc/client/SWGPet.m b/samples/client/petstore/objc/SwaggerClient/SWGPet.m
similarity index 51%
rename from samples/client/petstore/objc/client/SWGPet.m
rename to samples/client/petstore/objc/SwaggerClient/SWGPet.m
index d5559aa6f72..3fd315ab011 100644
--- a/samples/client/petstore/objc/client/SWGPet.m
+++ b/samples/client/petstore/objc/SwaggerClient/SWGPet.m
@@ -1,12 +1,21 @@
 #import "SWGPet.h"
 
 @implementation SWGPet
-  
+
+/**
+ * Maps json key to property name.
+ * This method is used by `JSONModel`.
+ */
 + (JSONKeyMapper *)keyMapper
 {
   return [[JSONKeyMapper alloc] initWithDictionary:@{ @"id": @"_id", @"category": @"category", @"name": @"name", @"photoUrls": @"photoUrls", @"tags": @"tags", @"status": @"status" }];
 }
 
+/**
+ * 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 = @[@"_id", @"category", @"tags", @"status"];
@@ -19,4 +28,12 @@ + (BOOL)propertyIsOptional:(NSString *)propertyName
   }
 }
 
+/**
+ * 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/SWGPetApi.h b/samples/client/petstore/objc/SwaggerClient/SWGPetApi.h
new file mode 100644
index 00000000000..f7e67d0aa1f
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/SWGPetApi.h
@@ -0,0 +1,152 @@
+#import <Foundation/Foundation.h>
+#import "SWGPet.h"
+#import "SWGObject.h"
+#import "SWGApiClient.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.
+ */
+
+@interface SWGPetApi: NSObject
+
+@property(nonatomic, assign)SWGApiClient *apiClient;
+
+-(instancetype) initWithApiClient:(SWGApiClient *)apiClient;
+-(void) addHeader:(NSString*)value forKey:(NSString*)key;
+-(unsigned long) requestQueueSize;
++(SWGPetApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key;
+///
+///
+/// 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
+/// 
+///
+/// @param body Pet object that needs to be added to the store
+/// 
+///
+/// @return 
+-(NSNumber*) addPetWithCompletionBlock :(SWGPet*) body 
+    
+    
+    completionHandler: (void (^)(NSError* error))completionBlock;
+
+
+///
+///
+/// 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 NSArray<SWGPet>*
+-(NSNumber*) findPetsByStatusWithCompletionBlock :(NSArray* /* NSString */) status 
+    
+    completionHandler: (void (^)(NSArray<SWGPet>* output, NSError* error))completionBlock;
+    
+
+
+///
+///
+/// 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 NSArray<SWGPet>*
+-(NSNumber*) findPetsByTagsWithCompletionBlock :(NSArray* /* NSString */) tags 
+    
+    completionHandler: (void (^)(NSArray<SWGPet>* output, NSError* error))completionBlock;
+    
+
+
+///
+///
+/// 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 SWGPet*
+-(NSNumber*) getPetByIdWithCompletionBlock :(NSNumber*) petId 
+    
+    completionHandler: (void (^)(SWGPet* output, NSError* error))completionBlock;
+    
+
+
+///
+///
+/// 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 
+-(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;
+
+
+///
+///
+/// uploads an image
+/// 
+///
+/// @param petId ID of pet to update
+/// @param additionalMetadata Additional data to pass to server
+/// @param file file to upload
+/// 
+///
+/// @return 
+-(NSNumber*) uploadFileWithCompletionBlock :(NSNumber*) petId 
+     additionalMetadata:(NSString*) additionalMetadata 
+     file:(NSURL*) file 
+    
+    
+    completionHandler: (void (^)(NSError* error))completionBlock;
+
+
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGPetApi.m b/samples/client/petstore/objc/SwaggerClient/SWGPetApi.m
new file mode 100644
index 00000000000..d79584f90bf
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/SWGPetApi.m
@@ -0,0 +1,772 @@
+#import "SWGPetApi.h"
+#import "SWGQueryParamCollection.h"
+#import "SWGPet.h"
+
+
+@interface SWGPetApi ()
+    @property (readwrite, nonatomic, strong) NSMutableDictionary *defaultHeaders;
+@end
+
+@implementation SWGPetApi
+
+#pragma mark - Initialize methods
+
+- (id) init {
+    self = [super init];
+    if (self) {
+        SWGConfiguration *config = [SWGConfiguration sharedConfig];
+        if (config.apiClient == nil) {
+            config.apiClient = [[SWGApiClient alloc] init];
+        }
+        self.apiClient = config.apiClient;
+        self.defaultHeaders = [NSMutableDictionary dictionary];
+    }
+    return self;
+}
+
+- (id) initWithApiClient:(SWGApiClient *)apiClient {
+    self = [super init];
+    if (self) {
+        self.apiClient = apiClient;
+        self.defaultHeaders = [NSMutableDictionary dictionary];
+    }
+    return self;
+}
+
+#pragma mark -
+
++(SWGPetApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key {
+    static SWGPetApi* singletonAPI = nil;
+
+    if (singletonAPI == nil) {
+        singletonAPI = [[SWGPetApi alloc] init];
+        [singletonAPI addHeader:headerValue forKey:key];
+    }
+    return singletonAPI;
+}
+
+-(void) addHeader:(NSString*)value forKey:(NSString*)key {
+    [self.defaultHeaders setValue:value forKey:key];
+}
+
+-(void) setHeaderValue:(NSString*) value
+           forKey:(NSString*)key {
+    [self.defaultHeaders setValue:value forKey:key];
+}
+
+-(unsigned long) requestQueueSize {
+    return [SWGApiClient requestQueueSize];
+}
+
+#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
+///
+///  @returns void
+///
+-(NSNumber*) addPetWithCompletionBlock: (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: @"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);
+                  
+              }
+          ];
+}
+
+///
+/// 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 = @[@"petstore_auth", @"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
+/// 
+///  @param petId ID of pet that needs to be updated
+///
+///  @param name Updated name of the pet
+///
+///  @param status Updated status of the pet
+///
+///  @returns void
+///
+-(NSNumber*) updatePetWithFormWithCompletionBlock: (NSString*) petId
+         name: (NSString*) name
+         status: (NSString*) status
+        
+        
+        completionHandler: (void (^)(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 `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 *files = [[NSMutableDictionary alloc] init];
+    
+    
+    
+    if (name) {
+        formParams[@"name"] = name;
+    }
+    
+    
+    
+    if (status) {
+        formParams[@"status"] = status;
+    }
+    
+    
+    
+
+    
+    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);
+                  
+              }
+          ];
+}
+
+///
+/// Deletes a pet
+/// 
+///  @param petId Pet id to delete
+///
+///  @param apiKey 
+///
+///  @returns void
+///
+-(NSNumber*) deletePetWithCompletionBlock: (NSNumber*) petId
+         apiKey: (NSString*) apiKey
+        
+        
+        completionHandler: (void (^)(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 `deletePet`"];
+    }
+    
+
+    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];
+
+    if(apiKey != nil)
+        headerParams[@"api_key"] = apiKey;
+    
+
+    // 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: @"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);
+                  
+              }
+          ];
+}
+
+///
+/// uploads an image
+/// 
+///  @param petId ID of pet to update
+///
+///  @param additionalMetadata Additional data to pass to server
+///
+///  @param file file to upload
+///
+///  @returns void
+///
+-(NSNumber*) uploadFileWithCompletionBlock: (NSNumber*) petId
+         additionalMetadata: (NSString*) additionalMetadata
+         file: (NSURL*) file
+        
+        
+        completionHandler: (void (^)(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 `uploadFile`"];
+    }
+    
+
+    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/pet/{petId}/uploadImage"];
+
+    // 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:@[@"multipart/form-data"]];
+
+    // Authentication setting
+    NSArray *authSettings = @[@"petstore_auth"];
+
+    id bodyParam = nil;
+    NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *files = [[NSMutableDictionary alloc] init];
+    
+    
+    
+    if (additionalMetadata) {
+        formParams[@"additionalMetadata"] = additionalMetadata;
+    }
+    
+    
+    
+    files[@"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);
+                  
+              }
+          ];
+}
+
+
+
+@end
diff --git a/modules/swagger-codegen/src/main/resources/objc/SWGQueryParamCollection.h b/samples/client/petstore/objc/SwaggerClient/SWGQueryParamCollection.h
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/objc/SWGQueryParamCollection.h
rename to samples/client/petstore/objc/SwaggerClient/SWGQueryParamCollection.h
diff --git a/modules/swagger-codegen/src/main/resources/objc/SWGQueryParamCollection.m b/samples/client/petstore/objc/SwaggerClient/SWGQueryParamCollection.m
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/objc/SWGQueryParamCollection.m
rename to samples/client/petstore/objc/SwaggerClient/SWGQueryParamCollection.m
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGStoreApi.h b/samples/client/petstore/objc/SwaggerClient/SWGStoreApi.h
new file mode 100644
index 00000000000..09e67e38ed0
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/SWGStoreApi.h
@@ -0,0 +1,80 @@
+#import <Foundation/Foundation.h>
+#import "SWGOrder.h"
+#import "SWGObject.h"
+#import "SWGApiClient.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.
+ */
+
+@interface SWGStoreApi: NSObject
+
+@property(nonatomic, assign)SWGApiClient *apiClient;
+
+-(instancetype) initWithApiClient:(SWGApiClient *)apiClient;
+-(void) addHeader:(NSString*)value forKey:(NSString*)key;
+-(unsigned long) requestQueueSize;
++(SWGStoreApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key;
+///
+///
+/// Returns pet inventories by status
+/// Returns a map of status codes to quantities
+///
+/// 
+///
+/// @return NSDictionary* /* NSString, NSNumber */
+-(NSNumber*) getInventoryWithCompletionBlock :
+    (void (^)(NSDictionary* /* NSString, NSNumber */ output, NSError* error))completionBlock;
+    
+
+
+///
+///
+/// Place an order for a pet
+/// 
+///
+/// @param body order placed for purchasing the pet
+/// 
+///
+/// @return SWGOrder*
+-(NSNumber*) placeOrderWithCompletionBlock :(SWGOrder*) body 
+    
+    completionHandler: (void (^)(SWGOrder* output, NSError* error))completionBlock;
+    
+
+
+///
+///
+/// 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
+/// 
+///
+/// @return SWGOrder*
+-(NSNumber*) getOrderByIdWithCompletionBlock :(NSString*) orderId 
+    
+    completionHandler: (void (^)(SWGOrder* output, NSError* error))completionBlock;
+    
+
+
+///
+///
+/// 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*) deleteOrderWithCompletionBlock :(NSString*) orderId 
+    
+    
+    completionHandler: (void (^)(NSError* error))completionBlock;
+
+
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGStoreApi.m b/samples/client/petstore/objc/SwaggerClient/SWGStoreApi.m
new file mode 100644
index 00000000000..792147ebed1
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/SWGStoreApi.m
@@ -0,0 +1,390 @@
+#import "SWGStoreApi.h"
+#import "SWGQueryParamCollection.h"
+#import "SWGOrder.h"
+
+
+@interface SWGStoreApi ()
+    @property (readwrite, nonatomic, strong) NSMutableDictionary *defaultHeaders;
+@end
+
+@implementation SWGStoreApi
+
+#pragma mark - Initialize methods
+
+- (id) init {
+    self = [super init];
+    if (self) {
+        SWGConfiguration *config = [SWGConfiguration sharedConfig];
+        if (config.apiClient == nil) {
+            config.apiClient = [[SWGApiClient alloc] init];
+        }
+        self.apiClient = config.apiClient;
+        self.defaultHeaders = [NSMutableDictionary dictionary];
+    }
+    return self;
+}
+
+- (id) initWithApiClient:(SWGApiClient *)apiClient {
+    self = [super init];
+    if (self) {
+        self.apiClient = apiClient;
+        self.defaultHeaders = [NSMutableDictionary dictionary];
+    }
+    return self;
+}
+
+#pragma mark -
+
++(SWGStoreApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key {
+    static SWGStoreApi* singletonAPI = nil;
+
+    if (singletonAPI == nil) {
+        singletonAPI = [[SWGStoreApi alloc] init];
+        [singletonAPI addHeader:headerValue forKey:key];
+    }
+    return singletonAPI;
+}
+
+-(void) addHeader:(NSString*)value forKey:(NSString*)key {
+    [self.defaultHeaders setValue:value forKey:key];
+}
+
+-(void) setHeaderValue:(NSString*) value
+           forKey:(NSString*)key {
+    [self.defaultHeaders setValue:value forKey:key];
+}
+
+-(unsigned long) requestQueueSize {
+    return [SWGApiClient requestQueueSize];
+}
+
+#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
+///
+///  @returns void
+///
+-(NSNumber*) deleteOrderWithCompletionBlock: (NSString*) orderId
+        
+        
+        completionHandler: (void (^)(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 `deleteOrder`"];
+    }
+    
+
+    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: @"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);
+                  
+              }
+          ];
+}
+
+
+
+@end
diff --git a/samples/client/petstore/objc/client/SWGTag.h b/samples/client/petstore/objc/SwaggerClient/SWGTag.h
similarity index 52%
rename from samples/client/petstore/objc/client/SWGTag.h
rename to samples/client/petstore/objc/SwaggerClient/SWGTag.h
index d9cc84be270..97e95807550 100644
--- a/samples/client/petstore/objc/client/SWGTag.h
+++ b/samples/client/petstore/objc/SwaggerClient/SWGTag.h
@@ -1,10 +1,17 @@
 #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 SWGTag
 @end
-  
+
 @interface SWGTag : SWGObject
 
 
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGTag.m b/samples/client/petstore/objc/SwaggerClient/SWGTag.m
new file mode 100644
index 00000000000..3bcb9973dfd
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/SWGTag.m
@@ -0,0 +1,39 @@
+#import "SWGTag.h"
+
+@implementation SWGTag
+
+/**
+ * Maps json key to property name.
+ * This method is used by `JSONModel`.
+ */
++ (JSONKeyMapper *)keyMapper
+{
+  return [[JSONKeyMapper alloc] initWithDictionary:@{ @"id": @"_id", @"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 = @[@"_id", @"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/client/SWGUser.h b/samples/client/petstore/objc/SwaggerClient/SWGUser.h
similarity index 73%
rename from samples/client/petstore/objc/client/SWGUser.h
rename to samples/client/petstore/objc/SwaggerClient/SWGUser.h
index f505ca2c041..6ba19e632b8 100644
--- a/samples/client/petstore/objc/client/SWGUser.h
+++ b/samples/client/petstore/objc/SwaggerClient/SWGUser.h
@@ -1,10 +1,17 @@
 #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 SWGUser
 @end
-  
+
 @interface SWGUser : SWGObject
 
 
diff --git a/samples/client/petstore/objc/client/SWGUser.m b/samples/client/petstore/objc/SwaggerClient/SWGUser.m
similarity index 56%
rename from samples/client/petstore/objc/client/SWGUser.m
rename to samples/client/petstore/objc/SwaggerClient/SWGUser.m
index 060b65ffa12..d040a6bce6d 100644
--- a/samples/client/petstore/objc/client/SWGUser.m
+++ b/samples/client/petstore/objc/SwaggerClient/SWGUser.m
@@ -1,12 +1,21 @@
 #import "SWGUser.h"
 
 @implementation SWGUser
-  
+
+/**
+ * Maps json key to property name.
+ * This method is used by `JSONModel`.
+ */
 + (JSONKeyMapper *)keyMapper
 {
   return [[JSONKeyMapper alloc] initWithDictionary:@{ @"id": @"_id", @"username": @"username", @"firstName": @"firstName", @"lastName": @"lastName", @"email": @"email", @"password": @"password", @"phone": @"phone", @"userStatus": @"userStatus" }];
 }
 
+/**
+ * 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 = @[@"_id", @"username", @"firstName", @"lastName", @"email", @"password", @"phone", @"userStatus"];
@@ -19,4 +28,12 @@ + (BOOL)propertyIsOptional:(NSString *)propertyName
   }
 }
 
+/**
+ * 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/client/SWGUserApi.h b/samples/client/petstore/objc/SwaggerClient/SWGUserApi.h
similarity index 56%
rename from samples/client/petstore/objc/client/SWGUserApi.h
rename to samples/client/petstore/objc/SwaggerClient/SWGUserApi.h
index e6e73ddfba6..a6e69a8947d 100644
--- a/samples/client/petstore/objc/client/SWGUserApi.h
+++ b/samples/client/petstore/objc/SwaggerClient/SWGUserApi.h
@@ -4,6 +4,12 @@
 #import "SWGApiClient.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.
+ */
+
 @interface SWGUserApi: NSObject
 
 @property(nonatomic, assign)SWGApiClient *apiClient;
@@ -12,67 +18,61 @@
 -(void) addHeader:(NSString*)value forKey:(NSString*)key;
 -(unsigned long) requestQueueSize;
 +(SWGUserApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key;
-+(void) setBasePath:(NSString*)basePath;
-+(NSString*) getBasePath;
-/**
-
- Create user
- This can only be done by the logged in user.
-
- @param body Created user object
- 
-
- return type: 
- */
+///
+///
+/// Create user
+/// This can only be done by the logged in user.
+///
+/// @param body Created user object
+/// 
+///
+/// @return 
 -(NSNumber*) createUserWithCompletionBlock :(SWGUser*) body 
     
     
     completionHandler: (void (^)(NSError* error))completionBlock;
 
 
-/**
-
- Creates list of users with given input array
- 
-
- @param body List of user object
- 
-
- return type: 
- */
+///
+///
+/// Creates list of users with given input array
+/// 
+///
+/// @param body List of user object
+/// 
+///
+/// @return 
 -(NSNumber*) createUsersWithArrayInputWithCompletionBlock :(NSArray<SWGUser>*) body 
     
     
     completionHandler: (void (^)(NSError* error))completionBlock;
 
 
-/**
-
- Creates list of users with given input array
- 
-
- @param body List of user object
- 
-
- return type: 
- */
+///
+///
+/// Creates list of users with given input array
+/// 
+///
+/// @param body List of user object
+/// 
+///
+/// @return 
 -(NSNumber*) createUsersWithListInputWithCompletionBlock :(NSArray<SWGUser>*) body 
     
     
     completionHandler: (void (^)(NSError* error))completionBlock;
 
 
-/**
-
- Logs user into the system
- 
-
- @param username The user name for login
- @param password The password for login in clear text
- 
-
- return type: NSString*
- */
+///
+///
+/// Logs user into the system
+/// 
+///
+/// @param username The user name for login
+/// @param password The password for login in clear text
+/// 
+///
+/// @return NSString*
 -(NSNumber*) loginUserWithCompletionBlock :(NSString*) username 
      password:(NSString*) password 
     
@@ -80,47 +80,44 @@
     
 
 
-/**
-
- Logs out current logged in user session
- 
-
- 
-
- return type: 
- */
+///
+///
+/// Logs out current logged in user session
+/// 
+///
+/// 
+///
+/// @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 type: SWGUser*
- */
+///
+///
+/// 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;
     
 
 
-/**
-
- 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 type: 
- */
+///
+///
+/// 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 
 -(NSNumber*) updateUserWithCompletionBlock :(NSString*) username 
      body:(SWGUser*) body 
     
@@ -128,16 +125,15 @@
     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 type: 
- */
+///
+///
+/// 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 
     
     
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGUserApi.m b/samples/client/petstore/objc/SwaggerClient/SWGUserApi.m
new file mode 100644
index 00000000000..92dd00fa28d
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/SWGUserApi.m
@@ -0,0 +1,724 @@
+#import "SWGUserApi.h"
+#import "SWGQueryParamCollection.h"
+#import "SWGUser.h"
+
+
+@interface SWGUserApi ()
+    @property (readwrite, nonatomic, strong) NSMutableDictionary *defaultHeaders;
+@end
+
+@implementation SWGUserApi
+
+#pragma mark - Initialize methods
+
+- (id) init {
+    self = [super init];
+    if (self) {
+        SWGConfiguration *config = [SWGConfiguration sharedConfig];
+        if (config.apiClient == nil) {
+            config.apiClient = [[SWGApiClient alloc] init];
+        }
+        self.apiClient = config.apiClient;
+        self.defaultHeaders = [NSMutableDictionary dictionary];
+    }
+    return self;
+}
+
+- (id) initWithApiClient:(SWGApiClient *)apiClient {
+    self = [super init];
+    if (self) {
+        self.apiClient = apiClient;
+        self.defaultHeaders = [NSMutableDictionary dictionary];
+    }
+    return self;
+}
+
+#pragma mark -
+
++(SWGUserApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key {
+    static SWGUserApi* singletonAPI = nil;
+
+    if (singletonAPI == nil) {
+        singletonAPI = [[SWGUserApi alloc] init];
+        [singletonAPI addHeader:headerValue forKey:key];
+    }
+    return singletonAPI;
+}
+
+-(void) addHeader:(NSString*)value forKey:(NSString*)key {
+    [self.defaultHeaders setValue:value forKey:key];
+}
+
+-(void) setHeaderValue:(NSString*) value
+           forKey:(NSString*)key {
+    [self.defaultHeaders setValue:value forKey:key];
+}
+
+-(unsigned long) requestQueueSize {
+    return [SWGApiClient requestQueueSize];
+}
+
+#pragma mark - Api Methods
+
+///
+/// Create user
+/// This can only be done by the logged in user.
+///  @param body Created user object
+///
+///  @returns void
+///
+-(NSNumber*) createUserWithCompletionBlock: (SWGUser*) body
+        
+        
+        completionHandler: (void (^)(NSError* error))completionBlock { 
+
+    
+
+    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/user"];
+
+    // 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: nil
+                                      completionBlock: ^(id data, NSError *error) {
+                  completionBlock(error);
+                  
+              }
+          ];
+}
+
+///
+/// Creates list of users with given input array
+/// 
+///  @param body List of user object
+///
+///  @returns void
+///
+-(NSNumber*) createUsersWithArrayInputWithCompletionBlock: (NSArray<SWGUser>*) body
+        
+        
+        completionHandler: (void (^)(NSError* error))completionBlock { 
+
+    
+
+    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/user/createWithArray"];
+
+    // 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: nil
+                                      completionBlock: ^(id data, NSError *error) {
+                  completionBlock(error);
+                  
+              }
+          ];
+}
+
+///
+/// Creates list of users with given input array
+/// 
+///  @param body List of user object
+///
+///  @returns void
+///
+-(NSNumber*) createUsersWithListInputWithCompletionBlock: (NSArray<SWGUser>*) body
+        
+        
+        completionHandler: (void (^)(NSError* error))completionBlock { 
+
+    
+
+    NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"/user/createWithList"];
+
+    // 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: nil
+                                      completionBlock: ^(id data, NSError *error) {
+                  completionBlock(error);
+                  
+              }
+          ];
+}
+
+///
+/// Logs user into the system
+/// 
+///  @param username The user name for login
+///
+///  @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 { 
+
+    
+
+    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 *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: nil
+                                      completionBlock: ^(id data, NSError *error) {
+                  completionBlock(error);
+                  
+              }
+          ];
+}
+
+///
+/// Get user by user name
+/// 
+///  @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 { 
+        
+
+    
+    // verify the required parameter 'username' is set
+    if (username == nil) {
+        [NSException raise:@"Invalid parameter" format:@"Missing the required parameter `username` when calling `getUserByName`"];
+    }
+    
+
+    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: @"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);
+              }
+          ];
+}
+
+///
+/// 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
+///
+///  @returns void
+///
+-(NSNumber*) updateUserWithCompletionBlock: (NSString*) username
+         body: (SWGUser*) body
+        
+        
+        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 `updateUser`"];
+    }
+    
+
+    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];
+    
+    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);
+                  
+              }
+          ];
+}
+
+
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClientTests/Podfile b/samples/client/petstore/objc/SwaggerClientTests/Podfile
new file mode 100644
index 00000000000..ea5cdb0e6e8
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClientTests/Podfile
@@ -0,0 +1,12 @@
+source 'https://github.com/CocoaPods/Specs.git'
+
+target 'SwaggerClient_Example', :exclusive => true do
+  pod "SwaggerClient", :path => "../"
+end
+
+target 'SwaggerClient_Tests', :exclusive => true do
+  pod "SwaggerClient", :path => "../"
+
+  pod 'Specta'
+  pod 'Expecta'
+end
diff --git a/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
new file mode 100644
index 00000000000..a5fe06f63b7
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
@@ -0,0 +1,595 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		158CE3AA214CB1B31C7ADC48 /* libPods-SwaggerClient_Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDEF5BA3CF9CFFDEB5A47DB4 /* libPods-SwaggerClient_Tests.a */; };
+		6003F58E195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; };
+		6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58F195388D20070C39A /* CoreGraphics.framework */; };
+		6003F592195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; };
+		6003F598195388D20070C39A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6003F596195388D20070C39A /* InfoPlist.strings */; };
+		6003F59A195388D20070C39A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 6003F599195388D20070C39A /* main.m */; };
+		6003F59E195388D20070C39A /* SWGAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6003F59D195388D20070C39A /* SWGAppDelegate.m */; };
+		6003F5A7195388D20070C39A /* SWGViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6003F5A6195388D20070C39A /* SWGViewController.m */; };
+		6003F5A9195388D20070C39A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6003F5A8195388D20070C39A /* Images.xcassets */; };
+		6003F5B0195388D20070C39A /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F5AF195388D20070C39A /* XCTest.framework */; };
+		6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; };
+		6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; };
+		6003F5BA195388D20070C39A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6003F5B8195388D20070C39A /* InfoPlist.strings */; };
+		6003F5BC195388D20070C39A /* Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6003F5BB195388D20070C39A /* Tests.m */; };
+		873B8AEB1B1F5CCA007FD442 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */; };
+		94BE6BE84795B5034A811E61 /* libPods-SwaggerClient_Example.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D46325ECAD48245C07F6733 /* libPods-SwaggerClient_Example.a */; };
+		CF0ADB481B5F95D6008A2729 /* PetTest.m in Sources */ = {isa = PBXBuildFile; fileRef = CF0ADB471B5F95D6008A2729 /* PetTest.m */; };
+		CF8F71391B5F73AC00162980 /* DeserializationTest.m in Sources */ = {isa = PBXBuildFile; fileRef = CF8F71381B5F73AC00162980 /* DeserializationTest.m */; };
+		CFDFB4121B3CFFA8009739C5 /* UserApiTest.m in Sources */ = {isa = PBXBuildFile; fileRef = CFDFB40D1B3CFEC3009739C5 /* UserApiTest.m */; };
+		CFDFB4131B3CFFDD009739C5 /* PetApiTest.m in Sources */ = {isa = PBXBuildFile; fileRef = CFDFB40A1B3CFEC3009739C5 /* PetApiTest.m */; };
+		CFDFB4141B3CFFF6009739C5 /* StoreApiTest.m in Sources */ = {isa = PBXBuildFile; fileRef = CFDFB40B1B3CFEC3009739C5 /* StoreApiTest.m */; };
+		CFDFB4151B3D000B009739C5 /* SWGApiClientTest.m in Sources */ = {isa = PBXBuildFile; fileRef = CFDFB40C1B3CFEC3009739C5 /* SWGApiClientTest.m */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		6003F5B3195388D20070C39A /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 6003F582195388D10070C39A /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 6003F589195388D20070C39A;
+			remoteInfo = SwaggerClient;
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXFileReference section */
+		1A81C3BE3E54961CD827EAE3 /* Pods-SwaggerClient_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwaggerClient_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-SwaggerClient_Tests/Pods-SwaggerClient_Tests.release.xcconfig"; sourceTree = "<group>"; };
+		4CCE21315897B7D544C83242 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
+		6003F58A195388D20070C39A /* SwaggerClient_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SwaggerClient_Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		6003F58D195388D20070C39A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		6003F58F195388D20070C39A /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
+		6003F591195388D20070C39A /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
+		6003F595195388D20070C39A /* SwaggerClient-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SwaggerClient-Info.plist"; sourceTree = "<group>"; };
+		6003F597195388D20070C39A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		6003F599195388D20070C39A /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+		6003F59B195388D20070C39A /* SwaggerClient-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SwaggerClient-Prefix.pch"; sourceTree = "<group>"; };
+		6003F59C195388D20070C39A /* SWGAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SWGAppDelegate.h; sourceTree = "<group>"; };
+		6003F59D195388D20070C39A /* SWGAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SWGAppDelegate.m; sourceTree = "<group>"; };
+		6003F5A5195388D20070C39A /* SWGViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SWGViewController.h; sourceTree = "<group>"; };
+		6003F5A6195388D20070C39A /* SWGViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SWGViewController.m; sourceTree = "<group>"; };
+		6003F5A8195388D20070C39A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
+		6003F5AE195388D20070C39A /* SwaggerClient_Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SwaggerClient_Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		6003F5AF195388D20070C39A /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
+		6003F5B7195388D20070C39A /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = "<group>"; };
+		6003F5B9195388D20070C39A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		6003F5BB195388D20070C39A /* Tests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Tests.m; sourceTree = "<group>"; };
+		606FC2411953D9B200FFA9A0 /* Tests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tests-Prefix.pch"; sourceTree = "<group>"; };
+		73CCD82196AABD64F2807C7B /* Pods-SwaggerClient_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwaggerClient_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-SwaggerClient_Tests/Pods-SwaggerClient_Tests.debug.xcconfig"; sourceTree = "<group>"; };
+		873B8AEA1B1F5CCA007FD442 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
+		8D46325ECAD48245C07F6733 /* libPods-SwaggerClient_Example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-SwaggerClient_Example.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		BFB4BE760737508B3CFC23B2 /* Pods-SwaggerClient_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwaggerClient_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-SwaggerClient_Example/Pods-SwaggerClient_Example.release.xcconfig"; sourceTree = "<group>"; };
+		CF0ADB471B5F95D6008A2729 /* PetTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PetTest.m; sourceTree = "<group>"; };
+		CF8F71381B5F73AC00162980 /* DeserializationTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DeserializationTest.m; sourceTree = "<group>"; };
+		CFDFB40A1B3CFEC3009739C5 /* PetApiTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PetApiTest.m; sourceTree = "<group>"; };
+		CFDFB40B1B3CFEC3009739C5 /* StoreApiTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StoreApiTest.m; sourceTree = "<group>"; };
+		CFDFB40C1B3CFEC3009739C5 /* SWGApiClientTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGApiClientTest.m; sourceTree = "<group>"; };
+		CFDFB40D1B3CFEC3009739C5 /* UserApiTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserApiTest.m; sourceTree = "<group>"; };
+		E445A633FA767F207D7EE6CE /* Pods-SwaggerClient_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwaggerClient_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-SwaggerClient_Example/Pods-SwaggerClient_Example.debug.xcconfig"; sourceTree = "<group>"; };
+		E9675D953C6DCDE71A1BDFD4 /* SwaggerClient.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = SwaggerClient.podspec; path = ../SwaggerClient.podspec; sourceTree = "<group>"; };
+		FDEF5BA3CF9CFFDEB5A47DB4 /* libPods-SwaggerClient_Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-SwaggerClient_Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		6003F587195388D20070C39A /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */,
+				6003F592195388D20070C39A /* UIKit.framework in Frameworks */,
+				6003F58E195388D20070C39A /* Foundation.framework in Frameworks */,
+				94BE6BE84795B5034A811E61 /* libPods-SwaggerClient_Example.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		6003F5AB195388D20070C39A /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				6003F5B0195388D20070C39A /* XCTest.framework in Frameworks */,
+				6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */,
+				6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */,
+				158CE3AA214CB1B31C7ADC48 /* libPods-SwaggerClient_Tests.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		6003F581195388D10070C39A = {
+			isa = PBXGroup;
+			children = (
+				60FF7A9C1954A5C5007DD14C /* Podspec Metadata */,
+				6003F593195388D20070C39A /* Example for SwaggerClient */,
+				6003F5B5195388D20070C39A /* Tests */,
+				6003F58C195388D20070C39A /* Frameworks */,
+				6003F58B195388D20070C39A /* Products */,
+				CCE77F10C6D41F74B075ECD0 /* Pods */,
+			);
+			sourceTree = "<group>";
+		};
+		6003F58B195388D20070C39A /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				6003F58A195388D20070C39A /* SwaggerClient_Example.app */,
+				6003F5AE195388D20070C39A /* SwaggerClient_Tests.xctest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		6003F58C195388D20070C39A /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				6003F58D195388D20070C39A /* Foundation.framework */,
+				6003F58F195388D20070C39A /* CoreGraphics.framework */,
+				6003F591195388D20070C39A /* UIKit.framework */,
+				6003F5AF195388D20070C39A /* XCTest.framework */,
+				8D46325ECAD48245C07F6733 /* libPods-SwaggerClient_Example.a */,
+				FDEF5BA3CF9CFFDEB5A47DB4 /* libPods-SwaggerClient_Tests.a */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		6003F593195388D20070C39A /* Example for SwaggerClient */ = {
+			isa = PBXGroup;
+			children = (
+				6003F59C195388D20070C39A /* SWGAppDelegate.h */,
+				6003F59D195388D20070C39A /* SWGAppDelegate.m */,
+				873B8AEA1B1F5CCA007FD442 /* Main.storyboard */,
+				6003F5A5195388D20070C39A /* SWGViewController.h */,
+				6003F5A6195388D20070C39A /* SWGViewController.m */,
+				6003F5A8195388D20070C39A /* Images.xcassets */,
+				6003F594195388D20070C39A /* Supporting Files */,
+			);
+			name = "Example for SwaggerClient";
+			path = SwaggerClient;
+			sourceTree = "<group>";
+		};
+		6003F594195388D20070C39A /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				6003F595195388D20070C39A /* SwaggerClient-Info.plist */,
+				6003F596195388D20070C39A /* InfoPlist.strings */,
+				6003F599195388D20070C39A /* main.m */,
+				6003F59B195388D20070C39A /* SwaggerClient-Prefix.pch */,
+			);
+			name = "Supporting Files";
+			sourceTree = "<group>";
+		};
+		6003F5B5195388D20070C39A /* Tests */ = {
+			isa = PBXGroup;
+			children = (
+				CFDFB40A1B3CFEC3009739C5 /* PetApiTest.m */,
+				CFDFB40B1B3CFEC3009739C5 /* StoreApiTest.m */,
+				CFDFB40C1B3CFEC3009739C5 /* SWGApiClientTest.m */,
+				CF0ADB471B5F95D6008A2729 /* PetTest.m */,
+				CF8F71381B5F73AC00162980 /* DeserializationTest.m */,
+				CFDFB40D1B3CFEC3009739C5 /* UserApiTest.m */,
+				6003F5BB195388D20070C39A /* Tests.m */,
+				6003F5B6195388D20070C39A /* Supporting Files */,
+			);
+			path = Tests;
+			sourceTree = "<group>";
+		};
+		6003F5B6195388D20070C39A /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				6003F5B7195388D20070C39A /* Tests-Info.plist */,
+				6003F5B8195388D20070C39A /* InfoPlist.strings */,
+				606FC2411953D9B200FFA9A0 /* Tests-Prefix.pch */,
+			);
+			name = "Supporting Files";
+			sourceTree = "<group>";
+		};
+		60FF7A9C1954A5C5007DD14C /* Podspec Metadata */ = {
+			isa = PBXGroup;
+			children = (
+				E9675D953C6DCDE71A1BDFD4 /* SwaggerClient.podspec */,
+				4CCE21315897B7D544C83242 /* README.md */,
+			);
+			name = "Podspec Metadata";
+			sourceTree = "<group>";
+		};
+		CCE77F10C6D41F74B075ECD0 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				E445A633FA767F207D7EE6CE /* Pods-SwaggerClient_Example.debug.xcconfig */,
+				BFB4BE760737508B3CFC23B2 /* Pods-SwaggerClient_Example.release.xcconfig */,
+				73CCD82196AABD64F2807C7B /* Pods-SwaggerClient_Tests.debug.xcconfig */,
+				1A81C3BE3E54961CD827EAE3 /* Pods-SwaggerClient_Tests.release.xcconfig */,
+			);
+			name = Pods;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		6003F589195388D20070C39A /* SwaggerClient_Example */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 6003F5BF195388D20070C39A /* Build configuration list for PBXNativeTarget "SwaggerClient_Example" */;
+			buildPhases = (
+				799E7E29D924C30424DFBA28 /* Check Pods Manifest.lock */,
+				6003F586195388D20070C39A /* Sources */,
+				6003F587195388D20070C39A /* Frameworks */,
+				6003F588195388D20070C39A /* Resources */,
+				429AF5C69E165ED75311B4B0 /* Copy Pods Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = SwaggerClient_Example;
+			productName = SwaggerClient;
+			productReference = 6003F58A195388D20070C39A /* SwaggerClient_Example.app */;
+			productType = "com.apple.product-type.application";
+		};
+		6003F5AD195388D20070C39A /* SwaggerClient_Tests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 6003F5C2195388D20070C39A /* Build configuration list for PBXNativeTarget "SwaggerClient_Tests" */;
+			buildPhases = (
+				7B069562A9F91E498732474F /* Check Pods Manifest.lock */,
+				6003F5AA195388D20070C39A /* Sources */,
+				6003F5AB195388D20070C39A /* Frameworks */,
+				6003F5AC195388D20070C39A /* Resources */,
+				E337D7E459CCFFDF27046FFC /* Copy Pods Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				6003F5B4195388D20070C39A /* PBXTargetDependency */,
+			);
+			name = SwaggerClient_Tests;
+			productName = SwaggerClientTests;
+			productReference = 6003F5AE195388D20070C39A /* SwaggerClient_Tests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		6003F582195388D10070C39A /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				CLASSPREFIX = SWG;
+				LastUpgradeCheck = 0510;
+				ORGANIZATIONNAME = geekerzp;
+			};
+			buildConfigurationList = 6003F585195388D10070C39A /* Build configuration list for PBXProject "SwaggerClient" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = 6003F581195388D10070C39A;
+			productRefGroup = 6003F58B195388D20070C39A /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				6003F589195388D20070C39A /* SwaggerClient_Example */,
+				6003F5AD195388D20070C39A /* SwaggerClient_Tests */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		6003F588195388D20070C39A /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				873B8AEB1B1F5CCA007FD442 /* Main.storyboard in Resources */,
+				6003F5A9195388D20070C39A /* Images.xcassets in Resources */,
+				6003F598195388D20070C39A /* InfoPlist.strings in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		6003F5AC195388D20070C39A /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				6003F5BA195388D20070C39A /* InfoPlist.strings in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		429AF5C69E165ED75311B4B0 /* 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-SwaggerClient_Example/Pods-SwaggerClient_Example-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		799E7E29D924C30424DFBA28 /* 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;
+		};
+		7B069562A9F91E498732474F /* 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;
+		};
+		E337D7E459CCFFDF27046FFC /* 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-SwaggerClient_Tests/Pods-SwaggerClient_Tests-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		6003F586195388D20070C39A /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				6003F59E195388D20070C39A /* SWGAppDelegate.m in Sources */,
+				6003F5A7195388D20070C39A /* SWGViewController.m in Sources */,
+				6003F59A195388D20070C39A /* main.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		6003F5AA195388D20070C39A /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				CFDFB4141B3CFFF6009739C5 /* StoreApiTest.m in Sources */,
+				CF0ADB481B5F95D6008A2729 /* PetTest.m in Sources */,
+				CFDFB4131B3CFFDD009739C5 /* PetApiTest.m in Sources */,
+				6003F5BC195388D20070C39A /* Tests.m in Sources */,
+				CFDFB4151B3D000B009739C5 /* SWGApiClientTest.m in Sources */,
+				CFDFB4121B3CFFA8009739C5 /* UserApiTest.m in Sources */,
+				CF8F71391B5F73AC00162980 /* DeserializationTest.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		6003F5B4195388D20070C39A /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 6003F589195388D20070C39A /* SwaggerClient_Example */;
+			targetProxy = 6003F5B3195388D20070C39A /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin PBXVariantGroup section */
+		6003F596195388D20070C39A /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				6003F597195388D20070C39A /* en */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
+		6003F5B8195388D20070C39A /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				6003F5B9195388D20070C39A /* en */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		6003F5BD195388D20070C39A /* 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__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				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_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 = 7.1;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		6003F5BE195388D20070C39A /* 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__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = YES;
+				ENABLE_NS_ASSERTIONS = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				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 = 7.1;
+				SDKROOT = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		6003F5C0195388D20070C39A /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = E445A633FA767F207D7EE6CE /* Pods-SwaggerClient_Example.debug.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "SwaggerClient/SwaggerClient-Prefix.pch";
+				INFOPLIST_FILE = "SwaggerClient/SwaggerClient-Info.plist";
+				MODULE_NAME = ExampleApp;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				WRAPPER_EXTENSION = app;
+			};
+			name = Debug;
+		};
+		6003F5C1195388D20070C39A /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = BFB4BE760737508B3CFC23B2 /* Pods-SwaggerClient_Example.release.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "SwaggerClient/SwaggerClient-Prefix.pch";
+				INFOPLIST_FILE = "SwaggerClient/SwaggerClient-Info.plist";
+				MODULE_NAME = ExampleApp;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				WRAPPER_EXTENSION = app;
+			};
+			name = Release;
+		};
+		6003F5C3195388D20070C39A /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 73CCD82196AABD64F2807C7B /* Pods-SwaggerClient_Tests.debug.xcconfig */;
+			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(SDKROOT)/Developer/Library/Frameworks",
+					"$(inherited)",
+					"$(DEVELOPER_FRAMEWORKS_DIR)",
+				);
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "Tests/Tests-Prefix.pch";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				INFOPLIST_FILE = "Tests/Tests-Info.plist";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				WRAPPER_EXTENSION = xctest;
+			};
+			name = Debug;
+		};
+		6003F5C4195388D20070C39A /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 1A81C3BE3E54961CD827EAE3 /* Pods-SwaggerClient_Tests.release.xcconfig */;
+			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(SDKROOT)/Developer/Library/Frameworks",
+					"$(inherited)",
+					"$(DEVELOPER_FRAMEWORKS_DIR)",
+				);
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "Tests/Tests-Prefix.pch";
+				INFOPLIST_FILE = "Tests/Tests-Info.plist";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				WRAPPER_EXTENSION = xctest;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		6003F585195388D10070C39A /* Build configuration list for PBXProject "SwaggerClient" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				6003F5BD195388D20070C39A /* Debug */,
+				6003F5BE195388D20070C39A /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		6003F5BF195388D20070C39A /* Build configuration list for PBXNativeTarget "SwaggerClient_Example" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				6003F5C0195388D20070C39A /* Debug */,
+				6003F5C1195388D20070C39A /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		6003F5C2195388D20070C39A /* Build configuration list for PBXNativeTarget "SwaggerClient_Tests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				6003F5C3195388D20070C39A /* Debug */,
+				6003F5C4195388D20070C39A /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 6003F582195388D10070C39A /* Project object */;
+}
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata
similarity index 68%
rename from samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata
rename to samples/client/petstore/objc/SwaggerClientTests/SwaggerClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata
index 59618cad9c0..13bdd8ab8b7 100644
--- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -2,6 +2,6 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "self:PetstoreClient.xcodeproj">
+      location = "self:SwaggerClient.xcodeproj">
    </FileRef>
 </Workspace>
diff --git a/samples/client/petstore/objc/PetstoreClient.xcworkspace/xcshareddata/PetstoreClient.xccheckout b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient.xcodeproj/project.xcworkspace/xcshareddata/SwaggerClient.xccheckout
similarity index 77%
rename from samples/client/petstore/objc/PetstoreClient.xcworkspace/xcshareddata/PetstoreClient.xccheckout
rename to samples/client/petstore/objc/SwaggerClientTests/SwaggerClient.xcodeproj/project.xcworkspace/xcshareddata/SwaggerClient.xccheckout
index fafd21fb8eb..879945048b3 100644
--- a/samples/client/petstore/objc/PetstoreClient.xcworkspace/xcshareddata/PetstoreClient.xccheckout
+++ b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient.xcodeproj/project.xcworkspace/xcshareddata/SwaggerClient.xccheckout
@@ -5,23 +5,23 @@
 	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
 	<false/>
 	<key>IDESourceControlProjectIdentifier</key>
-	<string>81EB09FA-DD8C-4FE1-82D3-1FB6FF0D9C43</string>
+	<string>303FE0A9-4715-4C57-8D01-F604EF82CF6D</string>
 	<key>IDESourceControlProjectName</key>
-	<string>PetstoreClient</string>
+	<string>SwaggerClient</string>
 	<key>IDESourceControlProjectOriginsDictionary</key>
 	<dict>
 		<key>E5BBF0AA85077C865C95437976D06D819733A208</key>
-		<string>ssh://github.com/wordnik/swagger-codegen.git</string>
+		<string>https://github.com/geekerzp/swagger-codegen.git</string>
 	</dict>
 	<key>IDESourceControlProjectPath</key>
-	<string>samples/client/petstore/objc/PetstoreClient.xcworkspace</string>
+	<string>samples/client/petstore/objc/SwaggerClientTests/SwaggerClient.xcodeproj</string>
 	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
 	<dict>
 		<key>E5BBF0AA85077C865C95437976D06D819733A208</key>
-		<string>../../../../..</string>
+		<string>../../../../../../..</string>
 	</dict>
 	<key>IDESourceControlProjectURL</key>
-	<string>ssh://github.com/wordnik/swagger-codegen.git</string>
+	<string>https://github.com/geekerzp/swagger-codegen.git</string>
 	<key>IDESourceControlProjectVersion</key>
 	<integer>111</integer>
 	<key>IDESourceControlProjectWCCIdentifier</key>
diff --git a/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient.xcodeproj/project.xcworkspace/xcuserdata/geekerzp.xcuserdatad/UserInterfaceState.xcuserstate b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient.xcodeproj/project.xcworkspace/xcuserdata/geekerzp.xcuserdatad/UserInterfaceState.xcuserstate
new file mode 100644
index 00000000000..4b91a2c5500
Binary files /dev/null and b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient.xcodeproj/project.xcworkspace/xcuserdata/geekerzp.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/xcuserdata/tony.xcuserdatad/xcschemes/PetstoreClient.xcscheme b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient.xcodeproj/xcshareddata/xcschemes/SwaggerClient-Example.xcscheme
similarity index 66%
rename from samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/xcuserdata/tony.xcuserdatad/xcschemes/PetstoreClient.xcscheme
rename to samples/client/petstore/objc/SwaggerClientTests/SwaggerClient.xcodeproj/xcshareddata/xcschemes/SwaggerClient-Example.xcscheme
index fd55bb26268..d34e508f438 100644
--- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/xcuserdata/tony.xcuserdatad/xcschemes/PetstoreClient.xcscheme
+++ b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient.xcodeproj/xcshareddata/xcschemes/SwaggerClient-Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0500"
+   LastUpgradeVersion = "0600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,10 +14,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "EA6699951811D2FA00A70D03"
-               BuildableName = "PetstoreClient.app"
-               BlueprintName = "PetstoreClient"
-               ReferencedContainer = "container:PetstoreClient.xcodeproj">
+               BlueprintIdentifier = "6003F589195388D20070C39A"
+               BuildableName = "SwaggerClient_Example.app"
+               BlueprintName = "SwaggerClient_Example"
+               ReferencedContainer = "container:SwaggerClient.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -32,20 +32,20 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "EA6699B91811D2FB00A70D03"
-               BuildableName = "PetstoreClientTests.xctest"
-               BlueprintName = "PetstoreClientTests"
-               ReferencedContainer = "container:PetstoreClient.xcodeproj">
+               BlueprintIdentifier = "6003F5AD195388D20070C39A"
+               BuildableName = "SwaggerClient_Tests.xctest"
+               BlueprintName = "SwaggerClient_Tests"
+               ReferencedContainer = "container:SwaggerClient.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "EA6699951811D2FA00A70D03"
-            BuildableName = "PetstoreClient.app"
-            BlueprintName = "PetstoreClient"
-            ReferencedContainer = "container:PetstoreClient.xcodeproj">
+            BlueprintIdentifier = "6003F589195388D20070C39A"
+            BuildableName = "SwaggerClient_Example.app"
+            BlueprintName = "SwaggerClient_Example"
+            ReferencedContainer = "container:SwaggerClient.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </TestAction>
@@ -62,10 +62,10 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "EA6699951811D2FA00A70D03"
-            BuildableName = "PetstoreClient.app"
-            BlueprintName = "PetstoreClient"
-            ReferencedContainer = "container:PetstoreClient.xcodeproj">
+            BlueprintIdentifier = "6003F589195388D20070C39A"
+            BuildableName = "SwaggerClient_Example.app"
+            BlueprintName = "SwaggerClient_Example"
+            ReferencedContainer = "container:SwaggerClient.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
       <AdditionalOptions>
@@ -81,10 +81,10 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "EA6699951811D2FA00A70D03"
-            BuildableName = "PetstoreClient.app"
-            BlueprintName = "PetstoreClient"
-            ReferencedContainer = "container:PetstoreClient.xcodeproj">
+            BlueprintIdentifier = "6003F589195388D20070C39A"
+            BuildableName = "SwaggerClient_Example.app"
+            BlueprintName = "SwaggerClient_Example"
+            ReferencedContainer = "container:SwaggerClient.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </ProfileAction>
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/xcuserdata/geekerzp.xcuserdatad/xcschemes/xcschememanagement.plist b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient.xcodeproj/xcuserdata/geekerzp.xcuserdatad/xcschemes/xcschememanagement.plist
similarity index 60%
rename from samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/xcuserdata/geekerzp.xcuserdatad/xcschemes/xcschememanagement.plist
rename to samples/client/petstore/objc/SwaggerClientTests/SwaggerClient.xcodeproj/xcuserdata/geekerzp.xcuserdatad/xcschemes/xcschememanagement.plist
index 912710bdccc..adfa137d3e3 100644
--- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/xcuserdata/geekerzp.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient.xcodeproj/xcuserdata/geekerzp.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -2,22 +2,14 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>PetstoreClient.xcscheme</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>4</integer>
-		</dict>
-	</dict>
 	<key>SuppressBuildableAutocreation</key>
 	<dict>
-		<key>EA6699951811D2FA00A70D03</key>
+		<key>6003F589195388D20070C39A</key>
 		<dict>
 			<key>primary</key>
 			<true/>
 		</dict>
-		<key>EA6699B91811D2FB00A70D03</key>
+		<key>6003F5AD195388D20070C39A</key>
 		<dict>
 			<key>primary</key>
 			<true/>
diff --git a/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/Images.xcassets/AppIcon.appiconset/Contents.json b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/Images.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 00000000000..f697f61f4aa
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,53 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "2x"
+    },
+    {
+      "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"
+  }
+}
diff --git a/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/Images.xcassets/LaunchImage.launchimage/Contents.json b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/Images.xcassets/LaunchImage.launchimage/Contents.json
new file mode 100644
index 00000000000..4458b40c055
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/Images.xcassets/LaunchImage.launchimage/Contents.json
@@ -0,0 +1,51 @@
+{
+  "images" : [
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "subtype" : "retina4",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/Main.storyboard b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/Main.storyboard
new file mode 100644
index 00000000000..f204320d333
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/Main.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="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="whP-gf-Uak">
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="wQg-tq-qST">
+            <objects>
+                <viewController id="whP-gf-Uak" customClass="SWGViewController" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="uEw-UM-LJ8"/>
+                        <viewControllerLayoutGuide type="bottom" id="Mvr-aV-6Um"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="TpU-gO-2f1">
+                        <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="calibratedWhite"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="tc2-Qw-aMS" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="305" y="433"/>
+        </scene>
+    </scenes>
+</document>
diff --git a/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/SWGAppDelegate.h b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/SWGAppDelegate.h
new file mode 100644
index 00000000000..eb867594fde
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/SWGAppDelegate.h
@@ -0,0 +1,15 @@
+//
+//  SWGAppDelegate.h
+//  SwaggerClient
+//
+//  Created by CocoaPods on 06/26/2015.
+//  Copyright (c) 2014 geekerzp. All rights reserved.
+//
+
+@import UIKit;
+
+@interface SWGAppDelegate : UIResponder <UIApplicationDelegate>
+
+@property (strong, nonatomic) UIWindow *window;
+
+@end
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/AppDelegate.m b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/SWGAppDelegate.m
similarity index 90%
rename from samples/client/petstore/objc/PetstoreClient/PetstoreClient/AppDelegate.m
rename to samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/SWGAppDelegate.m
index a63c7d1ad89..492c6026d6b 100644
--- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/AppDelegate.m
+++ b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/SWGAppDelegate.m
@@ -1,14 +1,14 @@
 //
-//  AppDelegate.m
-//  PetstoreClient
+//  SWGAppDelegate.m
+//  SwaggerClient
 //
-//  Created by Tony Tam on 10/18/13.
-//  Copyright (c) 2015 SmartBear Software. All rights reserved.
+//  Created by CocoaPods on 06/26/2015.
+//  Copyright (c) 2014 geekerzp. All rights reserved.
 //
 
-#import "AppDelegate.h"
+#import "SWGAppDelegate.h"
 
-@implementation AppDelegate
+@implementation SWGAppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
diff --git a/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/SWGViewController.h b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/SWGViewController.h
new file mode 100644
index 00000000000..7847f2d05b1
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/SWGViewController.h
@@ -0,0 +1,13 @@
+//
+//  SWGViewController.h
+//  SwaggerClient
+//
+//  Created by geekerzp on 06/26/2015.
+//  Copyright (c) 2014 geekerzp. All rights reserved.
+//
+
+@import UIKit;
+
+@interface SWGViewController : UIViewController
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/SWGViewController.m b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/SWGViewController.m
new file mode 100644
index 00000000000..ab7f6e8f72e
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/SWGViewController.m
@@ -0,0 +1,56 @@
+//
+//  SWGViewController.m
+//  SwaggerClient
+//
+//  Created by geekerzp on 06/26/2015.
+//  Copyright (c) 2014 geekerzp. All rights reserved.
+//
+
+#import "SWGViewController.h"
+#import <SwaggerClient/SWGApiClient.h>
+#import <SwaggerClient/SWGPet.h>
+#import <SwaggerClient/SWGPetApi.h>
+#import <SwaggerClient/SWGConfiguration.h>
+
+@interface SWGViewController ()
+
+@end
+
+@implementation SWGViewController
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+}
+
+- (void)didReceiveMemoryWarning
+{
+    [super didReceiveMemoryWarning];
+}
+
+- (SWGPet*) createPet {
+    SWGPet * pet = [[SWGPet alloc] init];
+    pet._id = [[NSNumber alloc] initWithLong:[[NSDate date] timeIntervalSince1970]];
+    pet.name = @"monkey";
+    
+    SWGCategory * category = [[SWGCategory alloc] init];
+    category._id = [[NSNumber alloc] initWithInteger:arc4random_uniform(100000)];
+    category.name = @"super-happy";
+    pet.category = category;
+    
+    SWGTag *tag1 = [[SWGTag alloc] init];
+    tag1._id = [[NSNumber alloc] initWithInteger:arc4random_uniform(100000)];
+    tag1.name = @"test tag 1";
+    SWGTag *tag2 = [[SWGTag alloc] init];
+    tag2._id = [[NSNumber alloc] initWithInteger:arc4random_uniform(100000)];
+    tag2.name = @"test tag 2";
+    pet.tags = (NSArray<SWGTag> *)[[NSArray alloc] initWithObjects:tag1, tag2, nil];
+
+    pet.status = @"available";
+
+    NSArray * photos = [[NSArray alloc] initWithObjects:@"http://foo.bar.com/3", @"http://foo.bar.com/4", nil];
+    pet.photoUrls = photos;
+    return pet;
+}
+
+@end
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/PetstoreClient-Info.plist b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/SwaggerClient-Info.plist
similarity index 89%
rename from samples/client/petstore/objc/PetstoreClient/PetstoreClient/PetstoreClient-Info.plist
rename to samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/SwaggerClient-Info.plist
index 7296c17fbf8..d2cd320c27d 100644
--- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/PetstoreClient-Info.plist
+++ b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/SwaggerClient-Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.reverb.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -25,9 +25,7 @@
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIMainStoryboardFile</key>
-	<string>Main_iPhone</string>
-	<key>UIMainStoryboardFile~ipad</key>
-	<string>Main_iPad</string>
+	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/PetstoreClient-Prefix.pch b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/SwaggerClient-Prefix.pch
similarity index 69%
rename from samples/client/petstore/objc/PetstoreClient/PetstoreClient/PetstoreClient-Prefix.pch
rename to samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/SwaggerClient-Prefix.pch
index 80b02fc3cad..7825372cbdd 100644
--- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/PetstoreClient-Prefix.pch
+++ b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/SwaggerClient-Prefix.pch
@@ -11,7 +11,6 @@
 #endif
 
 #ifdef __OBJC__
-    #import <UIKit/UIKit.h>
-    #import <Foundation/Foundation.h>
-    #import <SystemConfiguration/SystemConfiguration.h>
+    @import UIKit;
+    @import Foundation;
 #endif
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/en.lproj/InfoPlist.strings b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/en.lproj/InfoPlist.strings
similarity index 100%
rename from samples/client/petstore/objc/PetstoreClient/PetstoreClient/en.lproj/InfoPlist.strings
rename to samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/en.lproj/InfoPlist.strings
diff --git a/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/main.m b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/main.m
new file mode 100644
index 00000000000..4a47f1fd69e
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient/main.m
@@ -0,0 +1,17 @@
+//
+//  main.m
+//  SwaggerClient
+//
+//  Created by geekerzp on 06/26/2015.
+//  Copyright (c) 2014 geekerzp. All rights reserved.
+//
+
+@import UIKit;
+#import "SWGAppDelegate.h"
+
+int main(int argc, char * argv[])
+{
+    @autoreleasepool {
+        return UIApplicationMain(argc, argv, nil, NSStringFromClass([SWGAppDelegate class]));
+    }
+}
diff --git a/samples/client/petstore/objc/SwaggerClientTests/Tests/DeserializationTest.m b/samples/client/petstore/objc/SwaggerClientTests/Tests/DeserializationTest.m
new file mode 100644
index 00000000000..0460a4be4af
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClientTests/Tests/DeserializationTest.m
@@ -0,0 +1,165 @@
+#import <UIKit/UIKit.h>
+#import <XCTest/XCTest.h>
+#import <SwaggerClient/SWGApiClient.h>
+#import <SwaggerClient/SWGPet.h>
+
+@interface DeserializationTest : XCTestCase {
+
+@private SWGApiClient *apiClient;
+    
+}
+
+@end
+
+@implementation DeserializationTest
+
+- (void)setUp {
+    [super setUp];
+    apiClient = [[SWGApiClient alloc] init];
+}
+
+- (void)testDeserializeDate {
+    NSString *dateStr = @"2012-09-27";
+    
+    NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+    NSTimeZone *timezone = [NSTimeZone timeZoneWithName:@"UTC"];
+    [formatter setTimeZone:timezone];
+    [formatter setDateFormat:@"yyyy-MM-dd"];
+    NSDate *date = [formatter dateFromString:dateStr];
+    
+    NSDate *deserializedDate = [apiClient deserialize:dateStr class:@"NSDate*"];
+    
+    XCTAssertEqualWithAccuracy([date timeIntervalSinceReferenceDate], [deserializedDate timeIntervalSinceReferenceDate], 0.001);
+}
+
+- (void)testDeserializeDateTime {
+    NSString *dateTimeStr = @"1997-07-16T19:20:30+00:00";
+    
+    NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+    [formatter setDateFormat:@"yyyy-MM-dd'T'HH:mm:ssZ"];
+    NSDate *dateTime = [formatter dateFromString:dateTimeStr];
+    
+    NSDate *deserializedDateTime = [apiClient deserialize:dateTimeStr class:@"NSDate*"];
+    
+    XCTAssertEqualWithAccuracy([dateTime timeIntervalSinceReferenceDate], [deserializedDateTime timeIntervalSinceReferenceDate], 0.001);
+}
+
+- (void)testDeserializeObject {
+    XCTAssertTrue([[apiClient deserialize:@"" class:@"NSObject*"] isKindOfClass:[NSObject class]]);
+}
+
+- (void)testDeserializeString {
+    NSString *data = @"test string";
+    NSString *result = [apiClient deserialize:data class:@"NSString*"];
+    
+    XCTAssertTrue([result isEqualToString:data]);
+}
+
+- (void)testDeserializeListOfString {
+    NSArray *data = @[@"test string"];
+    NSArray *result = [apiClient deserialize:data class:@"NSArray* /* NSString */"];
+    
+    XCTAssertTrue([result isKindOfClass:[NSArray class]]);
+    XCTAssertTrue([result[0] isKindOfClass:[NSString class]]);
+}
+
+- (void)testDeserializeListOfModels {
+    NSArray *data =
+    @[
+      @{
+          @"id": @119,
+          @"category": @{
+                  @"id": @0,
+                  @"name": @"string"
+                  },
+          @"name": @"doggie",
+          @"photoUrls": @[
+                  @"string"
+                  ],
+          @"tags": @[
+                  @{
+                      @"id": @0,
+                      @"name": @"string"
+                      }
+                  ],
+          @"status": @"available"
+          
+          }];
+    
+    NSArray *result = [apiClient deserialize:data class:@"NSArray<SWGPet>*"];
+    
+    XCTAssertTrue([result isKindOfClass:[NSArray class]]);
+    XCTAssertTrue([[result firstObject] isKindOfClass:[SWGPet class]]);
+    XCTAssertEqualObjects([[result firstObject] _id], @119);
+}
+
+- (void)testDeserializeMapOfModels {
+    NSDictionary *data =
+    @{
+      @"pet": @{
+              @"id": @119,
+              @"category": @{
+                      @"id": @0,
+                      @"name": @"string"
+                      },
+              @"name": @"doggie",
+              @"photoUrls": @[
+                      @"string"
+                      ],
+              @"tags": @[
+                      @{
+                          @"id": @0,
+                          @"name": @"string"
+                          }
+                      ],
+              @"status": @"available"
+              
+              }
+      };
+    
+    NSDictionary *result = [apiClient deserialize:data class:@"NSDictionary* /* NSString, SWGPet */"];
+    
+    XCTAssertTrue([result isKindOfClass:[NSDictionary class]]);
+    XCTAssertTrue([result[@"pet"] isKindOfClass:[SWGPet class]]);
+    XCTAssertEqualObjects([result[@"pet"] _id], @119);
+}
+
+- (void)testDeserializeNestedMap {
+    NSDictionary *data =
+    @{
+      @"foo": @{
+              @"bar": @1
+              }
+    };
+    
+    NSDictionary *result = [apiClient deserialize:data class:@"NSDictionary* /* NSString, NSDictionary* /* NSString, NSNumber */ */"];
+    
+    XCTAssertTrue([result isKindOfClass:[NSDictionary class]]);
+    XCTAssertTrue([result[@"foo"] isKindOfClass:[NSDictionary class]]);
+    XCTAssertTrue([result[@"foo"][@"bar"] isKindOfClass:[NSNumber class]]);
+}
+
+- (void)testDeserializeNestedList {
+    NSArray *data = @[@[@"foo"]];
+    
+    NSArray *result = [apiClient deserialize:data class:@"NSArray* /* NSArray* /* NSString */ */"];
+    
+    XCTAssertTrue([result isKindOfClass:[NSArray class]]);
+    XCTAssertTrue([result[0] isKindOfClass:[NSArray class]]);
+    XCTAssertTrue([result[0][0] isKindOfClass:[NSString class]]);
+}
+
+- (void)testDeserializeBool {
+    NSString *data;
+    NSNumber *result;
+    
+    data = @"true";
+    result = [apiClient deserialize:data class:@"NSNumber*"];
+    XCTAssertTrue([result isEqual:@YES]);
+    
+    data = @"false";
+    result = [apiClient deserialize:data class:@"NSNumber*"];
+    XCTAssertTrue([result isEqual:@NO]);
+}
+
+@end
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/PetApiTest.m b/samples/client/petstore/objc/SwaggerClientTests/Tests/PetApiTest.m
similarity index 92%
rename from samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/PetApiTest.m
rename to samples/client/petstore/objc/SwaggerClientTests/Tests/PetApiTest.m
index 5b5f145cc12..f861cb0605e 100644
--- a/samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/PetApiTest.m
+++ b/samples/client/petstore/objc/SwaggerClientTests/Tests/PetApiTest.m
@@ -1,5 +1,14 @@
-#import "PetApiTest.h"
-#import "SWGFile.h"
+#import <XCTest/XCTest.h>
+#import <SwaggerClient/SWGApiClient.h>
+#import <SwaggerClient/SWGPetApi.h>
+#import <SwaggerClient/SWGPet.h>
+
+@interface PetApiTest : XCTestCase {
+@private
+    SWGPetApi * api;
+}
+
+@end
 
 @implementation PetApiTest
 
@@ -190,7 +199,7 @@ - (void)testDeletePet {
         if(error){
             XCTFail(@"got error %@", error);
         }
-        [api deletePetWithCompletionBlock:@"" petId:[NSString stringWithFormat:@"%@", [pet _id]] completionHandler:^(NSError *error) {
+        [api deletePetWithCompletionBlock:pet._id apiKey:@"" completionHandler:^(NSError *error) {
             if(error){
                 XCTFail(@"got error %@", error);
             }
@@ -210,14 +219,11 @@ - (void)testDeletePet {
 }
 
 - (void)testUploadFile {
-    XCTestExpectation *expectation = [self expectationWithDescription:@"testUploadFile"];
-
-    NSString* str = @"teststring";
-    NSData* data = [str dataUsingEncoding:NSUTF8StringEncoding];
+    XCTestExpectation *expectation = [self expectationWithDescription:@"testUploadWithFile"];
     
-    SWGFile * file = [[SWGFile alloc] initWithNameData: @"myFile.txt" mimeType:@"text/plain" data:data];
+    NSURL *fileURL = [self createTempFile];
     
-    [api uploadFileWithCompletionBlock:@1 additionalMetadata:@"special-metadata" file:file completionHandler:^(NSError *error) {
+    [api uploadFileWithCompletionBlock:@1 additionalMetadata:@"special-metadata" file:fileURL completionHandler:^(NSError *error) {
         if(error) {
             // good
             XCTFail(@"expected a failure");
@@ -269,4 +275,12 @@ - (SWGPet*) createPet {
     pet.photoUrls = photos;
     return pet;
 }
+
+- (NSURL *) createTempFile {
+    NSString *filePath = [NSTemporaryDirectory() stringByAppendingPathComponent:[NSString stringWithFormat:@"%@", [[NSProcessInfo processInfo] globallyUniqueString]]];
+    NSData *data = [@"test string" dataUsingEncoding:NSUTF8StringEncoding];
+    [data writeToFile:filePath atomically:YES];
+    
+    return [NSURL fileURLWithPath:filePath];
+}
 @end
diff --git a/samples/client/petstore/objc/SwaggerClientTests/Tests/PetTest.m b/samples/client/petstore/objc/SwaggerClientTests/Tests/PetTest.m
new file mode 100644
index 00000000000..9dbde13310b
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClientTests/Tests/PetTest.m
@@ -0,0 +1,37 @@
+#import <UIKit/UIKit.h>
+#import <XCTest/XCTest.h>
+#import <SwaggerClient/SWGPet.h>
+
+@interface PetTest : XCTestCase {
+
+@private SWGPet *pet;
+    
+}
+
+@end
+
+@implementation PetTest
+
+- (void)setUp {
+    [super setUp];
+    
+    NSDictionary *petDict = @{ @"id": @1, @"name": @"test pet",
+                               @"status": @"sold",
+                               @"photoUrls": @[@"string"],
+                               @"category": @{ @"id": @1, @"name": @"test category" },
+                               @"tags": @[ @{ @"id": @1, @"name": @"test tag" } ]};
+    pet = [[SWGPet alloc] initWithDictionary:petDict error:nil];
+}
+
+- (void)testDescription {
+    NSDictionary *petDict = @{ @"id": @1, @"name": @"test pet",
+                               @"status": @"sold",
+                               @"photoUrls": @[@"string"],
+                               @"category": @{ @"id": @1, @"name": @"test category" },
+                               @"tags": @[ @{ @"id": @1, @"name": @"test tag" } ]};
+    NSString *petStr = [petDict description];
+    
+    XCTAssertTrue([[pet description] isEqualToString:petStr]);
+}
+
+@end
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/SWGApiClientTest.m b/samples/client/petstore/objc/SwaggerClientTests/Tests/SWGApiClientTest.m
similarity index 57%
rename from samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/SWGApiClientTest.m
rename to samples/client/petstore/objc/SwaggerClientTests/Tests/SWGApiClientTest.m
index 61925b16960..e9f1a46af3b 100644
--- a/samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/SWGApiClientTest.m
+++ b/samples/client/petstore/objc/SwaggerClientTests/Tests/SWGApiClientTest.m
@@ -1,7 +1,12 @@
 #import <UIKit/UIKit.h>
 #import <XCTest/XCTest.h>
-#import "SWGApiClient.h"
-#import "SWGConfiguration.h"
+#import <ISO8601/ISO8601.h>
+#import <SwaggerClient/SWGApiClient.h>
+#import <SwaggerClient/SWGConfiguration.h>
+#import <SwaggerClient/SWGQueryParamCollection.h>
+#import <SwaggerClient/SWGPet.h>
+#import <SwaggerClient/SWGTag.h>
+#import <SwaggerClient/SWGCategory.h>
 
 @interface SWGApiClientTest : XCTestCase
 
@@ -61,8 +66,8 @@ - (void)testSelectHeaderContentType {
 
 - (void)testConfiguration {
     SWGConfiguration *config = [SWGConfiguration sharedConfig];
-    [config setValue:@"123456" forApiKeyField:@"api_key"];
-    [config setValue:@"PREFIX" forApiKeyPrefixField:@"api_key"];
+    [config setApiKey:@"123456" forApiKeyIdentifier:@"api_key"];
+    [config setApiKeyPrefix:@"PREFIX" forApiKeyPrefixIdentifier:@"api_key"];
     config.username = @"test_username";
     config.password = @"test_password";
     
@@ -98,4 +103,65 @@ - (void)testGetBasicAuthToken {
     XCTAssertEqualObjects(basicAuthCredentials, [config getBasicAuthToken]);
 }
 
+- (void)testSanitizeForSerialization {
+    id result;
+    id data;
+    
+    // nil
+    data = nil;
+    result = [self.apiClient sanitizeForSerialization:data];
+    XCTAssertEqualObjects(result, data);
+    
+    // NSString
+    data = @"test string";
+    result = [self.apiClient sanitizeForSerialization:data];
+    XCTAssertEqualObjects(result, data);
+    
+    // NSNumber
+    data = @1;
+    result = [self.apiClient sanitizeForSerialization:data];
+    XCTAssertEqualObjects(result, data);
+    
+    // SWGQueryParamCollection
+    data = [[SWGQueryParamCollection alloc] init];
+    result = [self.apiClient sanitizeForSerialization:data];
+    XCTAssertEqualObjects(result, data);
+    
+    // NSDate
+    data = [NSDate dateWithISO8601String:@"1997-07-16T19:20:30.45+01:00"];
+    result = [self.apiClient sanitizeForSerialization:data];
+    XCTAssertEqualObjects(result, [data ISO8601String]);
+    
+    data = [NSDate dateWithISO8601String:@"1997-07-16"];
+    result = [self.apiClient sanitizeForSerialization:data];
+    XCTAssertEqualObjects(result, [data ISO8601String]);
+    
+    // model
+    NSDictionary *petDict = @{@"id": @1, @"name": @"monkey",
+                              @"category": @{@"id": @1, @"name": @"test category"},
+                              @"tags": @[@{@"id": @1, @"name": @"test tag1"},
+                                         @{@"id": @2, @"name": @"test tag2"}],
+                              @"status": @"available",
+                              @"photoUrls": @[@"http://foo.bar.com/3", @"http://foo.bar.com/4"]};
+    data = [[SWGPet alloc] initWithDictionary:petDict error:nil];
+    result = [self.apiClient sanitizeForSerialization:data];
+    XCTAssertEqualObjects(result, petDict);
+    
+    // NSArray
+    data = @[@1];
+    result = [self.apiClient sanitizeForSerialization:data];
+    XCTAssertEqualObjects(result, data);
+    
+    // NSArray of models
+    NSArray *arrayOfPetDict = @[petDict];
+    data = [NSArray arrayWithObject:[[SWGPet alloc] initWithDictionary:petDict error:nil]];
+    result = [self.apiClient sanitizeForSerialization:data];
+    XCTAssertEqualObjects(result, arrayOfPetDict);
+    
+    // NSDictionary
+    data = @{@"test key": @"test value"};
+    result = [self.apiClient sanitizeForSerialization:data];
+    XCTAssertEqualObjects(result, data);
+}
+
 @end
diff --git a/samples/client/petstore/objc/SwaggerClientTests/Tests/StoreApiTest.m b/samples/client/petstore/objc/SwaggerClientTests/Tests/StoreApiTest.m
new file mode 100644
index 00000000000..9a250e1cb3a
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClientTests/Tests/StoreApiTest.m
@@ -0,0 +1,44 @@
+#import <UIKit/UIKit.h>
+#import <XCTest/XCTest.h>
+#import <SwaggerClient/SWGStoreApi.h>
+
+@interface StoreApiTest : XCTestCase
+
+@property (nonatomic) SWGStoreApi *api;
+
+@end
+
+@implementation StoreApiTest
+
+- (void)setUp {
+    [super setUp];
+    self.api = [[SWGStoreApi alloc] init];
+}
+
+- (void)tearDown {
+    [super tearDown];
+}
+
+- (void)testGetInventory {
+    XCTestExpectation *expectation = [self expectationWithDescription:@"testGetPetByStatus"];
+    
+    [self.api getInventoryWithCompletionBlock:^(NSDictionary *output, NSError *error) {
+        
+        if (error) {
+            XCTFail(@"got error %@", error);
+        }
+        
+        if (!output) {
+            XCTFail(@"failed to fetch inventory");
+        }
+        
+        XCTAssertNotNil(output.allKeys);
+        
+        [expectation fulfill];
+    }];
+    
+    [self waitForExpectationsWithTimeout:10.0 handler:nil];
+}
+
+
+@end
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/PetstoreClientTests-Info.plist b/samples/client/petstore/objc/SwaggerClientTests/Tests/Tests-Info.plist
similarity index 89%
rename from samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/PetstoreClientTests-Info.plist
rename to samples/client/petstore/objc/SwaggerClientTests/Tests/Tests-Info.plist
index f445ddd474d..41520eda89e 100644
--- a/samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/PetstoreClientTests-Info.plist
+++ b/samples/client/petstore/objc/SwaggerClientTests/Tests/Tests-Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.reverb.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
diff --git a/samples/client/petstore/objc/SwaggerClientTests/Tests/Tests-Prefix.pch b/samples/client/petstore/objc/SwaggerClientTests/Tests/Tests-Prefix.pch
new file mode 100644
index 00000000000..6d08c288215
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClientTests/Tests/Tests-Prefix.pch
@@ -0,0 +1,8 @@
+//  The contents of this file are implicitly included at the beginning of every test case source file.
+
+#ifdef __OBJC__
+
+  //@import Specta;
+  //@import Expecta;
+
+#endif
diff --git a/samples/client/petstore/objc/SwaggerClientTests/Tests/Tests.m b/samples/client/petstore/objc/SwaggerClientTests/Tests/Tests.m
new file mode 100644
index 00000000000..527c8abd348
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClientTests/Tests/Tests.m
@@ -0,0 +1,52 @@
+//
+//  SwaggerClientTests.m
+//  SwaggerClientTests
+//
+//  Created by geekerzp on 06/26/2015.
+//  Copyright (c) 2015 geekerzp. All rights reserved.
+//
+
+// https://github.com/Specta/Specta
+
+/**
+ * show cases for Specta
+ **
+ 
+SpecBegin(InitialSpecs)
+
+describe(@"these will fail", ^{
+
+    it(@"can do maths", ^{
+        expect(1).to.equal(2);
+    });
+
+    it(@"can read", ^{
+        expect(@"number").to.equal(@"string");
+    });
+    
+    it(@"will wait for 10 seconds and fail", ^{
+        waitUntil(^(DoneCallback done) {
+        
+        });
+    });
+});
+
+describe(@"these will pass", ^{
+    
+    it(@"can do maths", ^{
+        expect(1).beLessThan(23);
+    });
+    
+    it(@"can read", ^{
+        expect(@"team").toNot.contain(@"I");
+    });
+    
+    it(@"will wait and succeed", ^{
+        waitUntil(^(DoneCallback done) {
+            done();
+        });
+    });
+});
+
+SpecEnd
+*/
diff --git a/samples/client/petstore/objc/SwaggerClientTests/Tests/UserApiTest.m b/samples/client/petstore/objc/SwaggerClientTests/Tests/UserApiTest.m
new file mode 100644
index 00000000000..620a6922e9f
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClientTests/Tests/UserApiTest.m
@@ -0,0 +1,47 @@
+#import <UIKit/UIKit.h>
+#import <XCTest/XCTest.h>
+#import <SwaggerClient/SWGUserApi.h>
+
+@interface UserApiTest : XCTestCase
+
+@property (nonatomic) SWGUserApi *api;
+
+@end
+
+@implementation UserApiTest
+
+- (void)setUp {
+    [super setUp];
+    self.api = [[SWGUserApi alloc] init];
+}
+
+- (void)tearDown {
+    [super tearDown];
+}
+
+- (void)testLoginUser {
+    XCTestExpectation *expectation = [self expectationWithDescription:@"test login user"];
+    
+    [self.api loginUserWithCompletionBlock:@"test username" password:@"test password" completionHandler:^(NSString *output, NSError *error) {
+        if (error) {
+            XCTFail(@"got error %@", error);
+        }
+        
+        if (!output) {
+            XCTFail(@"response can't be nil");
+        }
+        
+        NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:@"logged in user"
+                                                                               options:0
+                                                                                 error:nil];
+        NSTextCheckingResult *match = [regex firstMatchInString:output
+                                                        options:0
+                                                          range:NSMakeRange(0, [output length])];
+        XCTAssertNotNil(match);
+        [expectation fulfill];
+    }];
+    
+    [self waitForExpectationsWithTimeout:10.0 handler:nil];
+}
+
+@end
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/en.lproj/InfoPlist.strings b/samples/client/petstore/objc/SwaggerClientTests/Tests/en.lproj/InfoPlist.strings
similarity index 100%
rename from samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/en.lproj/InfoPlist.strings
rename to samples/client/petstore/objc/SwaggerClientTests/Tests/en.lproj/InfoPlist.strings
diff --git a/samples/client/petstore/objc/pom.xml b/samples/client/petstore/objc/SwaggerClientTests/pom.xml
similarity index 94%
rename from samples/client/petstore/objc/pom.xml
rename to samples/client/petstore/objc/SwaggerClientTests/pom.xml
index 718ef5e1d6f..d1f461da7fd 100644
--- a/samples/client/petstore/objc/pom.xml
+++ b/samples/client/petstore/objc/SwaggerClientTests/pom.xml
@@ -49,9 +49,9 @@
                             <executable>xcodebuild</executable>
                             <arguments>
                                 <argument>-workspace</argument>
-                                <argument>PetstoreClient.xcworkspace</argument>
+                                <argument>SwaggerClient.xcworkspace</argument>
                                 <argument>-scheme</argument>
-                                <argument>PetstoreClient</argument>
+                                <argument>SwaggerClient-Example</argument>
                                 <argument>test</argument>
                                 <argument>-destination</argument>
                                 <argument>platform=iOS Simulator,name=iPhone 6,OS=8.3</argument>
diff --git a/samples/client/petstore/objc/client/SWGApiClient.h b/samples/client/petstore/objc/client/SWGApiClient.h
deleted file mode 100644
index 250811c4016..00000000000
--- a/samples/client/petstore/objc/client/SWGApiClient.h
+++ /dev/null
@@ -1,216 +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;
-
-/**
- * Get the Api Client instance from pool
- *
- * @param baseUrl The base url of api client.
- *
- * @return The SWGApiClient instance.
- */
-+(SWGApiClient *)sharedClientFromPool:(NSString *)baseUrl;
-
-/**
- * Get the operations queue
- *
- * @return The `shardQueue` static variable.
- */
-+(NSOperationQueue*) sharedQueue;
-
-/**
- * Turn on logging
- *
- * @param state logging state, must be `YES` or `NO`
- */
-+(void)setLoggingEnabled:(bool) state;
-
-/**
- * Clear Cache
- */
-+(void)clearCache;
-
-/**
- * Turn on cache
- *
- * @param enabled If the cached is enable, must be `YES` or `NO`
- */
-+(void)setCacheEnabled:(BOOL) enabled;
-
-/**
- * Get the request queue size
- *
- * @return The size of `queuedRequests` static variable.
- */
-+(unsigned long)requestQueueSize;
-
-/**
- * Set the client unreachable
- *
- * @param state off line state, must be `YES` or `NO` 
- */
-+(void) setOfflineState:(BOOL) state;
-
-/**
- * Get the client reachability
- *
- * @return The client reachability.
- */
-+(AFNetworkReachabilityStatus) getReachabilityStatus;
-
-/**
- * Get the next request id
- *
- * @return The next executed request id.
- */
-+(NSNumber*) nextRequestId;
-
-/**
- * Generate request id and add it to the queue
- *
- * @return The next executed request id.
- */
-+(NSNumber*) queueRequest;
-
-/**
- * Remove request id from the queue
- *
- * @param requestId The request which will be removed.
- */
-+(void) cancelRequest:(NSNumber*)requestId;
-
-/**
- * URL encode NSString
- *
- * @param unescaped The string which will be escaped.
- *
- * @return The escaped string.
- */
-+(NSString*) escape:(id)unescaped;
-
-/**
- * Customize the behavior when the reachability changed
- *
- * @param changeBlock The block will be executed when the reachability changed.
- */
-+(void) setReachabilityChangeBlock:(void(^)(int))changeBlock;
-
-/**
- * Set the client reachability strategy
- *
- * @param host The host of SWGApiClient.
- */
-+(void) configureCacheReachibilityForHost:(NSString*)host;
-
-/**
- * Detect Accept header from accepts NSArray
- *
- * @param accepts NSArray of header
- *
- * @return The Accept header
- */
-+(NSString *) selectHeaderAccept:(NSArray *)accepts;
-
-/**
- * Detect Content-Type header from contentTypes NSArray
- *
- * @param contentTypes NSArray of header
- *
- * @return The Content-Type header
- */
-+(NSString *) selectHeaderContentType:(NSArray *)contentTypes;
-
-/**
- * Set header for request
- *
- * @param value The header value
- * @param forKey The header key
- */
--(void)setHeaderValue:(NSString*) value
-               forKey:(NSString*) forKey;
-
-/**
- * Update header parameters and query parameters for authentication
- *
- * @param headers The header parameter will be udpated, passed by pointer to pointer.
- * @param querys The query parameters will be updated, passed by pointer to pointer.
- * @param authSettings The authentication names NSArray.
- */
-- (void) updateHeaderParams:(NSDictionary **)headers
-                queryParams:(NSDictionary **)querys
-           WithAuthSettings:(NSArray *)authSettings;
-
-/**
- * Perform request
- *
- * Request with non-empty response
- *
- * @param path Request url.
- * @param method Request method.
- * @param queryParams Request query parameters.
- * @param body Request body.
- * @param headerParams Request header parameters.
- * @param authSettings Request authentication names.
- * @param requestContentType Request content-type.
- * @param responseContentType Response content-type.
- * @param completionBlock The block will be executed when the request completed. 
- *
- * @return The request id.
- */
--(NSNumber*)  dictionary:(NSString*) path
-                  method:(NSString*) method
-             queryParams:(NSDictionary*) queryParams
-                    body:(id) body
-            headerParams:(NSDictionary*) headerParams
-            authSettings: (NSArray *) authSettings
-      requestContentType:(NSString*) requestContentType
-     responseContentType:(NSString*) responseContentType
-         completionBlock:(void (^)(NSDictionary*, NSError *))completionBlock;
-
-/**
- * Perform request
- *
- * Request with empty response
- *
- * @param path Request url.
- * @param method Request method.
- * @param queryParams Request query parameters.
- * @param body Request body.
- * @param headerParams Request header parameters.
- * @param authSettings Request authentication names.
- * @param requestContentType Request content-type.
- * @param responseContentType Response content-type.
- * @param completionBlock The block will be executed when the request completed. 
- *
- * @return The request id.
- */
--(NSNumber*)  stringWithCompletionBlock:(NSString*) path
-                                 method:(NSString*) method
-                            queryParams:(NSDictionary*) queryParams
-                                   body:(id) body
-                           headerParams:(NSDictionary*) headerParams
-                           authSettings: (NSArray *) authSettings
-                     requestContentType:(NSString*) requestContentType
-                    responseContentType:(NSString*) responseContentType
-                        completionBlock:(void (^)(NSString*, NSError *))completionBlock;
-@end
-
-
diff --git a/samples/client/petstore/objc/client/SWGApiClient.m b/samples/client/petstore/objc/client/SWGApiClient.m
deleted file mode 100644
index 5e2985bbe79..00000000000
--- a/samples/client/petstore/objc/client/SWGApiClient.m
+++ /dev/null
@@ -1,685 +0,0 @@
-#import "SWGApiClient.h"
-#import "SWGFile.h"
-#import "SWGQueryParamCollection.h"
-#import "SWGConfiguration.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 = true;
-
-#pragma mark - Log Methods
-
-+(void)setLoggingEnabled:(bool) state {
-    loggingEnabled = state;
-}
-
-- (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 );
-}
-
-#pragma mark -
-
-+(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;
-    }
-}
-
-/*
- * Detect `Accept` from accepts
- */
-+ (NSString *) selectHeaderAccept:(NSArray *)accepts
-{
-    if (accepts == nil || [accepts count] == 0) {
-        return @"";
-    }
-    
-    NSMutableArray *lowerAccepts = [[NSMutableArray alloc] initWithCapacity:[accepts count]];
-    [accepts enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
-        [lowerAccepts addObject:[obj lowercaseString]];
-    }];
-
-    
-    if ([lowerAccepts containsObject:@"application/json"]) {
-        return @"application/json";
-    }
-    else {
-        return [lowerAccepts componentsJoinedByString:@", "];
-    }
-}
-
-/*
- * Detect `Content-Type` from contentTypes
- */
-+ (NSString *) selectHeaderContentType:(NSArray *)contentTypes
-{
-    if (contentTypes == nil || [contentTypes count] == 0) {
-        return @"application/json";
-    }
-    
-    NSMutableArray *lowerContentTypes = [[NSMutableArray alloc] initWithCapacity:[contentTypes count]];
-    [contentTypes enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
-        [lowerContentTypes addObject:[obj lowercaseString]];
-    }];
-
-    if ([lowerContentTypes containsObject:@"application/json"]) {
-        return @"application/json";
-    }
-    else {
-        return lowerContentTypes[0];
-    }
-}
-
--(void)setHeaderValue:(NSString*) value
-               forKey:(NSString*) forKey {
-    [self.requestSerializer setValue:value forHTTPHeaderField:forKey];
-}
-
-+(unsigned long)requestQueueSize {
-    return [queuedRequests count];
-}
-
-+(NSNumber*) nextRequestId {
-    @synchronized(self) {
-        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;
-            id queryParam = [queryParams valueForKey:key];
-            if([queryParam isKindOfClass:[NSString class]]){
-                [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
-                                          [SWGApiClient escape:key], [SWGApiClient escape:[queryParams valueForKey:key]]]];
-            }
-            else if([queryParam isKindOfClass:[SWGQueryParamCollection class]]){
-                SWGQueryParamCollection * coll = (SWGQueryParamCollection*) queryParam;
-                NSArray* values = [coll values];
-                NSString* format = [coll format];
-
-                if([format isEqualToString:@"csv"]) {
-                    [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
-                        [SWGApiClient escape:key], [NSString stringWithFormat:@"%@", [values componentsJoinedByString:@","]]]];
-
-                }
-                else if([format isEqualToString:@"tsv"]) {
-                    [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
-                        [SWGApiClient escape:key], [NSString stringWithFormat:@"%@", [values componentsJoinedByString:@"\t"]]]];
-
-                }
-                else if([format isEqualToString:@"pipes"]) {
-                    [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
-                        [SWGApiClient escape:key], [NSString stringWithFormat:@"%@", [values componentsJoinedByString:@"|"]]]];
-
-                }
-                else if([format isEqualToString:@"multi"]) {
-                    for(id obj in values) {
-                        [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
-                            [SWGApiClient escape:key], [NSString stringWithFormat:@"%@", obj]]];
-                        counter += 1;
-                    }
-
-                }
-            }
-            else {
-                [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
-                                          [SWGApiClient escape:key], [NSString stringWithFormat:@"%@", [queryParams valueForKey:key]]]];
-            }
-
-            counter += 1;
-        }
-    }
-    return requestUrl;
-}
-
-- (NSString*)descriptionForRequest:(NSURLRequest*)request {
-    return [[request URL] absoluteString];
-}
-
-
-/**
- * Update header and query params based on authentication settings
- */
-- (void) updateHeaderParams:(NSDictionary *__autoreleasing *)headers
-                queryParams:(NSDictionary *__autoreleasing *)querys
-           WithAuthSettings:(NSArray *)authSettings {
-    
-    if (!authSettings || [authSettings count] == 0) {
-        return;
-    }
-    
-    NSMutableDictionary *headersWithAuth = [NSMutableDictionary dictionaryWithDictionary:*headers];
-    NSMutableDictionary *querysWithAuth = [NSMutableDictionary dictionaryWithDictionary:*querys];
-    
-    SWGConfiguration *config = [SWGConfiguration sharedConfig];
-    for (NSString *auth in authSettings) {
-        NSDictionary *authSetting = [[config authSettings] objectForKey:auth];
-        
-        if (authSetting) {
-            if ([authSetting[@"in"] isEqualToString:@"header"]) {
-                [headersWithAuth setObject:authSetting[@"value"] forKey:authSetting[@"key"]];
-            }
-            else if ([authSetting[@"in"] isEqualToString:@"query"]) {
-                [querysWithAuth setObject:authSetting[@"value"] forKey:authSetting[@"key"]];
-            }
-        }
-    }
-    
-    *headers = [NSDictionary dictionaryWithDictionary:headersWithAuth];
-    *querys = [NSDictionary dictionaryWithDictionary:querysWithAuth];
-}
-
-#pragma mark - Perform Request Methods
-
--(NSNumber*)  dictionary: (NSString*) path
-                  method: (NSString*) method
-             queryParams: (NSDictionary*) queryParams
-                    body: (id) body
-            headerParams: (NSDictionary*) headerParams
-            authSettings: (NSArray *) authSettings
-      requestContentType: (NSString*) requestContentType
-     responseContentType: (NSString*) responseContentType
-         completionBlock: (void (^)(NSDictionary*, NSError *))completionBlock {
-    // setting request serializer
-    if ([requestContentType isEqualToString:@"application/json"]) {
-        self.requestSerializer = [AFJSONRequestSerializer serializer];
-    }
-    else if ([requestContentType isEqualToString:@"application/x-www-form-urlencoded"]) {
-        self.requestSerializer = [AFHTTPRequestSerializer serializer];
-    }
-    else if ([requestContentType isEqualToString:@"multipart/form-data"]) {
-        self.requestSerializer = [AFHTTPRequestSerializer serializer];
-    }
-    else {
-        NSAssert(false, @"unsupport request type %@", requestContentType);
-    }
-
-    // setting response serializer
-    if ([responseContentType isEqualToString:@"application/json"]) {
-        self.responseSerializer = [AFJSONResponseSerializer serializer];
-    }
-    else {
-        self.responseSerializer = [AFHTTPResponseSerializer serializer];
-    }
-    
-    // auth setting
-    [self updateHeaderParams:&headerParams queryParams:&queryParams WithAuthSettings:authSettings];
-
-    NSMutableURLRequest * request = nil;
-    if (body != nil && [body isKindOfClass:[NSArray class]]){
-        SWGFile * file;
-        NSMutableDictionary * params = [[NSMutableDictionary alloc] init];
-        for(id obj in body) {
-            if([obj isKindOfClass:[SWGFile class]]) {
-                file = (SWGFile*) obj;
-                requestContentType = @"multipart/form-data";
-            }
-            else if([obj isKindOfClass:[NSDictionary class]]) {
-                for(NSString * key in obj) {
-                    params[key] = obj[key];
-                }
-            }
-        }
-        NSString * urlString = [[NSURL URLWithString:path relativeToURL:self.baseURL] absoluteString];
-
-        // request with multipart form
-        if([requestContentType isEqualToString:@"multipart/form-data"]) {
-            request = [self.requestSerializer multipartFormRequestWithMethod: @"POST"
-                                                                   URLString: urlString
-                                                                  parameters: nil
-                                                   constructingBodyWithBlock: ^(id<AFMultipartFormData> formData) {
-
-                                                       for(NSString * key in params) {
-                                                           NSData* data = [params[key] dataUsingEncoding:NSUTF8StringEncoding];
-                                                           [formData appendPartWithFormData: data name: key];
-                                                       }
-
-                                                       if (file) {
-                                                           [formData appendPartWithFileData: [file data]
-                                                                                       name: [file paramName]
-                                                                                   fileName: [file name]
-                                                                                   mimeType: [file mimeType]];
-                                                       }
-
-                                                   }
-                                                                       error:nil];
-        }
-        // request with form parameters or json
-        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:params
-                                                          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]]){
-            [self.requestSerializer 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];
-        }
-    }
-    [self.requestSerializer setValue: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
-                           authSettings: (NSArray *) authSettings
-                     requestContentType: (NSString*) requestContentType
-                    responseContentType: (NSString*) responseContentType
-                        completionBlock: (void (^)(NSString*, NSError *))completionBlock {
-    // setting request serializer
-    if ([requestContentType isEqualToString:@"application/json"]) {
-        self.requestSerializer = [AFJSONRequestSerializer serializer];
-    }
-    else if ([requestContentType isEqualToString:@"application/x-www-form-urlencoded"]) {
-        self.requestSerializer = [AFHTTPRequestSerializer serializer];
-    }
-    else if ([requestContentType isEqualToString:@"multipart/form-data"]) {
-        self.requestSerializer = [AFHTTPRequestSerializer serializer];
-    }
-    else {
-        NSAssert(false, @"unsupport request type %@", requestContentType);
-    }
-
-    // setting response serializer
-    if ([responseContentType isEqualToString:@"application/json"]) {
-        self.responseSerializer = [AFJSONResponseSerializer serializer];
-    }
-    else {
-        self.responseSerializer = [AFHTTPResponseSerializer serializer];
-    }
-    
-    // auth setting
-    [self updateHeaderParams:&headerParams queryParams:&queryParams WithAuthSettings:authSettings];
-
-    NSMutableURLRequest * request = nil;
-    if (body != nil && [body isKindOfClass:[NSArray class]]){
-        SWGFile * file;
-        NSMutableDictionary * params = [[NSMutableDictionary alloc] init];
-        for(id obj in body) {
-            if([obj isKindOfClass:[SWGFile class]]) {
-                file = (SWGFile*) obj;
-                requestContentType = @"multipart/form-data";
-            }
-            else if([obj isKindOfClass:[NSDictionary class]]) {
-                for(NSString * key in obj) {
-                    params[key] = obj[key];
-                }
-            }
-        }
-        NSString * urlString = [[NSURL URLWithString:path relativeToURL:self.baseURL] absoluteString];
-
-        // request with multipart form
-        if([requestContentType isEqualToString:@"multipart/form-data"]) {
-            request = [self.requestSerializer multipartFormRequestWithMethod: @"POST"
-                                                                   URLString: urlString
-                                                                  parameters: nil
-                                                   constructingBodyWithBlock: ^(id<AFMultipartFormData> formData) {
-
-                                                       for(NSString * key in params) {
-                                                           NSData* data = [params[key] dataUsingEncoding:NSUTF8StringEncoding];
-                                                           [formData appendPartWithFormData: data name: key];
-                                                       }
-
-                                                       if (file) {
-                                                           [formData appendPartWithFileData: [file data]
-                                                                                       name: [file paramName]
-                                                                                   fileName: [file name]
-                                                                                   mimeType: [file mimeType]];
-                                                       }
-
-                                                   }
-                                                                       error:nil];
-        }
-        // request with form parameters or json
-        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:params
-                                                          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]]){
-            [self.requestSerializer 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];
-        }
-    }
-    [self.requestSerializer setValue: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/petstore/objc/client/SWGCategory.m b/samples/client/petstore/objc/client/SWGCategory.m
deleted file mode 100644
index c41f76a5247..00000000000
--- a/samples/client/petstore/objc/client/SWGCategory.m
+++ /dev/null
@@ -1,22 +0,0 @@
-#import "SWGCategory.h"
-
-@implementation SWGCategory
-  
-+ (JSONKeyMapper *)keyMapper
-{
-  return [[JSONKeyMapper alloc] initWithDictionary:@{ @"id": @"_id", @"name": @"name" }];
-}
-
-+ (BOOL)propertyIsOptional:(NSString *)propertyName
-{
-  NSArray *optionalProperties = @[@"_id", @"name"];
-
-  if ([optionalProperties containsObject:propertyName]) {
-    return YES;
-  }
-  else {
-    return NO;
-  }
-}
-
-@end
diff --git a/samples/client/petstore/objc/client/SWGConfiguration.h b/samples/client/petstore/objc/client/SWGConfiguration.h
deleted file mode 100644
index 33023ca3c6f..00000000000
--- a/samples/client/petstore/objc/client/SWGConfiguration.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface SWGConfiguration : NSObject
-
-
-/**
- * Api key values for Api Key type Authentication
- *
- * To add or remove api key, use `setValue:forApiKeyField:`.
- */
-@property (readonly, nonatomic, strong) NSDictionary *apiKey;
-
-/**
- * Api key prefix values to be prepend to the respective api key
- *
- * To add or remove prefix, use `setValue:forApiKeyPrefixField:`.
- */
-@property (readonly, nonatomic, strong) NSDictionary *apiKeyPrefix;
-
-/**
- * Usename and Password for Basic type Authentication
- */
-@property (nonatomic) NSString *username;
-@property (nonatomic) NSString *password;
-
-/**
- * Get configuration singleton instance
- */
-+ (instancetype) sharedConfig;
-
-/**
- * Sets field in `apiKey`
- */
-- (void) setValue:(NSString *)value forApiKeyField:(NSString*)field;
-
-/**
- * Sets field in `apiKeyPrefix`
- */
-- (void) setValue:(NSString *)value forApiKeyPrefixField:(NSString *)field;
-
-/**
- * Get API key (with prefix if set)
- */
-- (NSString *) getApiKeyWithPrefix:(NSString *) key;
-
-/**
- * Get Basic Auth token
- */
-- (NSString *) getBasicAuthToken;
-
-/**
- * Get Authentication Setings
- */
-- (NSDictionary *) authSettings;
-
-@end
diff --git a/samples/client/petstore/objc/client/SWGFile.h b/samples/client/petstore/objc/client/SWGFile.h
deleted file mode 100644
index fd87e13bace..00000000000
--- a/samples/client/petstore/objc/client/SWGFile.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface SWGFile : NSObject
-
-@property(nonatomic, readonly) NSString* name;
-@property(nonatomic, readonly) NSString* mimeType;
-@property(nonatomic, readonly) NSData* data;
-@property(nonatomic) NSString* paramName;
-
-- (id) initWithNameData: (NSString*) filename
-               mimeType: (NSString*) mimeType
-                   data: (NSData*) data;
-    
-@end
\ No newline at end of file
diff --git a/samples/client/petstore/objc/client/SWGFile.m b/samples/client/petstore/objc/client/SWGFile.m
deleted file mode 100644
index 42552767af4..00000000000
--- a/samples/client/petstore/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/petstore/objc/client/SWGObject.h b/samples/client/petstore/objc/client/SWGObject.h
deleted file mode 100644
index ccec208abc0..00000000000
--- a/samples/client/petstore/objc/client/SWGObject.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "JSONModel.h"
-
-@interface SWGObject : JSONModel
-@end
diff --git a/samples/client/petstore/objc/client/SWGObject.m b/samples/client/petstore/objc/client/SWGObject.m
deleted file mode 100644
index 1f897ab1d56..00000000000
--- a/samples/client/petstore/objc/client/SWGObject.m
+++ /dev/null
@@ -1,4 +0,0 @@
-#import "SWGObject.h"
-
-@implementation SWGObject
-@end
diff --git a/samples/client/petstore/objc/client/SWGPetApi.h b/samples/client/petstore/objc/client/SWGPetApi.h
deleted file mode 100644
index aa255cd144e..00000000000
--- a/samples/client/petstore/objc/client/SWGPetApi.h
+++ /dev/null
@@ -1,157 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGPet.h"
-#import "SWGFile.h"
-#import "SWGObject.h"
-#import "SWGApiClient.h"
-
-
-@interface SWGPetApi: NSObject
-
-@property(nonatomic, assign)SWGApiClient *apiClient;
-
--(instancetype) initWithApiClient:(SWGApiClient *)apiClient;
--(void) addHeader:(NSString*)value forKey:(NSString*)key;
--(unsigned long) requestQueueSize;
-+(SWGPetApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key;
-+(void) setBasePath:(NSString*)basePath;
-+(NSString*) getBasePath;
-/**
-
- Update an existing pet
- 
-
- @param body Pet object that needs to be added to the store
- 
-
- return type: 
- */
--(NSNumber*) updatePetWithCompletionBlock :(SWGPet*) body 
-    
-    
-    completionHandler: (void (^)(NSError* error))completionBlock;
-
-
-/**
-
- Add a new pet to the store
- 
-
- @param body Pet object that needs to be added to the store
- 
-
- return type: 
- */
--(NSNumber*) addPetWithCompletionBlock :(SWGPet*) body 
-    
-    
-    completionHandler: (void (^)(NSError* error))completionBlock;
-
-
-/**
-
- 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 type: NSArray<SWGPet>*
- */
--(NSNumber*) findPetsByStatusWithCompletionBlock :(NSArray*) status 
-    
-    completionHandler: (void (^)(NSArray<SWGPet>* output, NSError* error))completionBlock;
-    
-
-
-/**
-
- 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 type: NSArray<SWGPet>*
- */
--(NSNumber*) findPetsByTagsWithCompletionBlock :(NSArray*) tags 
-    
-    completionHandler: (void (^)(NSArray<SWGPet>* output, NSError* error))completionBlock;
-    
-
-
-/**
-
- 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 type: SWGPet*
- */
--(NSNumber*) getPetByIdWithCompletionBlock :(NSNumber*) petId 
-    
-    completionHandler: (void (^)(SWGPet* output, NSError* error))completionBlock;
-    
-
-
-/**
-
- 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 type: 
- */
--(NSNumber*) updatePetWithFormWithCompletionBlock :(NSString*) petId 
-     name:(NSString*) name 
-     status:(NSString*) status 
-    
-    
-    completionHandler: (void (^)(NSError* error))completionBlock;
-
-
-/**
-
- Deletes a pet
- 
-
- @param apiKey 
- @param petId Pet id to delete
- 
-
- return type: 
- */
--(NSNumber*) deletePetWithCompletionBlock :(NSString*) apiKey 
-     petId:(NSNumber*) petId 
-    
-    
-    completionHandler: (void (^)(NSError* error))completionBlock;
-
-
-/**
-
- uploads an image
- 
-
- @param petId ID of pet to update
- @param additionalMetadata Additional data to pass to server
- @param file file to upload
- 
-
- return type: 
- */
--(NSNumber*) uploadFileWithCompletionBlock :(NSNumber*) petId 
-     additionalMetadata:(NSString*) additionalMetadata 
-     file:(SWGFile*) file 
-    
-    
-    completionHandler: (void (^)(NSError* error))completionBlock;
-
-
-
-@end
diff --git a/samples/client/petstore/objc/client/SWGPetApi.m b/samples/client/petstore/objc/client/SWGPetApi.m
deleted file mode 100644
index e35e462c733..00000000000
--- a/samples/client/petstore/objc/client/SWGPetApi.m
+++ /dev/null
@@ -1,919 +0,0 @@
-#import "SWGPetApi.h"
-#import "SWGFile.h"
-#import "SWGQueryParamCollection.h"
-#import "SWGPet.h"
-#import "SWGFile.h"
-
-
-@interface SWGPetApi ()
-    @property (readwrite, nonatomic, strong) NSMutableDictionary *defaultHeaders;
-@end
-
-@implementation SWGPetApi
-
-static NSString * basePath = @"http://petstore.swagger.io/v2";
-
-#pragma mark - Initialize methods
-
-- (id) init {
-    self = [super init];
-    if (self) {
-        self.apiClient = [SWGApiClient sharedClientFromPool:basePath];
-        self.defaultHeaders = [NSMutableDictionary dictionary];
-    }
-    return self;
-}
-
-- (id) initWithApiClient:(SWGApiClient *)apiClient {
-    self = [super init];
-    if (self) {
-        if (apiClient) {
-            self.apiClient = apiClient;
-        }
-        else {
-            self.apiClient = [SWGApiClient sharedClientFromPool:basePath];
-        }
-        self.defaultHeaders = [NSMutableDictionary dictionary];
-    }
-    return self;
-}
-
-#pragma mark -
-
-+(SWGPetApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key {
-    static SWGPetApi* singletonAPI = nil;
-
-    if (singletonAPI == nil) {
-        singletonAPI = [[SWGPetApi alloc] init];
-        [singletonAPI addHeader:headerValue forKey:key];
-    }
-    return singletonAPI;
-}
-
-+(void) setBasePath:(NSString*)path {
-    basePath = path;
-}
-
-+(NSString*) getBasePath {
-    return basePath;
-}
-
--(void) addHeader:(NSString*)value forKey:(NSString*)key {
-    [self.defaultHeaders setValue:value forKey:key];
-}
-
--(void) setHeaderValue:(NSString*) value
-           forKey:(NSString*)key {
-    [self.defaultHeaders setValue:value forKey:key];
-}
-
--(unsigned long) requestQueueSize {
-    return [SWGApiClient requestQueueSize];
-}
-
-
-/*!
- * 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* requestUrl = [NSMutableString stringWithFormat:@"%@/pet", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    
-
-    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 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(toDictionary)]) {
-                [objs addObject:[(SWGObject*)dict toDictionary]];
-            }
-            else{
-                [objs addObject:dict];
-            }
-        }
-        bodyDictionary = objs;
-    }
-    else if([__body respondsToSelector:@selector(toDictionary)]) {
-        bodyDictionary = [(SWGObject*)__body toDictionary];
-    }
-    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;
-    }
-    
-    
-
-    
-
-    
-
-    
-
-    
-    // it's void
-        return [self.apiClient stringWithCompletionBlock: requestUrl 
-                                      method: @"PUT" 
-                                 queryParams: queryParams 
-                                        body: bodyDictionary 
-                                headerParams: headerParams
-                                authSettings: authSettings
-                          requestContentType: requestContentType
-                         responseContentType: responseContentType
-                             completionBlock: ^(NSString *data, NSError *error) {
-                if (error) {
-                    completionBlock(error);
-                    return;
-                }
-                completionBlock(nil);
-                    }];
-
-    
-}
-
-/*!
- * Add a new pet to the store
- * 
- * \param body Pet object that needs to be added to the store
- * \returns void
- */
--(NSNumber*) addPetWithCompletionBlock: (SWGPet*) body
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock {
-
-    
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    
-
-    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 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(toDictionary)]) {
-                [objs addObject:[(SWGObject*)dict toDictionary]];
-            }
-            else{
-                [objs addObject:dict];
-            }
-        }
-        bodyDictionary = objs;
-    }
-    else if([__body respondsToSelector:@selector(toDictionary)]) {
-        bodyDictionary = [(SWGObject*)__body toDictionary];
-    }
-    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;
-    }
-    
-    
-
-    
-
-    
-
-    
-
-    
-    // it's void
-        return [self.apiClient stringWithCompletionBlock: requestUrl 
-                                      method: @"POST" 
-                                 queryParams: queryParams 
-                                        body: bodyDictionary 
-                                headerParams: headerParams
-                                authSettings: authSettings
-                          requestContentType: requestContentType
-                         responseContentType: responseContentType
-                             completionBlock: ^(NSString *data, NSError *error) {
-                if (error) {
-                    completionBlock(error);
-                    return;
-                }
-                completionBlock(nil);
-                    }];
-
-    
-}
-
-/*!
- * 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*) status
-        
-        completionHandler: (void (^)(NSArray<SWGPet>* output, NSError* error))completionBlock
-         {
-
-    
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet/findByStatus", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    
-
-    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 bodyDictionary = nil;
-    
-    
-
-    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init];
-
-    
-    
-
-    
-
-    
-    // response is in a container
-        // array container response type
-    return [self.apiClient dictionary: requestUrl 
-                       method: @"GET" 
-                  queryParams: queryParams 
-                         body: bodyDictionary 
-                 headerParams: headerParams
-                 authSettings: authSettings
-           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) {
-                        
-                        
-                        SWGPet* d = [[SWGPet alloc] initWithDictionary:dict error:nil];
-                        
-                        [objs addObject:d];
-                    }
-                    completionBlock((NSArray<SWGPet>*)objs, nil);
-                }
-                
-                
-            }];
-    
-
-
-    
-
-    
-}
-
-/*!
- * 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*) tags
-        
-        completionHandler: (void (^)(NSArray<SWGPet>* output, NSError* error))completionBlock
-         {
-
-    
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet/findByTags", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    
-
-    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 bodyDictionary = nil;
-    
-    
-
-    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init];
-
-    
-    
-
-    
-
-    
-    // response is in a container
-        // array container response type
-    return [self.apiClient dictionary: requestUrl 
-                       method: @"GET" 
-                  queryParams: queryParams 
-                         body: bodyDictionary 
-                 headerParams: headerParams
-                 authSettings: authSettings
-           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) {
-                        
-                        
-                        SWGPet* d = [[SWGPet alloc] initWithDictionary:dict error:nil];
-                        
-                        [objs addObject:d];
-                    }
-                    completionBlock((NSArray<SWGPet>*)objs, nil);
-                }
-                
-                
-            }];
-    
-
-
-    
-
-    
-}
-
-/*!
- * 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
-    NSAssert(petId != nil, @"Missing the required parameter `petId` when calling getPetById");
-    
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet/{petId}", 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:@"%@%@%@", @"{", @"petId", @"}"]] withString: [SWGApiClient escape: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 = @[@"petstore_auth", @"api_key"];
-    
-    id bodyDictionary = nil;
-    
-    
-
-    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init];
-
-    
-    
-
-    
-
-    
-
-    
-    // non container response
-
-    
-
-    
-    // complex response
-        
-    // comples response type
-    return [self.apiClient dictionary: requestUrl
-                       method: @"GET"
-                  queryParams: queryParams
-                         body: bodyDictionary
-                 headerParams: headerParams
-                 authSettings: authSettings
-           requestContentType: requestContentType
-          responseContentType: responseContentType
-              completionBlock: ^(NSDictionary *data, NSError *error) {
-                if (error) {
-                    completionBlock(nil, error);
-                    
-                    return;
-                }
-                SWGPet* result = nil;
-                if (data) {
-                    result = [[SWGPet  alloc]  initWithDictionary:data error:nil];
-                }
-                completionBlock(result , nil);
-                
-              }];
-    
-
-    
-
-    
-}
-
-/*!
- * 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
- * \returns void
- */
--(NSNumber*) updatePetWithFormWithCompletionBlock: (NSString*) petId
-         name: (NSString*) name
-         status: (NSString*) status
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock {
-
-    
-    // verify the required parameter 'petId' is set
-    NSAssert(petId != nil, @"Missing the required parameter `petId` when calling updatePetWithForm");
-    
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet/{petId}", 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:@"%@%@%@", @"{", @"petId", @"}"]] withString: [SWGApiClient escape: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 bodyDictionary = nil;
-    
-    
-
-    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init];
-
-    
-    
-    formParams[@"name"] = name;
-    
-    if(bodyDictionary == nil) {
-      bodyDictionary = [[NSMutableArray alloc] init];
-    }
-    [bodyDictionary addObject:formParams];
-    
-    
-    formParams[@"status"] = status;
-    
-    if(bodyDictionary == nil) {
-      bodyDictionary = [[NSMutableArray alloc] init];
-    }
-    [bodyDictionary addObject:formParams];
-    
-    
-
-    
-
-    
-
-    
-
-    
-    // it's void
-        return [self.apiClient stringWithCompletionBlock: requestUrl 
-                                      method: @"POST" 
-                                 queryParams: queryParams 
-                                        body: bodyDictionary 
-                                headerParams: headerParams
-                                authSettings: authSettings
-                          requestContentType: requestContentType
-                         responseContentType: responseContentType
-                             completionBlock: ^(NSString *data, NSError *error) {
-                if (error) {
-                    completionBlock(error);
-                    return;
-                }
-                completionBlock(nil);
-                    }];
-
-    
-}
-
-/*!
- * Deletes a pet
- * 
- * \param apiKey 
- * \param petId Pet id to delete
- * \returns void
- */
--(NSNumber*) deletePetWithCompletionBlock: (NSString*) apiKey
-         petId: (NSNumber*) petId
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock {
-
-    
-    // verify the required parameter 'petId' is set
-    NSAssert(petId != nil, @"Missing the required parameter `petId` when calling deletePet");
-    
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet/{petId}", 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:@"%@%@%@", @"{", @"petId", @"}"]] withString: [SWGApiClient escape:petId]];
-    
-
-    NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    
-    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
-
-    if(apiKey != nil)
-        headerParams[@"api_key"] = apiKey;
-    
-    
-    // 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 bodyDictionary = nil;
-    
-    
-
-    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init];
-
-    
-    
-
-    
-
-    
-
-    
-
-    
-    // it's void
-        return [self.apiClient stringWithCompletionBlock: requestUrl 
-                                      method: @"DELETE" 
-                                 queryParams: queryParams 
-                                        body: bodyDictionary 
-                                headerParams: headerParams
-                                authSettings: authSettings
-                          requestContentType: requestContentType
-                         responseContentType: responseContentType
-                             completionBlock: ^(NSString *data, NSError *error) {
-                if (error) {
-                    completionBlock(error);
-                    return;
-                }
-                completionBlock(nil);
-                    }];
-
-    
-}
-
-/*!
- * uploads an image
- * 
- * \param petId ID of pet to update
- * \param additionalMetadata Additional data to pass to server
- * \param file file to upload
- * \returns void
- */
--(NSNumber*) uploadFileWithCompletionBlock: (NSNumber*) petId
-         additionalMetadata: (NSString*) additionalMetadata
-         file: (SWGFile*) file
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock {
-
-    
-    // verify the required parameter 'petId' is set
-    NSAssert(petId != nil, @"Missing the required parameter `petId` when calling uploadFile");
-    
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet/{petId}/uploadImage", 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:@"%@%@%@", @"{", @"petId", @"}"]] withString: [SWGApiClient escape: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:@[@"multipart/form-data"]];
-
-    // Authentication setting
-    NSArray *authSettings = @[@"petstore_auth"];
-    
-    id bodyDictionary = nil;
-    
-    
-
-    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init];
-
-    
-    
-    formParams[@"additionalMetadata"] = additionalMetadata;
-    
-    if(bodyDictionary == nil) {
-      bodyDictionary = [[NSMutableArray alloc] init];
-    }
-    [bodyDictionary addObject:formParams];
-    
-    
-    requestContentType = @"multipart/form-data";
-    if(bodyDictionary == nil) {
-      bodyDictionary = [[NSMutableArray alloc] init];
-    }
-    if(file != nil) {
-      [bodyDictionary addObject:file];
-      file.paramName  = @"file";
-    }
-    
-    if(bodyDictionary == nil) {
-      bodyDictionary = [[NSMutableArray alloc] init];
-    }
-    [bodyDictionary addObject:formParams];
-    
-    
-
-    
-
-    
-
-    
-
-    
-    // it's void
-        return [self.apiClient stringWithCompletionBlock: requestUrl 
-                                      method: @"POST" 
-                                 queryParams: queryParams 
-                                        body: bodyDictionary 
-                                headerParams: headerParams
-                                authSettings: authSettings
-                          requestContentType: requestContentType
-                         responseContentType: responseContentType
-                             completionBlock: ^(NSString *data, NSError *error) {
-                if (error) {
-                    completionBlock(error);
-                    return;
-                }
-                completionBlock(nil);
-                    }];
-
-    
-}
-
-
-
-@end
-
-
-
diff --git a/samples/client/petstore/objc/client/SWGStoreApi.h b/samples/client/petstore/objc/client/SWGStoreApi.h
deleted file mode 100644
index 49d8db806c8..00000000000
--- a/samples/client/petstore/objc/client/SWGStoreApi.h
+++ /dev/null
@@ -1,80 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "SWGOrder.h"
-#import "SWGObject.h"
-#import "SWGApiClient.h"
-
-
-@interface SWGStoreApi: NSObject
-
-@property(nonatomic, assign)SWGApiClient *apiClient;
-
--(instancetype) initWithApiClient:(SWGApiClient *)apiClient;
--(void) addHeader:(NSString*)value forKey:(NSString*)key;
--(unsigned long) requestQueueSize;
-+(SWGStoreApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key;
-+(void) setBasePath:(NSString*)basePath;
-+(NSString*) getBasePath;
-/**
-
- Returns pet inventories by status
- Returns a map of status codes to quantities
-
- 
-
- return type: NSDictionary*
- */
--(NSNumber*) getInventoryWithCompletionBlock :
-    (void (^)(NSDictionary* output, NSError* error))completionBlock;
-    
-
-
-/**
-
- Place an order for a pet
- 
-
- @param body order placed for purchasing the pet
- 
-
- return type: SWGOrder*
- */
--(NSNumber*) placeOrderWithCompletionBlock :(SWGOrder*) body 
-    
-    completionHandler: (void (^)(SWGOrder* output, NSError* error))completionBlock;
-    
-
-
-/**
-
- 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
- 
-
- return type: SWGOrder*
- */
--(NSNumber*) getOrderByIdWithCompletionBlock :(NSString*) orderId 
-    
-    completionHandler: (void (^)(SWGOrder* output, NSError* error))completionBlock;
-    
-
-
-/**
-
- 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 type: 
- */
--(NSNumber*) deleteOrderWithCompletionBlock :(NSString*) orderId 
-    
-    
-    completionHandler: (void (^)(NSError* error))completionBlock;
-
-
-
-@end
diff --git a/samples/client/petstore/objc/client/SWGStoreApi.m b/samples/client/petstore/objc/client/SWGStoreApi.m
deleted file mode 100644
index a112db6d639..00000000000
--- a/samples/client/petstore/objc/client/SWGStoreApi.m
+++ /dev/null
@@ -1,479 +0,0 @@
-#import "SWGStoreApi.h"
-#import "SWGFile.h"
-#import "SWGQueryParamCollection.h"
-#import "SWGOrder.h"
-
-
-@interface SWGStoreApi ()
-    @property (readwrite, nonatomic, strong) NSMutableDictionary *defaultHeaders;
-@end
-
-@implementation SWGStoreApi
-
-static NSString * basePath = @"http://petstore.swagger.io/v2";
-
-#pragma mark - Initialize methods
-
-- (id) init {
-    self = [super init];
-    if (self) {
-        self.apiClient = [SWGApiClient sharedClientFromPool:basePath];
-        self.defaultHeaders = [NSMutableDictionary dictionary];
-    }
-    return self;
-}
-
-- (id) initWithApiClient:(SWGApiClient *)apiClient {
-    self = [super init];
-    if (self) {
-        if (apiClient) {
-            self.apiClient = apiClient;
-        }
-        else {
-            self.apiClient = [SWGApiClient sharedClientFromPool:basePath];
-        }
-        self.defaultHeaders = [NSMutableDictionary dictionary];
-    }
-    return self;
-}
-
-#pragma mark -
-
-+(SWGStoreApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key {
-    static SWGStoreApi* singletonAPI = nil;
-
-    if (singletonAPI == nil) {
-        singletonAPI = [[SWGStoreApi alloc] init];
-        [singletonAPI addHeader:headerValue forKey:key];
-    }
-    return singletonAPI;
-}
-
-+(void) setBasePath:(NSString*)path {
-    basePath = path;
-}
-
-+(NSString*) getBasePath {
-    return basePath;
-}
-
--(void) addHeader:(NSString*)value forKey:(NSString*)key {
-    [self.defaultHeaders setValue:value forKey:key];
-}
-
--(void) setHeaderValue:(NSString*) value
-           forKey:(NSString*)key {
-    [self.defaultHeaders setValue:value forKey:key];
-}
-
--(unsigned long) requestQueueSize {
-    return [SWGApiClient requestQueueSize];
-}
-
-
-/*!
- * Returns pet inventories by status
- * Returns a map of status codes to quantities
- * \returns NSDictionary*
- */
--(NSNumber*) getInventoryWithCompletionBlock: 
-        (void (^)(NSDictionary* output, NSError* error))completionBlock
-         {
-
-    
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/store/inventory", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    
-
-    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 bodyDictionary = nil;
-    
-    
-
-    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init];
-
-    
-    
-
-    
-
-    
-    // response is in a container
-        // map container response type
-    return [self.apiClient dictionary: requestUrl 
-                       method: @"GET" 
-                  queryParams: queryParams 
-                         body: bodyDictionary 
-                 headerParams: headerParams
-                 authSettings: authSettings
-           requestContentType: requestContentType
-          responseContentType: responseContentType
-              completionBlock: ^(NSDictionary *data, NSError *error) {
-                if (error) {
-                    completionBlock(nil, error);
-                    return;
-                }
-                
-                NSDictionary *result = nil;
-                if (data) {
-                    result = [[NSDictionary alloc]initWithDictionary: data];
-                }
-                completionBlock(data, nil);
-                
-            }];
-    
-
-
-    
-
-    
-}
-
-/*!
- * 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* requestUrl = [NSMutableString stringWithFormat:@"%@/store/order", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    
-
-    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 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(toDictionary)]) {
-                [objs addObject:[(SWGObject*)dict toDictionary]];
-            }
-            else{
-                [objs addObject:dict];
-            }
-        }
-        bodyDictionary = objs;
-    }
-    else if([__body respondsToSelector:@selector(toDictionary)]) {
-        bodyDictionary = [(SWGObject*)__body toDictionary];
-    }
-    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;
-    }
-    
-    
-
-    
-
-    
-
-    
-    // non container response
-
-    
-
-    
-    // complex response
-        
-    // comples response type
-    return [self.apiClient dictionary: requestUrl
-                       method: @"POST"
-                  queryParams: queryParams
-                         body: bodyDictionary
-                 headerParams: headerParams
-                 authSettings: authSettings
-           requestContentType: requestContentType
-          responseContentType: responseContentType
-              completionBlock: ^(NSDictionary *data, NSError *error) {
-                if (error) {
-                    completionBlock(nil, error);
-                    
-                    return;
-                }
-                SWGOrder* result = nil;
-                if (data) {
-                    result = [[SWGOrder  alloc]  initWithDictionary:data error:nil];
-                }
-                completionBlock(result , nil);
-                
-              }];
-    
-
-    
-
-    
-}
-
-/*!
- * 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
-    NSAssert(orderId != nil, @"Missing the required parameter `orderId` when calling getOrderById");
-    
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/store/order/{orderId}", 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:@"%@%@%@", @"{", @"orderId", @"}"]] withString: [SWGApiClient escape: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 bodyDictionary = nil;
-    
-    
-
-    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init];
-
-    
-    
-
-    
-
-    
-
-    
-    // non container response
-
-    
-
-    
-    // complex response
-        
-    // comples response type
-    return [self.apiClient dictionary: requestUrl
-                       method: @"GET"
-                  queryParams: queryParams
-                         body: bodyDictionary
-                 headerParams: headerParams
-                 authSettings: authSettings
-           requestContentType: requestContentType
-          responseContentType: responseContentType
-              completionBlock: ^(NSDictionary *data, NSError *error) {
-                if (error) {
-                    completionBlock(nil, error);
-                    
-                    return;
-                }
-                SWGOrder* result = nil;
-                if (data) {
-                    result = [[SWGOrder  alloc]  initWithDictionary:data error:nil];
-                }
-                completionBlock(result , nil);
-                
-              }];
-    
-
-    
-
-    
-}
-
-/*!
- * 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
- * \returns void
- */
--(NSNumber*) deleteOrderWithCompletionBlock: (NSString*) orderId
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock {
-
-    
-    // verify the required parameter 'orderId' is set
-    NSAssert(orderId != nil, @"Missing the required parameter `orderId` when calling deleteOrder");
-    
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/store/order/{orderId}", 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:@"%@%@%@", @"{", @"orderId", @"}"]] withString: [SWGApiClient escape: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 bodyDictionary = nil;
-    
-    
-
-    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init];
-
-    
-    
-
-    
-
-    
-
-    
-
-    
-    // it's void
-        return [self.apiClient stringWithCompletionBlock: requestUrl 
-                                      method: @"DELETE" 
-                                 queryParams: queryParams 
-                                        body: bodyDictionary 
-                                headerParams: headerParams
-                                authSettings: authSettings
-                          requestContentType: requestContentType
-                         responseContentType: responseContentType
-                             completionBlock: ^(NSString *data, NSError *error) {
-                if (error) {
-                    completionBlock(error);
-                    return;
-                }
-                completionBlock(nil);
-                    }];
-
-    
-}
-
-
-
-@end
-
-
-
diff --git a/samples/client/petstore/objc/client/SWGTag.m b/samples/client/petstore/objc/client/SWGTag.m
deleted file mode 100644
index 5d48a099070..00000000000
--- a/samples/client/petstore/objc/client/SWGTag.m
+++ /dev/null
@@ -1,22 +0,0 @@
-#import "SWGTag.h"
-
-@implementation SWGTag
-  
-+ (JSONKeyMapper *)keyMapper
-{
-  return [[JSONKeyMapper alloc] initWithDictionary:@{ @"id": @"_id", @"name": @"name" }];
-}
-
-+ (BOOL)propertyIsOptional:(NSString *)propertyName
-{
-  NSArray *optionalProperties = @[@"_id", @"name"];
-
-  if ([optionalProperties containsObject:propertyName]) {
-    return YES;
-  }
-  else {
-    return NO;
-  }
-}
-
-@end
diff --git a/samples/client/petstore/objc/client/SWGUserApi.m b/samples/client/petstore/objc/client/SWGUserApi.m
deleted file mode 100644
index e2fe69aca8d..00000000000
--- a/samples/client/petstore/objc/client/SWGUserApi.m
+++ /dev/null
@@ -1,892 +0,0 @@
-#import "SWGUserApi.h"
-#import "SWGFile.h"
-#import "SWGQueryParamCollection.h"
-#import "SWGUser.h"
-
-
-@interface SWGUserApi ()
-    @property (readwrite, nonatomic, strong) NSMutableDictionary *defaultHeaders;
-@end
-
-@implementation SWGUserApi
-
-static NSString * basePath = @"http://petstore.swagger.io/v2";
-
-#pragma mark - Initialize methods
-
-- (id) init {
-    self = [super init];
-    if (self) {
-        self.apiClient = [SWGApiClient sharedClientFromPool:basePath];
-        self.defaultHeaders = [NSMutableDictionary dictionary];
-    }
-    return self;
-}
-
-- (id) initWithApiClient:(SWGApiClient *)apiClient {
-    self = [super init];
-    if (self) {
-        if (apiClient) {
-            self.apiClient = apiClient;
-        }
-        else {
-            self.apiClient = [SWGApiClient sharedClientFromPool:basePath];
-        }
-        self.defaultHeaders = [NSMutableDictionary dictionary];
-    }
-    return self;
-}
-
-#pragma mark -
-
-+(SWGUserApi*) apiWithHeader:(NSString*)headerValue key:(NSString*)key {
-    static SWGUserApi* singletonAPI = nil;
-
-    if (singletonAPI == nil) {
-        singletonAPI = [[SWGUserApi alloc] init];
-        [singletonAPI addHeader:headerValue forKey:key];
-    }
-    return singletonAPI;
-}
-
-+(void) setBasePath:(NSString*)path {
-    basePath = path;
-}
-
-+(NSString*) getBasePath {
-    return basePath;
-}
-
--(void) addHeader:(NSString*)value forKey:(NSString*)key {
-    [self.defaultHeaders setValue:value forKey:key];
-}
-
--(void) setHeaderValue:(NSString*) value
-           forKey:(NSString*)key {
-    [self.defaultHeaders setValue:value forKey:key];
-}
-
--(unsigned long) requestQueueSize {
-    return [SWGApiClient requestQueueSize];
-}
-
-
-/*!
- * Create user
- * This can only be done by the logged in user.
- * \param body Created user object
- * \returns void
- */
--(NSNumber*) createUserWithCompletionBlock: (SWGUser*) body
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock {
-
-    
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    
-
-    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 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(toDictionary)]) {
-                [objs addObject:[(SWGObject*)dict toDictionary]];
-            }
-            else{
-                [objs addObject:dict];
-            }
-        }
-        bodyDictionary = objs;
-    }
-    else if([__body respondsToSelector:@selector(toDictionary)]) {
-        bodyDictionary = [(SWGObject*)__body toDictionary];
-    }
-    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;
-    }
-    
-    
-
-    
-
-    
-
-    
-
-    
-    // it's void
-        return [self.apiClient stringWithCompletionBlock: requestUrl 
-                                      method: @"POST" 
-                                 queryParams: queryParams 
-                                        body: bodyDictionary 
-                                headerParams: headerParams
-                                authSettings: authSettings
-                          requestContentType: requestContentType
-                         responseContentType: responseContentType
-                             completionBlock: ^(NSString *data, NSError *error) {
-                if (error) {
-                    completionBlock(error);
-                    return;
-                }
-                completionBlock(nil);
-                    }];
-
-    
-}
-
-/*!
- * Creates list of users with given input array
- * 
- * \param body List of user object
- * \returns void
- */
--(NSNumber*) createUsersWithArrayInputWithCompletionBlock: (NSArray<SWGUser>*) body
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock {
-
-    
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user/createWithArray", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    
-
-    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 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(toDictionary)]) {
-                [objs addObject:[(SWGObject*)dict toDictionary]];
-            }
-            else{
-                [objs addObject:dict];
-            }
-        }
-        bodyDictionary = objs;
-    }
-    else if([__body respondsToSelector:@selector(toDictionary)]) {
-        bodyDictionary = [(SWGObject*)__body toDictionary];
-    }
-    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;
-    }
-    
-    
-
-    
-
-    
-
-    
-
-    
-    // it's void
-        return [self.apiClient stringWithCompletionBlock: requestUrl 
-                                      method: @"POST" 
-                                 queryParams: queryParams 
-                                        body: bodyDictionary 
-                                headerParams: headerParams
-                                authSettings: authSettings
-                          requestContentType: requestContentType
-                         responseContentType: responseContentType
-                             completionBlock: ^(NSString *data, NSError *error) {
-                if (error) {
-                    completionBlock(error);
-                    return;
-                }
-                completionBlock(nil);
-                    }];
-
-    
-}
-
-/*!
- * Creates list of users with given input array
- * 
- * \param body List of user object
- * \returns void
- */
--(NSNumber*) createUsersWithListInputWithCompletionBlock: (NSArray<SWGUser>*) body
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock {
-
-    
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user/createWithList", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    
-
-    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 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(toDictionary)]) {
-                [objs addObject:[(SWGObject*)dict toDictionary]];
-            }
-            else{
-                [objs addObject:dict];
-            }
-        }
-        bodyDictionary = objs;
-    }
-    else if([__body respondsToSelector:@selector(toDictionary)]) {
-        bodyDictionary = [(SWGObject*)__body toDictionary];
-    }
-    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;
-    }
-    
-    
-
-    
-
-    
-
-    
-
-    
-    // it's void
-        return [self.apiClient stringWithCompletionBlock: requestUrl 
-                                      method: @"POST" 
-                                 queryParams: queryParams 
-                                        body: bodyDictionary 
-                                headerParams: headerParams
-                                authSettings: authSettings
-                          requestContentType: requestContentType
-                         responseContentType: responseContentType
-                             completionBlock: ^(NSString *data, NSError *error) {
-                if (error) {
-                    completionBlock(error);
-                    return;
-                }
-                completionBlock(nil);
-                    }];
-
-    
-}
-
-/*!
- * Logs user into the system
- * 
- * \param username The user name for login
- * \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* requestUrl = [NSMutableString stringWithFormat:@"%@/user/login", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    
-
-    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 bodyDictionary = nil;
-    
-    
-
-    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init];
-
-    
-    
-
-    
-
-    
-
-    
-    // non container response
-
-    
-    // primitive response
-            // primitive response type
-    return [self.apiClient stringWithCompletionBlock: requestUrl 
-                                              method: @"GET" 
-                                         queryParams: queryParams 
-                                                body: bodyDictionary 
-                                        headerParams: headerParams
-                                        authSettings: authSettings
-                                  requestContentType: requestContentType
-                                 responseContentType: responseContentType
-                                     completionBlock: ^(NSString *data, NSError *error) {
-                         if (error) {
-                             completionBlock(nil, error);
-                             return;
-                         }
-                        NSString *result = data ? [[NSString  alloc]initWithString: data] : nil;
-                        completionBlock(result, nil);
-                     }];
-    
-    
-    
-
-
-    
-    // complex response
-        
-
-    
-
-    
-}
-
-/*!
- * Logs out current logged in user session
- * 
- * \returns void
- */
--(NSNumber*) logoutUserWithCompletionBlock: 
-        
-        (void (^)(NSError* error))completionBlock {
-
-    
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user/logout", basePath];
-
-    // remove format in URL if needed
-    if ([requestUrl rangeOfString:@".{format}"].location != NSNotFound)
-        [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
-
-    
-
-    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 bodyDictionary = nil;
-    
-    
-
-    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init];
-
-    
-    
-
-    
-
-    
-
-    
-
-    
-    // it's void
-        return [self.apiClient stringWithCompletionBlock: requestUrl 
-                                      method: @"GET" 
-                                 queryParams: queryParams 
-                                        body: bodyDictionary 
-                                headerParams: headerParams
-                                authSettings: authSettings
-                          requestContentType: requestContentType
-                         responseContentType: responseContentType
-                             completionBlock: ^(NSString *data, NSError *error) {
-                if (error) {
-                    completionBlock(error);
-                    return;
-                }
-                completionBlock(nil);
-                    }];
-
-    
-}
-
-/*!
- * Get user by user name
- * 
- * \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
-         {
-
-    
-    // verify the required parameter 'username' is set
-    NSAssert(username != nil, @"Missing the required parameter `username` when calling getUserByName");
-    
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user/{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]];
-    
-
-    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 bodyDictionary = nil;
-    
-    
-
-    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init];
-
-    
-    
-
-    
-
-    
-
-    
-    // non container response
-
-    
-
-    
-    // complex response
-        
-    // comples response type
-    return [self.apiClient dictionary: requestUrl
-                       method: @"GET"
-                  queryParams: queryParams
-                         body: bodyDictionary
-                 headerParams: headerParams
-                 authSettings: authSettings
-           requestContentType: requestContentType
-          responseContentType: responseContentType
-              completionBlock: ^(NSDictionary *data, NSError *error) {
-                if (error) {
-                    completionBlock(nil, error);
-                    
-                    return;
-                }
-                SWGUser* result = nil;
-                if (data) {
-                    result = [[SWGUser  alloc]  initWithDictionary:data error:nil];
-                }
-                completionBlock(result , nil);
-                
-              }];
-    
-
-    
-
-    
-}
-
-/*!
- * 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
- * \returns void
- */
--(NSNumber*) updateUserWithCompletionBlock: (NSString*) username
-         body: (SWGUser*) body
-        
-        
-        completionHandler: (void (^)(NSError* error))completionBlock {
-
-    
-    // verify the required parameter 'username' is set
-    NSAssert(username != nil, @"Missing the required parameter `username` when calling updateUser");
-    
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user/{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]];
-    
-
-    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 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(toDictionary)]) {
-                [objs addObject:[(SWGObject*)dict toDictionary]];
-            }
-            else{
-                [objs addObject:dict];
-            }
-        }
-        bodyDictionary = objs;
-    }
-    else if([__body respondsToSelector:@selector(toDictionary)]) {
-        bodyDictionary = [(SWGObject*)__body toDictionary];
-    }
-    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;
-    }
-    
-    
-
-    
-
-    
-
-    
-
-    
-    // it's void
-        return [self.apiClient stringWithCompletionBlock: requestUrl 
-                                      method: @"PUT" 
-                                 queryParams: queryParams 
-                                        body: bodyDictionary 
-                                headerParams: headerParams
-                                authSettings: authSettings
-                          requestContentType: requestContentType
-                         responseContentType: responseContentType
-                             completionBlock: ^(NSString *data, NSError *error) {
-                if (error) {
-                    completionBlock(error);
-                    return;
-                }
-                completionBlock(nil);
-                    }];
-
-    
-}
-
-/*!
- * 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
-    NSAssert(username != nil, @"Missing the required parameter `username` when calling deleteUser");
-    
-
-    NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/user/{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]];
-    
-
-    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 bodyDictionary = nil;
-    
-    
-
-    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init];
-
-    
-    
-
-    
-
-    
-
-    
-
-    
-    // it's void
-        return [self.apiClient stringWithCompletionBlock: requestUrl 
-                                      method: @"DELETE" 
-                                 queryParams: queryParams 
-                                        body: bodyDictionary 
-                                headerParams: headerParams
-                                authSettings: authSettings
-                          requestContentType: requestContentType
-                         responseContentType: responseContentType
-                             completionBlock: ^(NSString *data, NSError *error) {
-                if (error) {
-                    completionBlock(error);
-                    return;
-                }
-                completionBlock(nil);
-                    }];
-
-    
-}
-
-
-
-@end
-
-
-
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm
index da29b3e246a..9987a46ef76 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm
@@ -22,14 +22,14 @@ use WWW::SwaggerClient::Configuration;
 
 sub new
 {
-  my $class = shift;
-  my (%args) = (
-    'ua' => LWP::UserAgent->new,
-    'base_url' => 'http://petstore.swagger.io/v2',
-    @_
-  );
-
-  return bless \%args, $class;
+    my $class = shift;
+    my (%args) = (
+        'ua' => LWP::UserAgent->new,
+        'base_url' => 'http://petstore.swagger.io/v2',
+        @_
+    );
+  
+    return bless \%args, $class;
 }
 
 # Set the user agent of the API client
@@ -37,8 +37,8 @@ sub new
 # @param string $user_agent The user agent of the API client
 #
 sub set_user_agent {
-  my ($self, $user_agent) = @_;
-  $self->{http_user_agent}= $user_agent;
+    my ($self, $user_agent) = @_;
+    $self->{http_user_agent}= $user_agent;
 }
 
 # Set timeout
@@ -46,11 +46,11 @@ sub set_user_agent {
 # @param integer $seconds Number of seconds before timing out [set to 0 for no timeout]
 # 
 sub set_timeout {
-  my ($self, $seconds) = @_;
-  if (!looks_like_number($seconds)) {
-    croak('Timeout variable must be numeric.');
-  }
-  $self->{http_timeout} = $seconds;
+    my ($self, $seconds) = @_;
+    if (!looks_like_number($seconds)) {
+        croak('Timeout variable must be numeric.');
+    }
+    $self->{http_timeout} = $seconds;
 }
 
 # make the HTTP request
@@ -61,71 +61,71 @@ sub set_timeout {
 # @param array $headerParams parameters to be place in request header
 # @return mixed
 sub call_api {
-  my $self = shift;
-  my ($resource_path, $method, $query_params, $post_params, $header_params, $body_data, $auth_settings) = @_;
-
-  # update parameters based on authentication settings
-  $self->update_params_for_auth($header_params, $query_params, $auth_settings); 
-
-
-  my $_url = $self->{base_url} . $resource_path;
-
-  # build query 
-  if (%$query_params) {
-    $_url = ($_url . '?' . eval { URI::Query->new($query_params)->stringify });
-  }
-
-
-  # body data
-  $body_data = to_json($body_data->to_hash) if defined $body_data && $body_data->can('to_hash'); # model to json string
-  my $_body_data = %$post_params ? $post_params : $body_data;
-
-  # Make the HTTP request
-  my $_request;
-  if ($method eq 'POST') {
-      # multipart
-      $header_params->{'Content-Type'} = lc $header_params->{'Content-Type'} eq 'multipart/form' ? 
-          'form-data' : $header_params->{'Content-Type'};
-      
-      $_request = POST($_url, %$header_params, Content => $_body_data);
-
-  }
-  elsif ($method eq 'PUT') {
-      # multipart
-      $header_params->{'Content-Type'}  = lc $header_params->{'Content-Type'} eq 'multipart/form' ? 
-          'form-data' : $header_params->{'Content-Type'};
-
-      $_request = PUT($_url, %$header_params, Content => $_body_data);
-
-  }
-  elsif ($method eq 'GET') {
-      my $headers = HTTP::Headers->new(%$header_params);
-      $_request = GET($_url, %$header_params);
-  }
-  elsif ($method eq 'HEAD') {
-      my $headers = HTTP::Headers->new(%$header_params);
-      $_request = HEAD($_url,%$header_params); 
-  }
-  elsif ($method eq 'DELETE') { #TODO support form data
-      my $headers = HTTP::Headers->new(%$header_params);
-      $_request = DELETE($_url, %$headers);
-  }
-  elsif ($method eq 'PATCH') { #TODO
-  }
-  else {
-  }
- 
-  $self->{ua}->timeout($self->{http_timeout} || $WWW::SwaggerClient::Configuration::http_timeout); 
-  $self->{ua}->agent($self->{http_user_agent} || $WWW::SwaggerClient::Configuration::http_user_agent);
+    my $self = shift;
+    my ($resource_path, $method, $query_params, $post_params, $header_params, $body_data, $auth_settings) = @_;
+  
+    # update parameters based on authentication settings
+    $self->update_params_for_auth($header_params, $query_params, $auth_settings); 
+  
+  
+    my $_url = $self->{base_url} . $resource_path;
+  
+    # build query 
+    if (%$query_params) {
+        $_url = ($_url . '?' . eval { URI::Query->new($query_params)->stringify });
+    }
+  
+  
+    # body data
+    $body_data = to_json($body_data->to_hash) if defined $body_data && $body_data->can('to_hash'); # model to json string
+    my $_body_data = %$post_params ? $post_params : $body_data;
+  
+    # Make the HTTP request
+    my $_request;
+    if ($method eq 'POST') {
+        # multipart
+        $header_params->{'Content-Type'} = lc $header_params->{'Content-Type'} eq 'multipart/form' ? 
+            'form-data' : $header_params->{'Content-Type'};
+        
+        $_request = POST($_url, %$header_params, Content => $_body_data);
+  
+    }
+    elsif ($method eq 'PUT') {
+        # multipart
+        $header_params->{'Content-Type'}  = lc $header_params->{'Content-Type'} eq 'multipart/form' ? 
+            'form-data' : $header_params->{'Content-Type'};
+  
+        $_request = PUT($_url, %$header_params, Content => $_body_data);
+  
+    }
+    elsif ($method eq 'GET') {
+        my $headers = HTTP::Headers->new(%$header_params);
+        $_request = GET($_url, %$header_params);
+    }
+    elsif ($method eq 'HEAD') {
+        my $headers = HTTP::Headers->new(%$header_params);
+        $_request = HEAD($_url,%$header_params); 
+    }
+    elsif ($method eq 'DELETE') { #TODO support form data
+        my $headers = HTTP::Headers->new(%$header_params);
+        $_request = DELETE($_url, %$headers);
+    }
+    elsif ($method eq 'PATCH') { #TODO
+    }
+    else {
+    }
+   
+    $self->{ua}->timeout($self->{http_timeout} || $WWW::SwaggerClient::Configuration::http_timeout); 
+    $self->{ua}->agent($self->{http_user_agent} || $WWW::SwaggerClient::Configuration::http_user_agent);
+    
+    my $_response = $self->{ua}->request($_request);
+  
+    unless ($_response->is_success) {
+        croak("API Exception(".$_response->code."): ".$_response->message);
+    }
+       
+    return $_response->content;
   
-  my $_response = $self->{ua}->request($_request);
-
-  unless ($_response->is_success) {
-    croak("API Exception(".$_response->code."): ".$_response->message);
-  }
-     
-  return $_response->content;
-
 }
 
 #  Take value and turn it into a string suitable for inclusion in
@@ -180,13 +180,13 @@ sub to_form_value {
 # @param string $value the value of the parameter
 # @return string the header string
 sub to_string {
-  my ($self, $value) = @_;
-  if (ref($value) eq "DateTime") { # datetime in ISO8601 format
-    return $value->datetime();
-  }
-  else {
-    return $value;
-  }
+    my ($self, $value) = @_;
+    if (ref($value) eq "DateTime") { # datetime in ISO8601 format
+        return $value->datetime();
+    }
+    else {
+        return $value;
+    }
 }
 
 # Deserialize a JSON string into an object
@@ -196,35 +196,55 @@ sub to_string {
 # @return object an instance of $class
 sub deserialize
 {
-  my ($self, $class, $data) = @_;
-  $log->debugf("deserializing %s for %s", $data, $class);
-  my $_result;
-
-  if (not defined $data) {
-    return undef;
-  } elsif ( lc(substr($class, 0, 4)) eq 'map[') { #hash
-    $_result = \(json_decode $data);
-  } elsif ( lc(substr($class, 0, 6)) eq 'array[' ) { # array of data
-    return $data if $data eq '[]'; # return if empty array
-
-    my $_sub_class = substr($class, 6, -1);
-    my @_json_data = json_decode $data;
-    my @_values = ();
-    foreach my $_value (@_json_data) {
-      push @_values, $self->deserialize($_sub_class, $_value);
+    my ($self, $class, $data) = @_;
+    $log->debugf("deserializing %s for %s", $data, $class);
+  
+    if (not defined $data) {
+        return undef;
+    } elsif ( (substr($class, 0, 5)) eq 'HASH[') { #hash
+        if ($class =~ /^HASH\[(.*),(.*)\]$/) {
+            my ($key_type, $type) = ($1, $2);
+            my %hash;
+            my $decoded_data = decode_json $data;
+            foreach my $key (keys %$decoded_data) {
+                if (ref $decoded_data->{$key} eq 'HASH') {
+                    $hash{$key} = $self->deserialize($type, encode_json $decoded_data->{$key});
+                } else {
+                    $hash{$key} = $self->deserialize($type, $decoded_data->{$key});
+                }
+            }
+            return \%hash;
+        } else {
+          #TODO log error
+        }
+    
+    } elsif ( (substr($class, 0, 6)) eq 'ARRAY[' ) { # array of data
+        return $data if $data eq '[]'; # return if empty array
+    
+        my $_sub_class = substr($class, 6, -1);
+        my $_json_data = decode_json $data;
+        my @_values = ();
+        foreach my $_value (@$_json_data) {
+            if (ref $_value eq 'ARRAY') {
+                push @_values, $self->deserialize($_sub_class, encode_json $_value);
+            } else {
+                push @_values, $self->deserialize($_sub_class, $_value);
+            }
+        }
+        return \@_values;
+    } elsif ($class eq 'DateTime') {
+        return DateTime->from_epoch(epoch => str2time($data));
+    } elsif (grep /^$class$/, ('string', 'int', 'float', 'bool', 'object')) {
+        return $data;
+    } else { # model
+        my $_instance = use_module("WWW::SwaggerClient::Object::$class")->new;
+        if (ref $data eq "HASH") {
+            return $_instance->from_hash($data);
+        } else { # string, need to json decode first
+            return $_instance->from_hash(decode_json $data);
+        }
     }
-    $_result = \@_values;
-  } elsif ($class eq 'DateTime') {
-    $_result = DateTime->from_epoch(epoch => str2time($data));
-  } elsif (grep /^$class$/, ('string', 'int', 'float', 'bool', 'object')) { #TODO revise the primitive type
-    $_result= $data;
-  } else { # model
-    my $_instance = use_module("WWW::SwaggerClient::Object::$class")->new;
-    $_result = $_instance->from_hash(decode_json $data);
-  }
-
-  return $_result;
-
+  
 }
 
 # return 'Accept' based on an array of accept provided
@@ -232,16 +252,16 @@ sub deserialize
 # @return String Accept (e.g. application/json)
 sub select_header_accept
 {
-  my ($self, @header) = @_;
-
-  if (@header == 0 || (@header == 1 && $header[0] eq '')) {
-    return undef;
-  } elsif (grep(/^application\/json$/i, @header)) {
-    return 'application/json';
-  } else {
-    return join(',', @header);
-  }
-
+    my ($self, @header) = @_;
+  
+    if (@header == 0 || (@header == 1 && $header[0] eq '')) {
+        return undef;
+    } elsif (grep(/^application\/json$/i, @header)) {
+        return 'application/json';
+    } else {
+        return join(',', @header);
+    }
+  
 }
 
 # return the content type based on an array of content-type provided
@@ -249,16 +269,16 @@ sub select_header_accept
 # @return String Content-Type (e.g. application/json)
 sub select_header_content_type
 {
-  my ($self, @header) = @_;
-
-  if (@header == 0 || (@header == 1 && $header[0] eq '')) {
-    return 'application/json'; # default to application/json
-  } elsif (grep(/^application\/json$/i, @header)) {
-    return 'application/json';
-  } else {
-    return join(',', @header);
-  }
-
+    my ($self, @header) = @_;
+  
+    if (@header == 0 || (@header == 1 && $header[0] eq '')) {
+        return 'application/json'; # default to application/json
+    } elsif (grep(/^application\/json$/i, @header)) {
+        return 'application/json';
+    } else {
+        return join(',', @header);
+    }
+  
 }
 
 # Get API key (with prefix if set)
@@ -268,9 +288,9 @@ sub get_api_key_with_prefix
 {
     my ($self, $api_key) = @_;
     if ($WWW::SwaggerClient::Configuration::api_key_prefix->{$api_key}) {
-      return $WWW::SwaggerClient::Configuration::api_key_prefix->{$api_key}." ".$WWW::SwaggerClient::Configuration::api_key->{$api_key};
+        return $WWW::SwaggerClient::Configuration::api_key_prefix->{$api_key}." ".$WWW::SwaggerClient::Configuration::api_key->{$api_key};
     } else {
-      return $WWW::SwaggerClient::Configuration::api_key->{$api_key};
+        return $WWW::SwaggerClient::Configuration::api_key->{$api_key};
     }
 }
 
@@ -280,28 +300,28 @@ sub get_api_key_with_prefix
 # @param array $queryParams query parameters (by ref)
 # @param array $authSettings array of authentication scheme (e.g ['api_key'])
 sub update_params_for_auth {
-  my ($self, $header_params, $query_params, $auth_settings) = @_;
-
-  return if (!defined($auth_settings) || scalar(@$auth_settings) == 0);
-
-  # one endpoint can have more than 1 auth settings
-  foreach my $auth (@$auth_settings) {
-    # determine which one to use
-    if (!defined($auth)) {
-    }
-    elsif ($auth eq 'api_key') {
-      $header_params->{'api_key'} = $self->get_api_key_with_prefix('api_key');
+    my ($self, $header_params, $query_params, $auth_settings) = @_;
+  
+    return if (!defined($auth_settings) || scalar(@$auth_settings) == 0);
+  
+    # one endpoint can have more than 1 auth settings
+    foreach my $auth (@$auth_settings) {
+        # determine which one to use
+        if (!defined($auth)) {
+        }
+        elsif ($auth eq 'api_key') {
+            $header_params->{'api_key'} = $self->get_api_key_with_prefix('api_key');
+            
+        }
+        elsif ($auth eq 'petstore_auth') {
+            
+            # TODO support oauth
+        }
         
+        else {
+            # TODO show warning about security definition not found
+        }
     }
-    elsif ($auth eq 'petstore_auth') {
-      
-        # TODO support oauth
-    }
-    
-    else {
-      # TODO show warning about security definition not found
-    }
-  }
 }
 
 
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Configuration.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Configuration.pm
index bbce9d74759..aaa387236d9 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Configuration.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Configuration.pm
@@ -7,6 +7,8 @@ use utf8;
 use Log::Any qw($log);
 use Carp;
 
+use constant VERSION => '1.0.0';
+
 # class/static variables
 our $api_client;
 our $http_timeout = 180;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/BaseObject.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/BaseObject.pm
index c4fd4e6aece..12088eb56cd 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/BaseObject.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/BaseObject.pm
@@ -21,56 +21,56 @@ use DateTime;
 
 # return json string
 sub to_hash {
-  return decode_json(JSON->new->convert_blessed->encode( shift ));
+    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->get_attribute_map) {
-    if (defined $self->{$_key}) {
-      $_data->{$self->get_attribute_map->{$_key}} = $self->{$_key};
+    my $self = shift;
+    my $_data = {};
+    foreach my $_key (keys $self->get_attribute_map) {
+        if (defined $self->{$_key}) {
+            $_data->{$self->get_attribute_map->{$_key}} = $self->{$_key};
+        }
     }
-  }
-  return $_data;
+    return $_data;
 }
 
 # from json string
 sub from_hash {
-  my ($self, $hash) = @_;
-  # loop through attributes and use swagger_types to deserialize the data
-  while ( my ($_key, $_type) = each $self->get_swagger_types ) {
-    if ($_type =~ /^array\[/i) { # array
-      my $_subclass = substr($_type, 6, -1);
-      my @_array = ();
-      foreach my $_element (@{$hash->{$self->get_attribute_map->{$_key}}}) {
-        push @_array, $self->_deserialize($_subclass, $_element);
-      }
-      $self->{$_key} = \@_array;
-    } elsif (defined $hash->{$_key}) { #hash(model), primitive, datetime
-      $self->{$_key} = $self->_deserialize($_type, $hash->{$_key});
-    } else {
-      $log->debugf("warning: %s not defined\n", $_key);
+    my ($self, $hash) = @_;
+    # loop through attributes and use swagger_types to deserialize the data
+    while ( my ($_key, $_type) = each $self->get_swagger_types ) {
+        if ($_type =~ /^array\[/i) { # array
+            my $_subclass = substr($_type, 6, -1);
+            my @_array = ();
+            foreach my $_element (@{$hash->{$self->get_attribute_map->{$_key}}}) {
+                push @_array, $self->_deserialize($_subclass, $_element);
+            }
+            $self->{$_key} = \@_array;
+        } elsif (defined $hash->{$_key}) { #hash(model), primitive, datetime
+            $self->{$_key} = $self->_deserialize($_type, $hash->{$_key});
+        } else {
+            $log->debugf("warning: %s not defined\n", $_key);
+        }
     }
-  }
-
-  return $self;
+  
+    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);
-  }
+    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);
+    }
 }
 
 1;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Category.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Category.pm
index 857dccdce5a..2b2c0beceac 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Category.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Category.pm
@@ -20,13 +20,13 @@ use base "WWW::SwaggerClient::Object::BaseObject";
 #
 
 my $swagger_types = {
-      'id' => 'int',
-      'name' => 'string'
+    'id' => 'int',
+    'name' => 'string'
 };
 
 my $attribute_map = {
-      'id' => 'id',
-      'name' => 'name'
+    'id' => 'id',
+    'name' => 'name'
 };
 
 # new object
@@ -44,12 +44,12 @@ sub new {
 
 # get swagger type of the attribute
 sub get_swagger_types {
-  return $swagger_types;
+    return $swagger_types;
 }
 
 # get attribute mappping
 sub get_attribute_map {
-  return $attribute_map;
+    return $attribute_map;
 }
 
 1;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Order.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Order.pm
index 35449647e13..14da4a5f3af 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Order.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Order.pm
@@ -20,21 +20,21 @@ use base "WWW::SwaggerClient::Object::BaseObject";
 #
 
 my $swagger_types = {
-      'id' => 'int',
-      'pet_id' => 'int',
-      'quantity' => 'int',
-      'ship_date' => 'DateTime',
-      'status' => 'string',
-      'complete' => 'boolean'
+    'id' => 'int',
+    'pet_id' => 'int',
+    'quantity' => 'int',
+    'ship_date' => 'DateTime',
+    'status' => 'string',
+    'complete' => 'boolean'
 };
 
 my $attribute_map = {
-      'id' => 'id',
-      'pet_id' => 'petId',
-      'quantity' => 'quantity',
-      'ship_date' => 'shipDate',
-      'status' => 'status',
-      'complete' => 'complete'
+    'id' => 'id',
+    'pet_id' => 'petId',
+    'quantity' => 'quantity',
+    'ship_date' => 'shipDate',
+    'status' => 'status',
+    'complete' => 'complete'
 };
 
 # new object
@@ -60,12 +60,12 @@ sub new {
 
 # get swagger type of the attribute
 sub get_swagger_types {
-  return $swagger_types;
+    return $swagger_types;
 }
 
 # get attribute mappping
 sub get_attribute_map {
-  return $attribute_map;
+    return $attribute_map;
 }
 
 1;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Pet.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Pet.pm
index df32665e826..eb74ad3f368 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Pet.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Pet.pm
@@ -20,21 +20,21 @@ use base "WWW::SwaggerClient::Object::BaseObject";
 #
 
 my $swagger_types = {
-      'id' => 'int',
-      'category' => 'Category',
-      'name' => 'string',
-      'photo_urls' => 'ARRAY[string]',
-      'tags' => 'ARRAY[Tag]',
-      'status' => 'string'
+    'id' => 'int',
+    'category' => 'Category',
+    'name' => 'string',
+    'photo_urls' => 'ARRAY[string]',
+    'tags' => 'ARRAY[Tag]',
+    'status' => 'string'
 };
 
 my $attribute_map = {
-      'id' => 'id',
-      'category' => 'category',
-      'name' => 'name',
-      'photo_urls' => 'photoUrls',
-      'tags' => 'tags',
-      'status' => 'status'
+    'id' => 'id',
+    'category' => 'category',
+    'name' => 'name',
+    'photo_urls' => 'photoUrls',
+    'tags' => 'tags',
+    'status' => 'status'
 };
 
 # new object
@@ -60,12 +60,12 @@ sub new {
 
 # get swagger type of the attribute
 sub get_swagger_types {
-  return $swagger_types;
+    return $swagger_types;
 }
 
 # get attribute mappping
 sub get_attribute_map {
-  return $attribute_map;
+    return $attribute_map;
 }
 
 1;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Tag.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Tag.pm
index 35850032d5c..1b136d5fbfc 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Tag.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Tag.pm
@@ -20,13 +20,13 @@ use base "WWW::SwaggerClient::Object::BaseObject";
 #
 
 my $swagger_types = {
-      'id' => 'int',
-      'name' => 'string'
+    'id' => 'int',
+    'name' => 'string'
 };
 
 my $attribute_map = {
-      'id' => 'id',
-      'name' => 'name'
+    'id' => 'id',
+    'name' => 'name'
 };
 
 # new object
@@ -44,12 +44,12 @@ sub new {
 
 # get swagger type of the attribute
 sub get_swagger_types {
-  return $swagger_types;
+    return $swagger_types;
 }
 
 # get attribute mappping
 sub get_attribute_map {
-  return $attribute_map;
+    return $attribute_map;
 }
 
 1;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/User.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/User.pm
index 88a396ece3a..1beb8f0b201 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/User.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/User.pm
@@ -20,25 +20,25 @@ use base "WWW::SwaggerClient::Object::BaseObject";
 #
 
 my $swagger_types = {
-      'id' => 'int',
-      'username' => 'string',
-      'first_name' => 'string',
-      'last_name' => 'string',
-      'email' => 'string',
-      'password' => 'string',
-      'phone' => 'string',
-      'user_status' => 'int'
+    'id' => 'int',
+    'username' => 'string',
+    'first_name' => 'string',
+    'last_name' => 'string',
+    'email' => 'string',
+    'password' => 'string',
+    'phone' => 'string',
+    'user_status' => 'int'
 };
 
 my $attribute_map = {
-      'id' => 'id',
-      'username' => 'username',
-      'first_name' => 'firstName',
-      'last_name' => 'lastName',
-      'email' => 'email',
-      'password' => 'password',
-      'phone' => 'phone',
-      'user_status' => 'userStatus'
+    'id' => 'id',
+    'username' => 'username',
+    'first_name' => 'firstName',
+    'last_name' => 'lastName',
+    'email' => 'email',
+    'password' => 'password',
+    'phone' => 'phone',
+    'user_status' => 'userStatus'
 };
 
 # new object
@@ -68,12 +68,12 @@ sub new {
 
 # get swagger type of the attribute
 sub get_swagger_types {
-  return $swagger_types;
+    return $swagger_types;
 }
 
 # get attribute mappping
 sub get_attribute_map {
-  return $attribute_map;
+    return $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 dd5ff29a803..bf085889e79 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm
@@ -30,18 +30,6 @@ use Log::Any qw($log);
 use WWW::SwaggerClient::ApiClient;
 use WWW::SwaggerClient::Configuration;
 
-our @EXPORT_OK = qw(
-  update_pet 
-  add_pet 
-  find_pets_by_status 
-  find_pets_by_tags 
-  get_pet_by_id 
-  update_pet_with_form 
-  delete_pet 
-  upload_file 
-  
-);
-
 sub new {
     my $class   = shift;
     my $default_api_client = $WWW::SwaggerClient::Configuration::api_client ? $WWW::SwaggerClient::Configuration::api_client  : WWW::SwaggerClient::ApiClient->new;
@@ -59,481 +47,472 @@ sub new {
 
 }
 
-    
-    #
-    # update_pet
-    #
-    # Update an existing pet
-    # 
-    # @param Pet $body Pet object that needs to be added to the store (required)
-    # @return void
-    #
-    sub update_pet {
-      my ($self, %args) = @_;
+#
+# update_pet
+#
+# Update an existing pet
+# 
+# @param Pet $body Pet object that needs to be added to the store (optional)
+# @return void
+#
+sub update_pet {
+    my ($self, %args) = @_;
 
-      
+    
 
-      # parse inputs
-      my $_resource_path = '/pet';
-      $_resource_path =~ s/{format}/json/; # default format to json
+    # 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 = {};
+    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) {
+    # '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'}) {
+    }
+    $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 = ['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
-    #
-    # Add a new pet to the store
-    # 
-    # @param Pet $body Pet object that needs to be added to the store (required)
-    # @return void
-    #
-    sub add_pet {
-      my ($self, %args) = @_;
-
-      
-
-      # parse inputs
-      my $_resource_path = '/pet';
-      $_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) {
+    }
+
+    # authentication setting, if any
+    my $auth_settings = ['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
+#
+# Add a new pet to the store
+# 
+# @param Pet $body Pet object that needs to be added to the store (optional)
+# @return void
+#
+sub add_pet {
+    my ($self, %args) = @_;
+
+    
+
+    # parse inputs
+    my $_resource_path = '/pet';
+    $_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'}) {
+    }
+    $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 = ['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 (required)
-    # @return ARRAY[Pet]
-    #
-    sub find_pets_by_status {
-      my ($self, %args) = @_;
-
-      
-
-      # parse inputs
-      my $_resource_path = '/pet/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) {
+    }
+
+    # authentication setting, if any
+    my $auth_settings = ['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)
+# @return ARRAY[Pet]
+#
+sub find_pets_by_status {
+    my ($self, %args) = @_;
+
+    
+
+    # parse inputs
+    my $_resource_path = '/pet/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();
+    }
+    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
 
-      # query params
-      if ( exists $args{'status'}) {
+    # 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 = ['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) {
+    }
+    
+    
+    
+    my $_body_data;
+    
+
+    # authentication setting, if any
+    my $auth_settings = ['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('ARRAY[Pet]', $response);
-      return $_response_object;
-      
-  }
-  
-    #
-    # find_pets_by_tags
-    #
-    # Finds Pets by tags
-    # 
-    # @param ARRAY[string] $tags Tags to filter by (required)
-    # @return ARRAY[Pet]
-    #
-    sub find_pets_by_tags {
-      my ($self, %args) = @_;
-
-      
-
-      # parse inputs
-      my $_resource_path = '/pet/findByTags';
-      $_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) {
+    }
+    my $_response_object = $self->{api_client}->deserialize('ARRAY[Pet]', $response);
+    return $_response_object;
+    
+}
+#
+# find_pets_by_tags
+#
+# Finds Pets by tags
+# 
+# @param ARRAY[string] $tags Tags to filter by (optional)
+# @return ARRAY[Pet]
+#
+sub find_pets_by_tags {
+    my ($self, %args) = @_;
+
+    
+
+    # parse inputs
+    my $_resource_path = '/pet/findByTags';
+    $_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();
+    }
+    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
 
-      # query params
-      if ( exists $args{'tags'}) {
+    # query params
+    if ( exists $args{'tags'}) {
         $query_params->{'tags'} = $self->{api_client}->to_query_value($args{'tags'});
-      }
-      
-      
-      
-      my $_body_data;
-      
-
-      # authentication setting, if any
-      my $auth_settings = ['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) {
+    }
+    
+    
+    
+    my $_body_data;
+    
+
+    # authentication setting, if any
+    my $auth_settings = ['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('ARRAY[Pet]', $response);
-      return $_response_object;
-      
-  }
-  
-    #
-    # get_pet_by_id
-    #
-    # Find pet by ID
-    # 
-    # @param int $pet_id ID of pet that needs to be fetched (required)
-    # @return Pet
-    #
-    sub get_pet_by_id {
-      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");
-      }
-      
-
-      # parse inputs
-      my $_resource_path = '/pet/{petId}';
-      $_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) {
+    }
+    my $_response_object = $self->{api_client}->deserialize('ARRAY[Pet]', $response);
+    return $_response_object;
+    
+}
+#
+# get_pet_by_id
+#
+# Find pet by ID
+# 
+# @param int $pet_id ID of pet that needs to be fetched (required)
+# @return Pet
+#
+sub get_pet_by_id {
+    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");
+    }
+    
+
+    # parse inputs
+    my $_resource_path = '/pet/{petId}';
+    $_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();
+    }
+    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
 
-      
-      
-      # path params
-      if ( exists $args{'pet_id'}) {
+    
+    
+    # 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 = ['petstore_auth', '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) {
+    }
+    
+    my $_body_data;
+    
+
+    # authentication setting, if any
+    my $auth_settings = ['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('Pet', $response);
-      return $_response_object;
-      
-  }
-  
-    #
-    # update_pet_with_form
-    #
-    # 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 (required)
-    # @param string $status Updated status of the pet (required)
-    # @return void
-    #
-    sub update_pet_with_form {
-      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 update_pet_with_form");
-      }
-      
-
-      # parse inputs
-      my $_resource_path = '/pet/{petId}';
-      $_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) {
+    }
+    my $_response_object = $self->{api_client}->deserialize('Pet', $response);
+    return $_response_object;
+    
+}
+#
+# update_pet_with_form
+#
+# 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
+#
+sub update_pet_with_form {
+    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 update_pet_with_form");
+    }
+    
+
+    # parse inputs
+    my $_resource_path = '/pet/{petId}';
+    $_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/x-www-form-urlencoded');
+    }
+    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type('application/x-www-form-urlencoded');
 
-      
-      
-      # path params
-      if ( exists $args{'pet_id'}) {
+    
+    
+    # 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;
-      }
-      # form params
-      if ( exists $args{'name'} ) {
+    }
+    # form params
+    if ( exists $args{'name'} ) {
         
         $form_params->{'name'} = $self->{api_client}->to_form_value($args{'name'});
         
-      }# form params
-      if ( exists $args{'status'} ) {
+    }# form params
+    if ( exists $args{'status'} ) {
         
         $form_params->{'status'} = $self->{api_client}->to_form_value($args{'status'});
         
-      }
-      my $_body_data;
-      
-
-      # authentication setting, if any
-      my $auth_settings = ['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 string $api_key  (required)
-    # @param int $pet_id Pet id to delete (required)
-    # @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) {
+    }
+    my $_body_data;
+    
+
+    # authentication setting, if any
+    my $auth_settings = ['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 string $api_key  (optional)
+# @param int $pet_id Pet id to delete (required)
+# @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->{'Content-Type'} = $self->{api_client}->select_header_content_type();
 
-      
-      # header params
-      if ( exists $args{'api_key'}) {
+    
+    # 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'}) {
+    }
+    # 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 = ['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
-    #
-    # uploads an image
-    # 
-    # @param int $pet_id ID of pet to update (required)
-    # @param string $additional_metadata Additional data to pass to server (required)
-    # @param file $file file to upload (required)
-    # @return void
-    #
-    sub upload_file {
-      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 upload_file");
-      }
-      
-
-      # parse inputs
-      my $_resource_path = '/pet/{petId}/uploadImage';
-      $_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) {
+    }
+    
+    my $_body_data;
+    
+
+    # authentication setting, if any
+    my $auth_settings = ['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
+#
+# uploads an image
+# 
+# @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)
+# @return void
+#
+sub upload_file {
+    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 upload_file");
+    }
+    
+
+    # parse inputs
+    my $_resource_path = '/pet/{petId}/uploadImage';
+    $_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('multipart/form-data');
+    }
+    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type('multipart/form-data');
 
-      
-      
-      # path params
-      if ( exists $args{'pet_id'}) {
+    
+    
+    # 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;
-      }
-      # form params
-      if ( exists $args{'additional_metadata'} ) {
+    }
+    # form params
+    if ( exists $args{'additional_metadata'} ) {
         
         $form_params->{'additionalMetadata'} = $self->{api_client}->to_form_value($args{'additional_metadata'});
         
-      }# form params
-      if ( exists $args{'file'} ) {
+    }# form params
+    if ( exists $args{'file'} ) {
         $form_params->{'file'} = [] unless defined $form_params->{'file'};
         push $form_params->{'file'}, $args{'file'};
         
         
-      }
-      my $_body_data;
-      
-
-      # authentication setting, if any
-      my $auth_settings = ['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;
-      
-  }
-  
+    }
+    my $_body_data;
+    
+
+    # authentication setting, if any
+    my $auth_settings = ['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;
+    
+}
 
 
 1;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm
index c27d241cb76..a2ac9010e77 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm
@@ -30,14 +30,6 @@ use Log::Any qw($log);
 use WWW::SwaggerClient::ApiClient;
 use WWW::SwaggerClient::Configuration;
 
-our @EXPORT_OK = qw(
-  get_inventory 
-  place_order 
-  get_order_by_id 
-  delete_order 
-  
-);
-
 sub new {
     my $class   = shift;
     my $default_api_client = $WWW::SwaggerClient::Configuration::api_client ? $WWW::SwaggerClient::Configuration::api_client  : WWW::SwaggerClient::ApiClient->new;
@@ -55,230 +47,225 @@ sub new {
 
 }
 
+#
+# get_inventory
+#
+# Returns pet inventories by status
+# 
+# @return HASH[string,int]
+#
+sub get_inventory {
+    my ($self, %args) = @_;
+
     
-    #
-    # get_inventory
-    #
-    # Returns pet inventories by status
-    # 
-    # @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) {
+
+    # 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 = ['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) {
+    }
+    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
+
+    
+    
+    
+    
+    my $_body_data;
+    
+
+    # authentication setting, if any
+    my $auth_settings = ['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 (required)
-    # @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) {
+    }
+    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)
+# @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'}) {
+    }
+    $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 = [];
+    # authentication setting, if any
+    my $auth_settings = [];
 
-      # 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) {
+    # 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)
-    # @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) {
+    }
+    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)
+# @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();
+    }
+    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
 
-      
-      
-      # path params
-      if ( exists $args{'order_id'}) {
+    
+    
+    # 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 = [];
-
-      # 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) {
+    }
+    
+    my $_body_data;
+    
+
+    # authentication setting, if any
+    my $auth_settings = [];
+
+    # 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
-    #
-    # Delete purchase order by ID
-    # 
-    # @param string $order_id ID of the order that needs to be deleted (required)
-    # @return void
-    #
-    sub delete_order {
-      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 delete_order");
-      }
-      
-
-      # parse inputs
-      my $_resource_path = '/store/order/{orderId}';
-      $_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) {
+    }
+    my $_response_object = $self->{api_client}->deserialize('Order', $response);
+    return $_response_object;
+    
+}
+#
+# delete_order
+#
+# Delete purchase order by ID
+# 
+# @param string $order_id ID of the order that needs to be deleted (required)
+# @return void
+#
+sub delete_order {
+    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 delete_order");
+    }
+    
+
+    # parse inputs
+    my $_resource_path = '/store/order/{orderId}';
+    $_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->{'Content-Type'} = $self->{api_client}->select_header_content_type();
 
-      
-      
-      # path params
-      if ( exists $args{'order_id'}) {
+    
+    
+    # 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 = [];
-
-      # make the API Call
-      
-      $self->{api_client}->call_api($_resource_path, $_method,
-                                             $query_params, $form_params,
-                                             $header_params, $_body_data, $auth_settings);
-      return;
-      
-  }
-  
+    }
+    
+    my $_body_data;
+    
+
+    # authentication setting, if any
+    my $auth_settings = [];
+
+    # 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/lib/WWW/SwaggerClient/UserApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm
index ffb9d4b732b..4c6e293aaaa 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm
@@ -30,18 +30,6 @@ use Log::Any qw($log);
 use WWW::SwaggerClient::ApiClient;
 use WWW::SwaggerClient::Configuration;
 
-our @EXPORT_OK = qw(
-  create_user 
-  create_users_with_array_input 
-  create_users_with_list_input 
-  login_user 
-  logout_user 
-  get_user_by_name 
-  update_user 
-  delete_user 
-  
-);
-
 sub new {
     my $class   = shift;
     my $default_api_client = $WWW::SwaggerClient::Configuration::api_client ? $WWW::SwaggerClient::Configuration::api_client  : WWW::SwaggerClient::ApiClient->new;
@@ -59,446 +47,437 @@ sub new {
 
 }
 
-    
-    #
-    # create_user
-    #
-    # Create user
-    # 
-    # @param User $body Created user object (required)
-    # @return void
-    #
-    sub create_user {
-      my ($self, %args) = @_;
+#
+# create_user
+#
+# Create user
+# 
+# @param User $body Created user object (optional)
+# @return void
+#
+sub create_user {
+    my ($self, %args) = @_;
 
-      
+    
 
-      # parse inputs
-      my $_resource_path = '/user';
-      $_resource_path =~ s/{format}/json/; # default format to json
+    # parse inputs
+    my $_resource_path = '/user';
+    $_resource_path =~ s/{format}/json/; # default format to json
 
-      my $_method = 'POST';
-      my $query_params = {};
-      my $header_params = {};
-      my $form_params = {};
+    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) {
+    # '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'}) {
+    }
+    $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 = [];
-
-      # make the API Call
-      
-      $self->{api_client}->call_api($_resource_path, $_method,
-                                             $query_params, $form_params,
-                                             $header_params, $_body_data, $auth_settings);
-      return;
-      
-  }
-  
-    #
-    # create_users_with_array_input
-    #
-    # Creates list of users with given input array
-    # 
-    # @param ARRAY[User] $body List of user object (required)
-    # @return void
-    #
-    sub create_users_with_array_input {
-      my ($self, %args) = @_;
-
-      
-
-      # parse inputs
-      my $_resource_path = '/user/createWithArray';
-      $_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) {
+    }
+
+    # authentication setting, if any
+    my $auth_settings = [];
+
+    # make the API Call
+    
+    $self->{api_client}->call_api($_resource_path, $_method,
+                                           $query_params, $form_params,
+                                           $header_params, $_body_data, $auth_settings);
+    return;
+    
+}
+#
+# create_users_with_array_input
+#
+# Creates list of users with given input array
+# 
+# @param ARRAY[User] $body List of user object (optional)
+# @return void
+#
+sub create_users_with_array_input {
+    my ($self, %args) = @_;
+
+    
+
+    # parse inputs
+    my $_resource_path = '/user/createWithArray';
+    $_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'}) {
+    }
+    $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 = [];
-
-      # make the API Call
-      
-      $self->{api_client}->call_api($_resource_path, $_method,
-                                             $query_params, $form_params,
-                                             $header_params, $_body_data, $auth_settings);
-      return;
-      
-  }
-  
-    #
-    # create_users_with_list_input
-    #
-    # Creates list of users with given input array
-    # 
-    # @param ARRAY[User] $body List of user object (required)
-    # @return void
-    #
-    sub create_users_with_list_input {
-      my ($self, %args) = @_;
-
-      
-
-      # parse inputs
-      my $_resource_path = '/user/createWithList';
-      $_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) {
+    }
+
+    # authentication setting, if any
+    my $auth_settings = [];
+
+    # make the API Call
+    
+    $self->{api_client}->call_api($_resource_path, $_method,
+                                           $query_params, $form_params,
+                                           $header_params, $_body_data, $auth_settings);
+    return;
+    
+}
+#
+# create_users_with_list_input
+#
+# Creates list of users with given input array
+# 
+# @param ARRAY[User] $body List of user object (optional)
+# @return void
+#
+sub create_users_with_list_input {
+    my ($self, %args) = @_;
+
+    
+
+    # parse inputs
+    my $_resource_path = '/user/createWithList';
+    $_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'}) {
+    }
+    $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 = [];
-
-      # make the API Call
-      
-      $self->{api_client}->call_api($_resource_path, $_method,
-                                             $query_params, $form_params,
-                                             $header_params, $_body_data, $auth_settings);
-      return;
-      
-  }
-  
-    #
-    # login_user
-    #
-    # Logs user into the system
-    # 
-    # @param string $username The user name for login (required)
-    # @param string $password The password for login in clear text (required)
-    # @return string
-    #
-    sub login_user {
-      my ($self, %args) = @_;
-
-      
-
-      # parse inputs
-      my $_resource_path = '/user/login';
-      $_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) {
+    }
+
+    # authentication setting, if any
+    my $auth_settings = [];
+
+    # make the API Call
+    
+    $self->{api_client}->call_api($_resource_path, $_method,
+                                           $query_params, $form_params,
+                                           $header_params, $_body_data, $auth_settings);
+    return;
+    
+}
+#
+# login_user
+#
+# 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
+#
+sub login_user {
+    my ($self, %args) = @_;
+
+    
+
+    # parse inputs
+    my $_resource_path = '/user/login';
+    $_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();
+    }
+    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
 
-      # query params
-      if ( exists $args{'username'}) {
+    # query params
+    if ( exists $args{'username'}) {
         $query_params->{'username'} = $self->{api_client}->to_query_value($args{'username'});
-      }# query params
-      if ( exists $args{'password'}) {
+    }# query params
+    if ( exists $args{'password'}) {
         $query_params->{'password'} = $self->{api_client}->to_query_value($args{'password'});
-      }
-      
-      
-      
-      my $_body_data;
-      
-
-      # authentication setting, if any
-      my $auth_settings = [];
-
-      # 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) {
+    }
+    
+    
+    
+    my $_body_data;
+    
+
+    # authentication setting, if any
+    my $auth_settings = [];
+
+    # 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;
-      
-  }
-  
-    #
-    # logout_user
-    #
-    # Logs out current logged in user session
-    # 
-    # @return void
-    #
-    sub logout_user {
-      my ($self, %args) = @_;
-
-      
-
-      # parse inputs
-      my $_resource_path = '/user/logout';
-      $_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) {
+    }
+    my $_response_object = $self->{api_client}->deserialize('string', $response);
+    return $_response_object;
+    
+}
+#
+# logout_user
+#
+# Logs out current logged in user session
+# 
+# @return void
+#
+sub logout_user {
+    my ($self, %args) = @_;
+
+    
+
+    # parse inputs
+    my $_resource_path = '/user/logout';
+    $_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 = [];
-
-      # 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)
-    # @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->{'Content-Type'} = $self->{api_client}->select_header_content_type();
+
+    
+    
+    
+    
+    my $_body_data;
+    
+
+    # authentication setting, if any
+    my $auth_settings = [];
+
+    # 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)
+# @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();
+    }
+    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
 
-      
-      
-      # path params
-      if ( exists $args{'username'}) {
+    
+    
+    # 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 = [];
-
-      # 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) {
+    }
+    
+    my $_body_data;
+    
+
+    # authentication setting, if any
+    my $auth_settings = [];
+
+    # 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
-    #
-    # Updated user
-    # 
-    # @param string $username name that need to be deleted (required)
-    # @param User $body Updated user object (required)
-    # @return void
-    #
-    sub update_user {
-      my ($self, %args) = @_;
-
-      
-      # verify the required parameter 'username' is set
-      unless (exists $args{'username'}) {
-        croak("Missing the required parameter 'username' when calling update_user");
-      }
-      
-
-      # parse inputs
-      my $_resource_path = '/user/{username}';
-      $_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) {
+    }
+    my $_response_object = $self->{api_client}->deserialize('User', $response);
+    return $_response_object;
+    
+}
+#
+# update_user
+#
+# Updated user
+# 
+# @param string $username name that need to be deleted (required)
+# @param User $body Updated user object (optional)
+# @return void
+#
+sub update_user {
+    my ($self, %args) = @_;
+
+    
+    # verify the required parameter 'username' is set
+    unless (exists $args{'username'}) {
+      croak("Missing the required parameter 'username' when calling update_user");
+    }
+    
+
+    # parse inputs
+    my $_resource_path = '/user/{username}';
+    $_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();
+    }
+    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
 
-      
-      
-      # path params
-      if ( exists $args{'username'}) {
+    
+    
+    # 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;
-      # body params
-      if ( exists $args{'body'}) {
+    }
+    
+    my $_body_data;
+    # body params
+    if ( exists $args{'body'}) {
         $_body_data = $args{'body'};
-      }
-
-      # authentication setting, if any
-      my $auth_settings = [];
-
-      # make the API Call
-      
-      $self->{api_client}->call_api($_resource_path, $_method,
-                                             $query_params, $form_params,
-                                             $header_params, $_body_data, $auth_settings);
-      return;
-      
-  }
-  
-    #
-    # delete_user
-    #
-    # Delete user
-    # 
-    # @param string $username The name that needs to be deleted (required)
-    # @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) {
+    }
+
+    # authentication setting, if any
+    my $auth_settings = [];
+
+    # make the API Call
+    
+    $self->{api_client}->call_api($_resource_path, $_method,
+                                           $query_params, $form_params,
+                                           $header_params, $_body_data, $auth_settings);
+    return;
+    
+}
+#
+# delete_user
+#
+# Delete user
+# 
+# @param string $username The name that needs to be deleted (required)
+# @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();
+    }
+    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
 
-      
-      
-      # path params
-      if ( exists $args{'username'}) {
+    
+    
+    # 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 = [];
-
-      # make the API Call
-      
-      $self->{api_client}->call_api($_resource_path, $_method,
-                                             $query_params, $form_params,
-                                             $header_params, $_body_data, $auth_settings);
-      return;
-      
-  }
-  
+    }
+    
+    my $_body_data;
+    
+
+    # authentication setting, if any
+    my $auth_settings = [];
+
+    # 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 f92eaacb134..00d192b1e54 100644
--- a/samples/client/petstore/perl/pom.xml
+++ b/samples/client/petstore/perl/pom.xml
@@ -27,7 +27,7 @@
                 <version>1.2.1</version>
                 <executions>
                     <execution>
-                        <id>Test::More</id>
+                        <id>Test::More for Pet</id>
                         <phase>integration-test</phase>
                         <goals>
                             <goal>exec</goal>
@@ -39,6 +39,19 @@
                             </arguments>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>Test::More for Store</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>perl</executable>
+                            <arguments>
+                                <argument>t/02_store_api.t</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
         </plugins>
diff --git a/samples/client/petstore/perl/t/02_store_api.t b/samples/client/petstore/perl/t/02_store_api.t
new file mode 100644
index 00000000000..f4687daad41
--- /dev/null
+++ b/samples/client/petstore/perl/t/02_store_api.t
@@ -0,0 +1,88 @@
+use Test::More tests => 22;
+use Test::Exception;
+
+use lib 'lib';
+use strict;
+use warnings;
+
+use JSON;
+
+use_ok('WWW::SwaggerClient::StoreApi');
+use_ok('WWW::SwaggerClient::ApiClient');
+use_ok('WWW::SwaggerClient::Object::Pet');
+use_ok('WWW::SwaggerClient::Object::Tag');
+use_ok('WWW::SwaggerClient::Object::Category');
+
+my $api_client = WWW::SwaggerClient::ApiClient->new();
+my $store_api = WWW::SwaggerClient::StoreApi->new('api_client' => $api_client);
+
+is $store_api->{api_client}->{base_url}, 'http://petstore.swagger.io/v2', 'get the default base URL from api client';
+
+my $get_inventory_response = $store_api->get_inventory();
+
+like ($get_inventory_response->{pending}, qr/^\d+$/, "pending is numeric");
+like ($get_inventory_response->{sold}, qr/^\d+$/, "sold is numeric");
+
+my $pet_json = <<JSON;
+{
+    "pet": { 
+        "id": 0,
+        "category": {
+            "id": 0,
+            "name": "string"
+        },
+        "name": "doggie",
+        "photoUrls": [
+            "string"
+        ],
+        "tags": [
+            {
+                "id": 0,
+                "name": "tag string"
+            }
+        ],
+        "status": "available"
+    }
+}
+JSON
+
+is ref(decode_json $pet_json), "HASH", "the decoded json string is a hash";
+is ref $api_client->deserialize("HASH[string,Pet]", $pet_json)->{pet}, "WWW::SwaggerClient::Object::Pet", "get Pet object from hash";
+is $api_client->deserialize("HASH[string,Pet]", $pet_json)->{pet}->{name}, "doggie", "get the name of the Pet object";
+is $api_client->deserialize("HASH[string,Pet]", $pet_json)->{pet}->{category}->{name}, "string", "get the category name of the Pet object";
+is ref $api_client->deserialize("HASH[string,Pet]", $pet_json)->{pet}->{category}, "WWW::SwaggerClient::Object::Category", "get the Category the Pet object";
+is ref $api_client->deserialize("HASH[string,Pet]", $pet_json)->{pet}->{tags}[0], "WWW::SwaggerClient::Object::Tag", "get the Tag of the Pet object";
+is $api_client->deserialize("HASH[string,Pet]", $pet_json)->{pet}->{tags}[0]->{name}, "tag string", "get the Tag name of the Pet object";
+
+my $array_json = <<JSON;
+[
+    { 
+        "id": 0,
+        "category": {
+            "id": 0,
+            "name": "string"
+        },
+        "name": "doggie",
+        "photoUrls": [
+            "string"
+        ],
+        "tags": [
+            {
+                "id": 0,
+                "name": "tag string"
+            }
+        ],
+        "status": "available"
+    }
+]
+JSON
+
+is ref(decode_json $array_json), "ARRAY", "the decoded json string is an array";
+is ref $api_client->deserialize("ARRAY[Pet]", $array_json)->[0], "WWW::SwaggerClient::Object::Pet", "get Pet object from hash";
+is $api_client->deserialize("ARRAY[Pet]", $array_json)->[0]->{name}, "doggie", "get the name of the Pet object";
+is $api_client->deserialize("ARRAY[Pet]", $array_json)->[0]->{category}->{name}, "string", "get the category name of the Pet object";
+is ref $api_client->deserialize("ARRAY[Pet]", $array_json)->[0]->{category}, "WWW::SwaggerClient::Object::Category", "get the Category the Pet object";
+is ref $api_client->deserialize("ARRAY[Pet]", $array_json)->[0]->{tags}->[0], "WWW::SwaggerClient::Object::Tag", "get the Tag[0] the Pet object";
+is $api_client->deserialize("ARRAY[Pet]", $array_json)->[0]->{tags}->[0]->{name}, "tag string", "get the tag name the Pet object";
+
+
diff --git a/samples/client/petstore/perl/test.pl b/samples/client/petstore/perl/test.pl
index d4f3fbb6f4b..b12105c9054 100755
--- a/samples/client/petstore/perl/test.pl
+++ b/samples/client/petstore/perl/test.pl
@@ -5,6 +5,7 @@
 use strict;
 use warnings;
 use WWW::SwaggerClient::PetApi;
+use WWW::SwaggerClient::StoreApi;
 use WWW::SwaggerClient::ApiClient;
 use WWW::SwaggerClient::Configuration;
 use WWW::SwaggerClient::Object::Pet;
@@ -45,4 +46,30 @@
 print "\nupdate_pet_with_form:".Dumper $api->update_pet_with_form(pet_id => $pet_id, name => 'test_name', status => 'test status');
 print "\ndelete_pet:".Dumper $api->delete_pet(pet_id => $pet_id);
 
+my $store_api = WWW::SwaggerClient::StoreApi->new();
+print "\nget_inventory:".Dumper $store_api->get_inventory();
 
+my $pet_json = <<JSON;
+{
+    "pet": { 
+        "id": 0,
+        "category": {
+            "id": 0,
+            "name": "string"
+        },
+        "name": "doggie",
+        "photoUrls": [
+            "string"
+        ],
+        "tags": [
+            {
+                "id": 0,
+                "name": "tag string"
+            }
+        ],
+        "status": "available"
+    }
+}
+JSON
+
+print "\napi_client->deserialize:".Dumper($api->{api_client}->deserialize("HASH[string,Pet]", $pet_json));
diff --git a/samples/client/petstore/php/SwaggerClient-php/SwaggerClient.php b/samples/client/petstore/php/SwaggerClient-php/SwaggerClient.php
deleted file mode 100644
index 3c02d861ef1..00000000000
--- a/samples/client/petstore/php/SwaggerClient-php/SwaggerClient.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-// load models defined for endpoints
-foreach (glob(dirname(__FILE__)."/lib/models/*.php") as $filename)
-{
-      require_once $filename;
-}
-
-// load classes for accessing the endpoints
-foreach (glob(dirname(__FILE__)."/lib/*.php") as $filename)
-{
-      require_once $filename;
-}
-?>
diff --git a/samples/client/petstore/php/SwaggerClient-php/autoload.php b/samples/client/petstore/php/SwaggerClient-php/autoload.php
new file mode 100644
index 00000000000..acbd3968b23
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/autoload.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * An example of a project-specific implementation.
+ * 
+ * After registering this autoload function with SPL, the following line
+ * would cause the function to attempt to load the \Swagger\Client\Baz\Qux class
+ * from /path/to/project/lib/Baz/Qux.php:
+ * 
+ *      new \Swagger\Client\Baz\Qux;
+ *      
+ * @param string $class The fully-qualified class name.
+ * @return void
+ */
+spl_autoload_register(function ($class) {
+
+    // project-specific namespace prefix
+    $prefix = 'Swagger\\Client\\';
+
+    // base directory for the namespace prefix
+    $base_dir = __DIR__ . '/lib/';
+
+    // does the class use the namespace prefix?
+    $len = strlen($prefix);
+    if (strncmp($prefix, $class, $len) !== 0) {
+        // no, move to the next registered autoloader
+        return;
+    }
+
+    // get the relative class name
+    $relative_class = substr($class, $len);
+
+    // replace the namespace prefix with the base directory, replace namespace
+    // separators with directory separators in the relative class name, append
+    // with .php
+    $file = $base_dir . str_replace('\\', '/', $relative_class) . '.php';
+
+    // if the file exists, require it
+    if (file_exists($file)) {
+        require $file;
+    }
+});
diff --git a/samples/client/petstore/php/SwaggerClient-php/composer.json b/samples/client/petstore/php/SwaggerClient-php/composer.json
index 13fc1b62690..3b432d83b92 100644
--- a/samples/client/petstore/php/SwaggerClient-php/composer.json
+++ b/samples/client/petstore/php/SwaggerClient-php/composer.json
@@ -1,32 +1,33 @@
 {
-  "name": "SwaggerClient/SwaggerClient-php",
-  "description": "",
-  "keywords": [
-    "swagger",
-    "php",
-    "sdk",
-    "api"
-  ],
-  "homepage": "http://swagger.io",
-  "license": "Apache v2",
-  "authors": [
-    {
-      "name": "Swagger and contributors",
-      "homepage": "https://github.com/swagger-api/swagger-codegen"
+    "name": "swagger/swagger-client",
+    "version": "1.0.0",
+    "description": "",
+    "keywords": [
+        "swagger",
+        "php",
+        "sdk",
+        "api"
+    ],
+    "homepage": "http://swagger.io",
+    "license": "Apache v2",
+    "authors": [
+        {
+            "name": "Swagger and contributors",
+            "homepage": "https://github.com/swagger-api/swagger-codegen"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.3",
+        "ext-curl": "*",
+        "ext-json": "*",
+        "ext-mbstring": "*"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~4.0",
+        "satooshi/php-coveralls": "~0.6.1",
+        "squizlabs/php_codesniffer": "~2.0"
+    },
+    "autoload": {
+        "psr-4": { "Swagger\\Client\\" : "lib/" }
     }
-  ],
-  "require": {
-    "php": ">=5.3.3",
-    "ext-curl": "*",
-    "ext-json": "*",
-    "ext-mbstring": "*"
-  },
-  "require-dev": {
-    "phpunit/phpunit": "~4.0",
-    "satooshi/php-coveralls": "~0.6.1",
-    "squizlabs/php_codesniffer": "~2.0"
-  },
-  "autoload": {
-    "psr-4": { "SwaggerClient\\" : "lib/" }
-  }
 }
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/APIClient.php b/samples/client/petstore/php/SwaggerClient-php/lib/APIClient.php
deleted file mode 100644
index b8357f9b479..00000000000
--- a/samples/client/petstore/php/SwaggerClient-php/lib/APIClient.php
+++ /dev/null
@@ -1,454 +0,0 @@
-<?php
-/**
- *  Copyright 2015 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.
- */
-
-namespace SwaggerClient;
-
-class ApiClient {
-
-  public static $PATCH = "PATCH";
-  public static $POST = "POST";
-  public static $GET = "GET";
-  public static $PUT = "PUT";
-  public static $DELETE = "DELETE";
-  
-  private static $default_header = array();
-
-  /*
-   * @var string timeout (second) of the HTTP request, by default set to 0, no timeout
-   */
-  protected $curl_timeout = 0;
-
-  /*
-   * @var string user agent of the HTTP request, set to "PHP-Swagger" by default
-   */
-  protected $user_agent = "PHP-Swagger";
-
-  /**
-   * @param string $host Base url of the API server (optional)
-   */
-  function __construct($host = null) {
-    if ($host === null) {
-      $this->host = 'http://petstore.swagger.io/v2';
-    } else {
-      $this->host = $host;
-    }
-  }
-
-  /**
-   * add default header 
-   *
-   * @param string $header_name header name (e.g. Token)
-   * @param string $header_value header value (e.g. 1z8wp3)
-   */
-  public function addDefaultHeader($header_name, $header_value) {
-    if (!is_string($header_name)) 
-      throw new \InvalidArgumentException('Header name must be a string.');
-
-    self::$default_header[$header_name] =  $header_value;
-  }
-
-  /**
-   * get the default header 
-   *
-   * @return array default header
-   */
-  public function getDefaultHeader() {
-    return self::$default_header;
-  }
-
-  /**
-   * delete the default header based on header name
-   *
-   * @param string $header_name header name (e.g. Token)
-   */
-  public function deleteDefaultHeader($header_name) {
-    unset(self::$default_header[$header_name]);
-  }
-
-  /**
-   * set the user agent of the api client
-   *
-   *  @param string $user_agent the user agent of the api client
-   */
-  public function setUserAgent($user_agent) {
-    if (!is_string($user_agent))
-      throw new \InvalidArgumentException('User-agent must be a string.');
-
-    $this->user_agent= $user_agent;
-  }
-
-  /**
-   * get the user agent of the api client
-   * 
-   * @return string user agent
-   */
-  public function getUserAgent($user_agent) {
-    return $this->user_agent;
-  }
-
-  /**
-   * set the HTTP timeout value
-   *
-   * @param integer $seconds Number of seconds before timing out [set to 0 for no timeout]
-   */
-  public function setTimeout($seconds) {
-    if (!is_numeric($seconds) || $seconds < 0)
-      throw new \InvalidArgumentException('Timeout value must be numeric and a non-negative number.');
-
-    $this->curl_timeout = $seconds;
-  }
-
-  /**
-   * get the HTTP timeout value
-   *
-   * @return string HTTP timeout value
-   */
-  public function getTimeout() {
-    return $this->curl_timeout;
-  }
-
-
-  /**
-   * Get API key (with prefix if set)
-   * @param string key name
-   * @return string API key with the prefix
-   */
-  public function getApiKeyWithPrefix($apiKey) {
-    if (isset(Configuration::$apiKeyPrefix[$apiKey])) {
-      return Configuration::$apiKeyPrefix[$apiKey]." ".Configuration::$apiKey[$apiKey];
-    } else if (isset(Configuration::$apiKey[$apiKey])) {
-      return Configuration::$apiKey[$apiKey];
-    } else {
-      return;
-    }
-  }
-
-  /**
-   * update hearder and query param based on authentication setting
-   * 
-   * @param array $headerParams header parameters (by ref)
-   * @param array $queryParams query parameters (by ref)
-   * @param array $authSettings array of authentication scheme (e.g ['api_key'])
-   */
-  public function updateParamsForAuth(&$headerParams, &$queryParams, $authSettings)
-  {
-    if (count($authSettings) == 0)
-      return;
-
-    // one endpoint can have more than 1 auth settings
-    foreach($authSettings as $auth) {
-      // determine which one to use
-      switch($auth) {
-        
-        case 'api_key':
-          $headerParams['api_key'] = $this->getApiKeyWithPrefix('api_key');
-          
-          break;
-        
-        case 'petstore_auth':
-          
-          //TODO support oauth
-          break;
-        
-        default:
-          //TODO show warning about security definition not found
-      }
-    }
-  }
-  
-  /**
-   * @param string $resourcePath path to method endpoint
-   * @param string $method method to call
-   * @param array $queryParams parameters to be place in query URL
-   * @param array $postData parameters to be placed in POST body
-   * @param array $headerParams parameters to be place in request header
-   * @return mixed
-   */
-  public function callApi($resourcePath, $method, $queryParams, $postData,
-    $headerParams, $authSettings) {
-
-    $headers = array();
-
-    # determine authentication setting
-    $this->updateParamsForAuth($headerParams, $queryParams, $authSettings);
-
-    # construct the http header
-    $headerParams = array_merge((array)self::$default_header, (array)$headerParams);
-
-    foreach ($headerParams as $key => $val) {
-      $headers[] = "$key: $val";
-    }
-
-    // form data
-    if ($postData and in_array('Content-Type: application/x-www-form-urlencoded', $headers)) {
-      $postData = http_build_query($postData);
-    }
-    else if ((is_object($postData) or is_array($postData)) and !in_array('Content-Type: multipart/form-data', $headers)) { // json model
-      $postData = json_encode($this->sanitizeForSerialization($postData));
-    }
-
-    $url = $this->host . $resourcePath;
-
-    $curl = curl_init();
-    // set timeout, if needed
-    if ($this->curl_timeout != 0) {
-      curl_setopt($curl, CURLOPT_TIMEOUT, $this->curl_timeout);
-    }
-    // return the result on success, rather than just TRUE
-    curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-
-    curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
-
-    if (! empty($queryParams)) {
-      $url = ($url . '?' . http_build_query($queryParams));
-    }
-
-    if ($method == self::$POST) {
-      curl_setopt($curl, CURLOPT_POST, true);
-      curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
-    } else if ($method == self::$PATCH) {
-      curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "PATCH");
-      curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
-    } else if ($method == self::$PUT) {
-      curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "PUT");
-      curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
-    } else if ($method == self::$DELETE) {
-      curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "DELETE");
-      curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
-    } else if ($method != self::$GET) {
-      throw new ApiException('Method ' . $method . ' is not recognized.');
-    }
-    curl_setopt($curl, CURLOPT_URL, $url);
-
-    // Set user agent
-    curl_setopt($curl, CURLOPT_USERAGENT, $this->user_agent);
-
-    // debugging for curl
-    if (Configuration::$debug) {
-      error_log("[DEBUG] HTTP Request body  ~BEGIN~\n".print_r($postData, true)."\n~END~\n", 3, Configuration::$debug_file);
-
-      curl_setopt($curl, CURLOPT_VERBOSE, 1);
-      curl_setopt($curl, CURLOPT_STDERR, fopen(Configuration::$debug_file, 'a'));
-    } else {
-      curl_setopt($curl, CURLOPT_VERBOSE, 0);
-    }
-
-    // obtain the HTTP response headers
-    curl_setopt($curl, CURLOPT_HEADER, 1);
-
-    // Make the request
-    $response = curl_exec($curl);
-    $http_header_size = curl_getinfo($curl, CURLINFO_HEADER_SIZE);
-    $http_header = substr($response, 0, $http_header_size);
-    $http_body = substr($response, $http_header_size);
-    $response_info = curl_getinfo($curl);
-
-    // debug HTTP response body
-    if (Configuration::$debug) {
-        error_log("[DEBUG] HTTP Response body ~BEGIN~\n".print_r($http_body, true)."\n~END~\n", 3, Configuration::$debug_file);
-    }
-
-    // Handle the response
-    if ($response_info['http_code'] == 0) {
-      throw new ApiException("API call to $url timed out: ".serialize($response_info), 0, null, null);
-    } else if ($response_info['http_code'] >= 200 && $response_info['http_code'] <= 299 ) {
-      $data = json_decode($http_body);
-      if (json_last_error() > 0) { // if response is a string
-        $data = $http_body;
-      }
-    } else {
-      throw new ApiException("[".$response_info['http_code']."] Error connecting to the API ($url)",
-        $response_info['http_code'], $http_header, $http_body);
-    }
-    return $data;
-  }
-
-  /**
-   * Build a JSON POST object
-   */
-  protected function sanitizeForSerialization($data)
-  {
-    if (is_scalar($data) || null === $data) {
-      $sanitized = $data;
-    } else if ($data instanceof \DateTime) {
-      $sanitized = $data->format(\DateTime::ISO8601);
-    } else if (is_array($data)) {
-      foreach ($data as $property => $value) {
-        $data[$property] = $this->sanitizeForSerialization($value);
-      }
-      $sanitized = $data;
-    } else if (is_object($data)) {
-      $values = array();
-      foreach (array_keys($data::$swaggerTypes) as $property) {
-        if ($data->$property !== null) {
-          $values[$data::$attributeMap[$property]] = $this->sanitizeForSerialization($data->$property);
-        }
-      }
-      $sanitized = $values;
-    } else {
-      $sanitized = (string)$data;
-    }
-
-    return $sanitized;
-  }
-
-  /**
-   * Take value and turn it into a string suitable for inclusion in
-   * the path, by url-encoding.
-   * @param string $value a string which will be part of the path
-   * @return string the serialized object
-   */
-  public static function toPathValue($value) {
-      return rawurlencode(self::toString($value));
-  }
-
-  /**
-   * Take value and turn it into a string suitable for inclusion in
-   * the query, by imploding comma-separated if it's an object.
-   * If it's a string, pass through unchanged. It will be url-encoded
-   * later.
-   * @param object $object an object to be serialized to a string
-   * @return string the serialized object
-   */
-  public static function toQueryValue($object) {
-        if (is_array($object)) {
-            return implode(',', $object);
-        } else {
-            return self::toString($object);
-        }
-  }
-
-  /**
-   * Take value and turn it into a string suitable for inclusion in
-   * the header. If it's a string, pass through unchanged
-   * If it's a datetime object, format it in ISO8601
-   * @param string $value a string which will be part of the header
-   * @return string the header string
-   */
-  public static function toHeaderValue($value) {
-      return self::toString($value);
-  }
-
-  /**
-   * Take value and turn it into a string suitable for inclusion in
-   * the http body (form parameter). If it's a string, pass through unchanged
-   * If it's a datetime object, format it in ISO8601
-   * @param string $value the value of the form parameter
-   * @return string the form string
-   */
-  public static function toFormValue($value) {
-      return self::toString($value);
-  }
-
-  /**
-   * Take value and turn it into a string suitable for inclusion in
-   * the parameter. If it's a string, pass through unchanged
-   * If it's a datetime object, format it in ISO8601
-   * @param string $value the value of the parameter
-   * @return string the header string
-   */
-  public static function toString($value) {
-    if ($value instanceof \DateTime) { // datetime in ISO8601 format
-      return $value->format(\DateTime::ISO8601);
-    }
-    else {
-      return $value;
-    }
-   }
-
-  /**
-   * Deserialize a JSON string into an object
-   *
-   * @param object $object object or primitive to be deserialized
-   * @param string $class class name is passed as a string
-   * @return object an instance of $class
-   */
-  public static function deserialize($data, $class)
-  {
-    if (null === $data) {
-      $deserialized = null;
-    } elseif (substr($class, 0, 4) == 'map[') { # for associative array e.g. map[string,int]
-      $inner = substr($class, 4, -1);
-      $deserialized = array();
-      if(strrpos($inner, ",") !== false) {
-        $subClass_array = explode(',', $inner, 2);
-        $subClass = $subClass_array[1];
-        foreach ($data as $key => $value) {
-          $deserialized[$key] = self::deserialize($value, $subClass);
-        }        
-      }
-    } elseif (strcasecmp(substr($class, 0, 6),'array[') == 0) {
-      $subClass = substr($class, 6, -1);
-      $values = array();
-      foreach ($data as $key => $value) {
-        $values[] = self::deserialize($value, $subClass);
-      }
-      $deserialized = $values;
-    } elseif ($class == 'DateTime') {
-      $deserialized = new \DateTime($data);
-    } elseif (in_array($class, array('string', 'int', 'float', 'double', 'bool', 'object'))) {
-      settype($data, $class);
-      $deserialized = $data;
-    } else {
-      $class = "SwaggerClient\\models\\".$class;
-      $instance = new $class();
-      foreach ($instance::$swaggerTypes as $property => $type) {
-        $original_property_name = $instance::$attributeMap[$property];
-        if (isset($original_property_name) && isset($data->$original_property_name)) {
-          $instance->$property = self::deserialize($data->$original_property_name, $type);
-        }
-      }
-      $deserialized = $instance;
-    }
-
-    return $deserialized;
-  }
-
-  /*
-   * return the header 'Accept' based on an array of Accept provided
-   *
-   * @param array[string] $accept Array of header
-   * @return string Accept (e.g. application/json)
-   */
-  public static function selectHeaderAccept($accept) {
-    if (count($accept) === 0 or (count($accept) === 1 and $accept[0] === '')) {
-      return NULL;
-    } elseif (preg_grep("/application\/json/i", $accept)) {
-      return 'application/json';
-    } else {
-      return implode(',', $accept);
-    }
-  }
-
-  /*
-   * return the content type based on an array of content-type provided
-   *
-   * @param array[string] content_type_array Array fo content-type
-   * @return string Content-Type (e.g. application/json)
-   */
-  public static function selectHeaderContentType($content_type) {
-    if (count($content_type) === 0 or (count($content_type) === 1 and $content_type[0] === '')) {
-      return 'application/json';
-    } elseif (preg_grep("/application\/json/i", $content_type)) {
-      return 'application/json';
-    } else {
-      return implode(',', $content_type);
-    }
-  }
-
-}
-
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php
new file mode 100644
index 00000000000..8e75c360aea
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php
@@ -0,0 +1,689 @@
+<?php
+/**
+ * PetApi
+ * 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 2015 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\Api;
+
+use \Swagger\Client\Configuration;
+use \Swagger\Client\ApiClient;
+use \Swagger\Client\ApiException;
+use \Swagger\Client\ObjectSerializer;
+
+/**
+ * PetApi 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 PetApi
+{
+
+    /**
+     * API Client
+     * @var \Swagger\Client\ApiClient instance of the ApiClient
+     */
+    protected $apiClient;
+  
+    /**
+     * Constructor
+     * @param \Swagger\Client\ApiClient|null $apiClient The api client to use
+     */
+    function __construct($apiClient = null)
+    {
+        if ($apiClient == null) {
+            $apiClient = new ApiClient();
+            $apiClient->getConfig()->setHost('http://petstore.swagger.io/v2');
+        }
+  
+        $this->apiClient = $apiClient;
+    }
+  
+    /**
+     * Get API client
+     * @return \Swagger\Client\ApiClient get the API client
+     */
+    public function getApiClient()
+    {
+        return $this->apiClient;
+    }
+  
+    /**
+     * Set the API client
+     * @param \Swagger\Client\ApiClient $apiClient set the API client
+     * @return PetApi
+     */
+    public function setApiClient(ApiClient $apiClient)
+    {
+        $this->apiClient = $apiClient;
+        return $this;
+    }
+  
+    
+    /**
+     * 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)
+    {
+        
+  
+        // 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
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        
+        //TODO support oauth
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            }
+  
+            throw $e;
+        }
+        
+    }
+    
+    /**
+     * addPet
+     *
+     * Add a new pet to the store
+     *
+     * @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 addPet($body=null)
+    {
+        
+  
+        // parse inputs
+        $resourcePath = "/pet";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "POST";
+        $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
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        
+        //TODO support oauth
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            }
+  
+            throw $e;
+        }
+        
+    }
+    
+    /**
+     * findPetsByStatus
+     *
+     * Finds Pets by status
+     *
+     * @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)
+    {
+        
+  
+        // 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 ($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
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        
+        //TODO support oauth
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams, '\Swagger\Client\Model\Pet[]'
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            case 200:
+                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Pet[]', $httpHeader);
+                $e->setResponseObject($data);
+                break;
+            }
+  
+            throw $e;
+        }
+        
+        if (!$response) {
+            return null;
+        }
+  
+        return $this->apiClient->getSerializer()->deserialize($response, '\Swagger\Client\Model\Pet[]');
+        
+    }
+    
+    /**
+     * 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)
+    {
+        
+  
+        // 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 ($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
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        
+        //TODO support oauth
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams, '\Swagger\Client\Model\Pet[]'
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            case 200:
+                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Pet[]', $httpHeader);
+                $e->setResponseObject($data);
+                break;
+            }
+  
+            throw $e;
+        }
+        
+        if (!$response) {
+            return null;
+        }
+  
+        return $this->apiClient->getSerializer()->deserialize($response, '\Swagger\Client\Model\Pet[]');
+        
+    }
+    
+    /**
+     * 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)
+    {
+        
+        // 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
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        $apiKey = $this->apiClient->getApiKeyWithPrefix('api_key');
+        if (isset($apiKey)) {
+            $headerParams['api_key'] = $apiKey;
+        }
+        
+        
+        
+        
+        //TODO support oauth
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams, '\Swagger\Client\Model\Pet'
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            case 200:
+                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Pet', $httpHeader);
+                $e->setResponseObject($data);
+                break;
+            }
+  
+            throw $e;
+        }
+        
+        if (!$response) {
+            return null;
+        }
+  
+        return $this->apiClient->getSerializer()->deserialize($response, '\Swagger\Client\Model\Pet');
+        
+    }
+    
+    /**
+     * 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)
+    {
+        
+        // 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";
+        $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
+            );
+        }
+        // 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
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        
+        //TODO support oauth
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            }
+  
+            throw $e;
+        }
+        
+    }
+    
+    /**
+     * deletePet
+     *
+     * Deletes a pet
+     *
+     * @param int $pet_id Pet id to delete (required)
+     * @param string $api_key  (optional)
+     * @return void
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function deletePet($pet_id, $api_key=null)
+    {
+        
+        // verify the required parameter 'pet_id' is set
+        if ($pet_id === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling deletePet');
+        }
+  
+        // parse inputs
+        $resourcePath = "/pet/{petId}";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "DELETE";
+        $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());
+  
+        
+        // header params
+        if ($api_key !== null) {
+            $headerParams['api_key'] = $this->apiClient->getSerializer()->toHeaderValue($api_key);
+        }
+        // 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
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        
+        //TODO support oauth
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            }
+  
+            throw $e;
+        }
+        
+    }
+    
+    /**
+     * uploadFile
+     *
+     * uploads an image
+     *
+     * @param int $pet_id ID of pet to update (required)
+     * @param string $additional_metadata Additional data to pass to server (optional)
+     * @param \SplFileObject $file file to upload (optional)
+     * @return void
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function uploadFile($pet_id, $additional_metadata=null, $file=null)
+    {
+        
+        // verify the required parameter 'pet_id' is set
+        if ($pet_id === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling uploadFile');
+        }
+  
+        // parse inputs
+        $resourcePath = "/pet/{petId}/uploadImage";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "POST";
+        $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('multipart/form-data'));
+  
+        
+        
+        // path params
+        if ($pet_id !== null) {
+            $resourcePath = str_replace(
+                "{" . "petId" . "}",
+                $this->apiClient->getSerializer()->toPathValue($pet_id),
+                $resourcePath
+            );
+        }
+        // form params
+        if ($additional_metadata !== null) {
+            $formParams['additionalMetadata'] = $this->apiClient->getSerializer()->toFormValue($additional_metadata);
+        }// form params
+        if ($file !== null) {
+            $formParams['file'] = '@' . $this->apiClient->getSerializer()->toFormValue($file);
+        }
+        
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        
+        //TODO support oauth
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            }
+  
+            throw $e;
+        }
+        
+    }
+    
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php
new file mode 100644
index 00000000000..ede8a3c14da
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php
@@ -0,0 +1,384 @@
+<?php
+/**
+ * StoreApi
+ * 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 2015 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\Api;
+
+use \Swagger\Client\Configuration;
+use \Swagger\Client\ApiClient;
+use \Swagger\Client\ApiException;
+use \Swagger\Client\ObjectSerializer;
+
+/**
+ * StoreApi 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 StoreApi
+{
+
+    /**
+     * API Client
+     * @var \Swagger\Client\ApiClient instance of the ApiClient
+     */
+    protected $apiClient;
+  
+    /**
+     * Constructor
+     * @param \Swagger\Client\ApiClient|null $apiClient The api client to use
+     */
+    function __construct($apiClient = null)
+    {
+        if ($apiClient == null) {
+            $apiClient = new ApiClient();
+            $apiClient->getConfig()->setHost('http://petstore.swagger.io/v2');
+        }
+  
+        $this->apiClient = $apiClient;
+    }
+  
+    /**
+     * Get API client
+     * @return \Swagger\Client\ApiClient get the API client
+     */
+    public function getApiClient()
+    {
+        return $this->apiClient;
+    }
+  
+    /**
+     * Set the API client
+     * @param \Swagger\Client\ApiClient $apiClient set the API client
+     * @return StoreApi
+     */
+    public function setApiClient(ApiClient $apiClient)
+    {
+        $this->apiClient = $apiClient;
+        return $this;
+    }
+  
+    
+    /**
+     * getInventory
+     *
+     * Returns pet inventories by status
+     *
+     * @return map[string,int]
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function getInventory()
+    {
+        
+  
+        // parse inputs
+        $resourcePath = "/store/inventory";
+        $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
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        $apiKey = $this->apiClient->getApiKeyWithPrefix('api_key');
+        if (isset($apiKey)) {
+            $headerParams['api_key'] = $apiKey;
+        }
+        
+        
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams, 'map[string,int]'
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            case 200:
+                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), 'map[string,int]', $httpHeader);
+                $e->setResponseObject($data);
+                break;
+            }
+  
+            throw $e;
+        }
+        
+        if (!$response) {
+            return null;
+        }
+  
+        return $this->apiClient->getSerializer()->deserialize($response, 'map[string,int]');
+        
+    }
+    
+    /**
+     * placeOrder
+     *
+     * Place an order for a pet
+     *
+     * @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 placeOrder($body=null)
+    {
+        
+  
+        // parse inputs
+        $resourcePath = "/store/order";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "POST";
+        $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());
+  
+        
+        
+        
+        
+        // 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
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams, '\Swagger\Client\Model\Order'
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            case 200:
+                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Order', $httpHeader);
+                $e->setResponseObject($data);
+                break;
+            }
+  
+            throw $e;
+        }
+        
+        if (!$response) {
+            return null;
+        }
+  
+        return $this->apiClient->getSerializer()->deserialize($response, '\Swagger\Client\Model\Order');
+        
+    }
+    
+    /**
+     * getOrderById
+     *
+     * Find purchase order by ID
+     *
+     * @param string $order_id ID of pet that needs to be fetched (required)
+     * @return \Swagger\Client\Model\Order
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function getOrderById($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 getOrderById');
+        }
+  
+        // parse inputs
+        $resourcePath = "/store/order/{orderId}";
+        $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 ($order_id !== null) {
+            $resourcePath = str_replace(
+                "{" . "orderId" . "}",
+                $this->apiClient->getSerializer()->toPathValue($order_id),
+                $resourcePath
+            );
+        }
+        
+        
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams, '\Swagger\Client\Model\Order'
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            case 200:
+                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Order', $httpHeader);
+                $e->setResponseObject($data);
+                break;
+            }
+  
+            throw $e;
+        }
+        
+        if (!$response) {
+            return null;
+        }
+  
+        return $this->apiClient->getSerializer()->deserialize($response, '\Swagger\Client\Model\Order');
+        
+    }
+    
+    /**
+     * 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)
+    {
+        
+        // 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";
+        $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
+            );
+        }
+        
+        
+  
+        // for model (json/xml)
+        if (isset($_tempBody)) {
+            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            }
+  
+            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
new file mode 100644
index 00000000000..773181a52fc
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/UserApi.php
@@ -0,0 +1,626 @@
+<?php
+/**
+ * UserApi
+ * 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 2015 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\Api;
+
+use \Swagger\Client\Configuration;
+use \Swagger\Client\ApiClient;
+use \Swagger\Client\ApiException;
+use \Swagger\Client\ObjectSerializer;
+
+/**
+ * UserApi 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 UserApi
+{
+
+    /**
+     * API Client
+     * @var \Swagger\Client\ApiClient instance of the ApiClient
+     */
+    protected $apiClient;
+  
+    /**
+     * Constructor
+     * @param \Swagger\Client\ApiClient|null $apiClient The api client to use
+     */
+    function __construct($apiClient = null)
+    {
+        if ($apiClient == null) {
+            $apiClient = new ApiClient();
+            $apiClient->getConfig()->setHost('http://petstore.swagger.io/v2');
+        }
+  
+        $this->apiClient = $apiClient;
+    }
+  
+    /**
+     * Get API client
+     * @return \Swagger\Client\ApiClient get the API client
+     */
+    public function getApiClient()
+    {
+        return $this->apiClient;
+    }
+  
+    /**
+     * Set the API client
+     * @param \Swagger\Client\ApiClient $apiClient set the API client
+     * @return UserApi
+     */
+    public function setApiClient(ApiClient $apiClient)
+    {
+        $this->apiClient = $apiClient;
+        return $this;
+    }
+  
+    
+    /**
+     * createUser
+     *
+     * Create user
+     *
+     * @param \Swagger\Client\Model\User $body Created user object (optional)
+     * @return void
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function createUser($body=null)
+    {
+        
+  
+        // parse inputs
+        $resourcePath = "/user";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "POST";
+        $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());
+  
+        
+        
+        
+        
+        // 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
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            }
+  
+            throw $e;
+        }
+        
+    }
+    
+    /**
+     * createUsersWithArrayInput
+     *
+     * Creates list of users with given input array
+     *
+     * @param \Swagger\Client\Model\User[] $body List of user object (optional)
+     * @return void
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function createUsersWithArrayInput($body=null)
+    {
+        
+  
+        // parse inputs
+        $resourcePath = "/user/createWithArray";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "POST";
+        $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());
+  
+        
+        
+        
+        
+        // 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
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            }
+  
+            throw $e;
+        }
+        
+    }
+    
+    /**
+     * createUsersWithListInput
+     *
+     * Creates list of users with given input array
+     *
+     * @param \Swagger\Client\Model\User[] $body List of user object (optional)
+     * @return void
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function createUsersWithListInput($body=null)
+    {
+        
+  
+        // parse inputs
+        $resourcePath = "/user/createWithList";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "POST";
+        $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());
+  
+        
+        
+        
+        
+        // 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
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams
+            );
+        } 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)
+    {
+        
+  
+        // 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
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams, 'string'
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            case 200:
+                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), 'string', $httpHeader);
+                $e->setResponseObject($data);
+                break;
+            }
+  
+            throw $e;
+        }
+        
+        if (!$response) {
+            return null;
+        }
+  
+        return $this->apiClient->getSerializer()->deserialize($response, 'string');
+        
+    }
+    
+    /**
+     * logoutUser
+     *
+     * Logs out current logged in user session
+     *
+     * @return void
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function logoutUser()
+    {
+        
+  
+        // 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
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams
+            );
+        } 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)
+    {
+        
+        // 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
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams, '\Swagger\Client\Model\User'
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            case 200:
+                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\User', $httpHeader);
+                $e->setResponseObject($data);
+                break;
+            }
+  
+            throw $e;
+        }
+        
+        if (!$response) {
+            return null;
+        }
+  
+        return $this->apiClient->getSerializer()->deserialize($response, '\Swagger\Client\Model\User');
+        
+    }
+    
+    /**
+     * 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)
+    {
+        
+        // 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
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            }
+  
+            throw $e;
+        }
+        
+    }
+    
+    /**
+     * deleteUser
+     *
+     * Delete user
+     *
+     * @param string $username The name that needs to be deleted (required)
+     * @return void
+     * @throws \Swagger\Client\ApiException on non-2xx response
+     */
+    public function deleteUser($username)
+    {
+        
+        // verify the required parameter 'username' is set
+        if ($username === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $username when calling deleteUser');
+        }
+  
+        // parse inputs
+        $resourcePath = "/user/{username}";
+        $resourcePath = str_replace("{format}", "json", $resourcePath);
+        $method = "DELETE";
+        $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
+        } else if (count($formParams) > 0) {
+            $httpBody = $formParams; // for HTTP post (form)
+        }
+        
+        // make the API Call
+        try
+        {
+            list($response, $httpHeader) = $this->apiClient->callApi(
+                $resourcePath, $method,
+                $queryParams, $httpBody,
+                $headerParams
+            );
+        } catch (ApiException $e) {
+            switch ($e->getCode()) { 
+            }
+  
+            throw $e;
+        }
+        
+    }
+    
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/ApiClient.php b/samples/client/petstore/php/SwaggerClient-php/lib/ApiClient.php
new file mode 100644
index 00000000000..bf4f4e482bf
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/ApiClient.php
@@ -0,0 +1,272 @@
+<?php
+/**
+ * ApiClient
+ * 
+ * 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 2015 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;
+
+/**
+ * ApiClient 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 ApiClient
+{
+
+    public static $PATCH = "PATCH";
+    public static $POST = "POST";
+    public static $GET = "GET";
+    public static $PUT = "PUT";
+    public static $DELETE = "DELETE";
+  
+    /** 
+     * Configuration
+     * @var Configuration
+     */
+    protected $config;
+  
+    /**
+     * Object Serializer
+     * @var ObjectSerializer
+     */
+    protected $serializer;
+  
+    /**
+     * Constructor of the class
+     * @param Configuration $config config for this ApiClient
+     */
+    function __construct(Configuration $config = null)
+    {
+        if ($config == null) {
+            $config = Configuration::getDefaultConfiguration();
+        }
+        
+        $this->config = $config;
+        $this->serializer = new ObjectSerializer();
+    }
+  
+    /**
+     * Get the config
+     * @return Configuration
+     */
+    public function getConfig()
+    {
+        return $this->config;
+    }
+  
+    /**
+     * Get the serializer
+     * @return ObjectSerializer
+     */
+    public function getSerializer()
+    {
+        return $this->serializer;
+    }
+  
+    /**
+     * Get API key (with prefix if set)
+     * @param  string $apiKeyIdentifier name of apikey
+     * @return string API key with the prefix
+     */
+    public function getApiKeyWithPrefix($apiKeyIdentifier)
+    {
+        $prefix = $this->config->getApiKeyPrefix($apiKeyIdentifier);
+        $apiKey = $this->config->getApiKey($apiKeyIdentifier);
+  
+        if (!isset($apiKey)) {
+            return null;
+        }
+  
+        if (isset($prefix)) {
+            $keyWithPrefix = $prefix." ".$apiKey;
+        } else {
+            $keyWithPrefix = $apiKey;
+        }
+  
+        return $keyWithPrefix;
+    }
+    
+    /**
+     * Make the HTTP call (Sync)
+     * @param string $resourcePath path to method endpoint
+     * @param string $method       method to call
+     * @param array  $queryParams  parameters to be place in query URL
+     * @param array  $postData     parameters to be placed in POST body
+     * @param array  $headerParams parameters to be place in request header
+     * @param string $responseType expected response type of the endpoint
+     * @throws \Swagger\Client\ApiException on a non 2xx response
+     * @return mixed
+     */
+    public function callApi($resourcePath, $method, $queryParams, $postData, $headerParams, $responseType=null)
+    {
+  
+        $headers = array();
+  
+        // construct the http header
+        $headerParams = array_merge(
+            (array)$this->config->getDefaultHeaders(), 
+            (array)$headerParams
+        );
+  
+        foreach ($headerParams as $key => $val) {
+            $headers[] = "$key: $val";
+        }
+  
+        // form data
+        if ($postData and in_array('Content-Type: application/x-www-form-urlencoded', $headers)) {
+            $postData = http_build_query($postData);
+        } else if ((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));
+        }
+  
+        $url = $this->config->getHost() . $resourcePath;
+  
+        $curl = curl_init();
+        // set timeout, if needed
+        if ($this->config->getCurlTimeout() != 0) {
+            curl_setopt($curl, CURLOPT_TIMEOUT, $this->config->getCurlTimeout());
+        }
+        // return the result on success, rather than just TRUE
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+  
+        curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
+  
+        if (! empty($queryParams)) {
+            $url = ($url . '?' . http_build_query($queryParams));
+        }
+  
+        if ($method == self::$POST) {
+            curl_setopt($curl, CURLOPT_POST, true);
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
+        } else if ($method == self::$PATCH) {
+            curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "PATCH");
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
+        } else if ($method == self::$PUT) {
+            curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "PUT");
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
+        } else if ($method == self::$DELETE) {
+            curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "DELETE");
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
+        } else if ($method != self::$GET) {
+            throw new ApiException('Method ' . $method . ' is not recognized.');
+        }
+        curl_setopt($curl, CURLOPT_URL, $url);
+  
+        // Set user agent
+        curl_setopt($curl, CURLOPT_USERAGENT, $this->config->getUserAgent());
+  
+        // debugging for curl
+        if ($this->config->getDebug()) {
+            error_log("[DEBUG] HTTP Request body  ~BEGIN~\n".print_r($postData, true)."\n~END~\n", 3, $this->config->getDebugFile());
+  
+            curl_setopt($curl, CURLOPT_VERBOSE, 1);
+            curl_setopt($curl, CURLOPT_STDERR, fopen($this->config->getDebugFile(), 'a'));
+        } else {
+            curl_setopt($curl, CURLOPT_VERBOSE, 0);
+        }
+  
+        // obtain the HTTP response headers
+        curl_setopt($curl, CURLOPT_HEADER, 1);
+  
+        // Make the request
+        $response = curl_exec($curl);
+        $http_header_size = curl_getinfo($curl, CURLINFO_HEADER_SIZE);
+        $http_header = substr($response, 0, $http_header_size);
+        $http_body = substr($response, $http_header_size);
+        $response_info = curl_getinfo($curl);
+  
+        // debug HTTP response body
+        if ($this->config->getDebug()) {
+            error_log("[DEBUG] HTTP Response body ~BEGIN~\n".print_r($http_body, true)."\n~END~\n", 3, $this->config->getDebugFile());
+        }
+  
+        // Handle the response
+        if ($response_info['http_code'] == 0) {
+            throw new ApiException("API call to $url timed out: ".serialize($response_info), 0, null, null);
+        } else if ($response_info['http_code'] >= 200 && $response_info['http_code'] <= 299 ) {
+            // return raw body if response is a file 
+            if ($responseType == '\SplFileObject') {
+                return array($http_body, $http_header);
+            }
+  
+            $data = json_decode($http_body);
+            if (json_last_error() > 0) { // if response is a string
+                $data = $http_body;
+            }
+        } else {
+            throw new ApiException(
+                "[".$response_info['http_code']."] Error connecting to the API ($url)",
+                $response_info['http_code'], $http_header, $http_body
+            );
+        }
+        return array($data, $http_header);
+    }
+  
+    /**
+     * Return the header 'Accept' based on an array of Accept provided
+     *
+     * @param string[] $accept Array of header
+     *
+     * @return string Accept (e.g. application/json)
+     */
+    public static function selectHeaderAccept($accept)
+    {
+        if (count($accept) === 0 or (count($accept) === 1 and $accept[0] === '')) {
+            return null;
+        } elseif (preg_grep("/application\/json/i", $accept)) {
+            return 'application/json';
+        } else {
+            return implode(',', $accept);
+        }
+    }
+  
+    /**
+     * Return the content type based on an array of content-type provided
+     *
+     * @param string[] $content_type Array fo content-type
+     *
+     * @return string Content-Type (e.g. application/json)
+     */
+    public static function selectHeaderContentType($content_type)
+    {
+        if (count($content_type) === 0 or (count($content_type) === 1 and $content_type[0] === '')) {
+            return 'application/json';
+        } elseif (preg_grep("/application\/json/i", $content_type)) {
+            return 'application/json';
+        } else {
+            return implode(',', $content_type);
+        }
+    }
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php b/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php
index 51f2c4b877e..ce6c19e245f 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php
@@ -1,4 +1,14 @@
 <?php
+/**
+ * ApiException
+ * 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 2015 SmartBear Software
  *
@@ -14,45 +24,97 @@
  *  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 SwaggerClient;
+namespace Swagger\Client;
 
 use \Exception;
 
-class ApiException extends Exception {
-
-  /**
-   * The HTTP body of the server response.
-   */
-  protected $response_body;
-
-  /**
-   * The HTTP header of the server response.
-   */
-  protected $response_headers;
-
-  public function __construct($message="", $code=0, $responseHeaders=null, $responseBody=null) {
-    parent::__construct($message, $code);
-    $this->response_headers = $responseHeaders;
-    $this->response_body = $responseBody;
-  }
-
-  /**
-   * Get the HTTP response header
-   *
-   * @return string HTTP response header
-   */
-  public function getResponseHeaders() {
-    return $this->response_headers;
-  }
+/**
+ * ApiException 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 ApiException extends Exception
+{
 
-  /**
-   * Get the HTTP response body
-   *
-   * @return string HTTP response body
-   */
-  public function getResponseBody() {
-    return $this->response_body;
-  }
+    /** 
+     * The HTTP body of the server response.
+     * @var string
+     */
+    protected $responseBody;
+  
+    /**
+     * The HTTP header of the server response.
+     * @var string[]
+     */
+    protected $responseHeaders;
+  
+    /**
+     * The deserialized response object
+     * @var $responseObject;
+     */
+    protected $responseObject;
+ 
+    /**
+     * Constructor
+     * @param string $message         Error message
+     * @param string $code            HTTP status code
+     * @param string $responseHeaders HTTP response header
+     * @param string $responseBody    Deseralized response object
+     */
+    public function __construct($message="", $code=0, $responseHeaders=null, $responseBody=null)
+    {
+        parent::__construct($message, $code);
+        $this->responseHeaders = $responseHeaders;
+        $this->responseBody = $responseBody;
+    }
+  
+    /**
+     * Gets the HTTP response header
+     *
+     * @return string HTTP response header
+     */
+    public function getResponseHeaders()
+    {
+        return $this->responseHeaders;
+    }
+  
+    /**
+     * Gets the HTTP response body
+     *
+     * @return string HTTP response body
+     */
+    public function getResponseBody()
+    {
+        return $this->responseBody;
+    }
+  
+    /**
+     * Sets the deseralized response object (during deserialization)
+     * @param mixed $obj Deserialized response object
+     * @return void
+     */
+    public function setResponseObject($obj)
+    {
+        $this->responseObject = $obj;
+    }
 
+    /**
+     * Gets the deseralized response object (during deserialization)
+     *
+     * @return mixed the deserialized response object
+     */
+    public function getResponseObject()
+    {
+        return $this->responseObject;
+    }
 }
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php b/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php
index cd514956a29..fcea7100ae4 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php
@@ -1,4 +1,15 @@
 <?php
+/**
+ * Configuration
+ * 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 2015 SmartBear Software
  *
@@ -15,52 +26,439 @@
  *  limitations under the License.
  */
 
-namespace SwaggerClient;
-
-class Configuration {
-
-  /**
-   * Associate array to store API key(s)
-   */
-  public static $apiKey = array();
-
-  /**
-   * Associate array to store API prefix (e.g. Bearer)
-   */
-  public static $apiKeyPrefix = array();
-
-  /**
-   * Username for HTTP basic authentication
-   */
-  public static $username = '';
-
-  /**
-   * Password for HTTP basic authentication
-   */
-  public static $password = '';
+/**
+ * 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.
+ */
 
-  /**
-   * The default instance of ApiClient
-   */
-  public static $apiClient;
+namespace Swagger\Client;
 
-  /**
-   * Debug switch (default set to false)
-   */
-  public static $debug = false;
+/**
+ * Configuration Class Doc Comment
+ * 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
+ */
+class Configuration
+{
 
-  /**
-   * Debug file location (log to STDOUT by default)
-   */
-  public static $debug_file = 'php://output';
+    private static $_defaultConfiguration = null;
+  
+    /** 
+     * Associate array to store API key(s)
+     *
+     * @var string[]
+     */
+    protected $apiKeys = array();
+  
+    /**
+     * Associate array to store API prefix (e.g. Bearer)
+     *
+     * @var string[]
+     */
+    protected $apiKeyPrefixes = array();
+  
+    /** 
+     * Username for HTTP basic authentication
+     *
+     * @var string
+     */
+    protected $username = '';
+  
+    /**
+     * Password for HTTP basic authentication
+     *
+     * @var string
+     */
+    protected $password = '';
+  
+    /**
+     * The default instance of ApiClient
+     *
+     * @var \Swagger\Client\ApiClient
+     */
+    protected $defaultHeaders = array();
+  
+    /**
+     * The host
+     *
+     * @var string
+     */
+    protected $host = 'http://petstore.swagger.io/v2';
+  
+    /**
+     * Timeout (second) of the HTTP request, by default set to 0, no timeout
+     *
+     * @var string 
+     */
+    protected $curlTimeout = 0;
+  
+    /**
+     * User agent of the HTTP request, set to "PHP-Swagger" by default
+     *
+     * @var string
+     */
+    protected $userAgent = "PHP-Swagger/1.0.0";
+  
+    /**
+     * Debug switch (default set to false)
+     *
+     * @var bool
+     */
+    protected $debug = false;
+  
+    /**
+     * Debug file location (log to STDOUT by default)
+     *
+     * @var string
+     */
+    protected $debugFile = 'php://output';
 
-  /*
-   *  manually initalize  ApiClient
-   */
-  public static function init() {
-    if (self::$apiClient === null)
-      self::$apiClient = new ApiClient();
-  }
+    /**
+     * Debug file location (log to STDOUT by default)
+     *
+     * @var string
+     */
+    protected $tempFolderPath;
 
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        $this->tempFolderPath = sys_get_temp_dir();
+    }
+  
+    /**
+     * Sets API key
+     *
+     * @param string $apiKeyIdentifier API key identifier (authentication scheme)
+     * @param string $key              API key or token
+     *
+     * @return Configuration
+     */
+    public function setApiKey($apiKeyIdentifier, $key)
+    {
+        $this->apiKeys[$apiKeyIdentifier] = $key;
+        return $this;
+    }
+  
+    /**
+     * Gets API key
+     *
+     * @param string $apiKeyIdentifier API key identifier (authentication scheme)
+     *
+     * @return string API key or token
+     */
+    public function getApiKey($apiKeyIdentifier)
+    {
+        return isset($this->apiKeys[$apiKeyIdentifier]) ? $this->apiKeys[$apiKeyIdentifier] : null;
+    }
+  
+    /**
+     * Sets the prefix for API key (e.g. Bearer)
+     *
+     * @param string $apiKeyIdentifier API key identifier (authentication scheme)
+     * @param string $prefix           API key prefix, e.g. Bearer
+     *
+     * @return Configuration
+     */
+    public function setApiKeyPrefix($apiKeyIdentifier, $prefix)
+    {
+        $this->apiKeyPrefixes[$apiKeyIdentifier] = $prefix;
+        return $this;
+    }
+  
+    /**
+     * Gets API key prefix
+     *
+     * @param string $apiKeyIdentifier API key identifier (authentication scheme)
+     *
+     * @return string
+     */
+    public function getApiKeyPrefix($apiKeyIdentifier)
+    {
+        return isset($this->apiKeyPrefixes[$apiKeyIdentifier]) ? $this->apiKeyPrefixes[$apiKeyIdentifier] : null;
+    }
+  
+    /**
+     * Sets the username for HTTP basic authentication
+     *
+     * @param string $username Username for HTTP basic authentication
+     *
+     * @return Configuration
+     */
+    public function setUsername($username)
+    {
+        $this->username = $username;
+        return $this;
+    }
+  
+    /**
+     * Gets the username for HTTP basic authentication
+     *
+     * @return string Username for HTTP basic authentication
+     */
+    public function getUsername()
+    {
+        return $this->username;
+    }
+  
+    /**
+     * Sets the password for HTTP basic authentication
+     *
+     * @param string $password Password for HTTP basic authentication
+     *
+     * @return Configuration
+     */
+    public function setPassword($password)
+    {
+        $this->password = $password;
+        return $this;
+    }
+  
+    /**
+     * Gets the password for HTTP basic authentication
+     *
+     * @return string Password for HTTP basic authentication
+     */
+    public function getPassword()
+    {
+        return $this->password;
+    }
+  
+    /**
+     * Adds a default header
+     *
+     * @param string $headerName  header name (e.g. Token)
+     * @param string $headerValue header value (e.g. 1z8wp3)
+     *
+     * @return ApiClient
+     */
+    public function addDefaultHeader($headerName, $headerValue)
+    {
+        if (!is_string($headerName)) {
+            throw new \InvalidArgumentException('Header name must be a string.');
+        }
+  
+        $this->defaultHeaders[$headerName] =  $headerValue;
+        return $this;
+    }
+  
+    /**
+     * Gets the default header
+     *
+     * @return array An array of default header(s)
+     */
+    public function getDefaultHeaders()
+    {
+        return $this->defaultHeaders;
+    }
+  
+    /**
+     * Deletes a default header
+     *
+     * @param string $headerName the header to delete
+     *
+     * @return Configuration
+     */
+    public function deleteDefaultHeader($headerName)
+    {
+        unset($this->defaultHeaders[$headerName]);
+    }
+  
+    /**
+     * Sets the host
+     *
+     * @param string $host Host
+     *
+     * @return Configuration
+     */
+    public function setHost($host)
+    {
+        $this->host = $host;
+        return $this;
+    }
+  
+    /**
+     * Gets the host
+     *
+     * @return string Host
+     */
+    public function getHost()
+    {
+        return $this->host;
+    }
+  
+    /**
+     * Sets the user agent of the api client
+     *
+     * @param string $userAgent the user agent of the api client
+     *
+     * @return ApiClient
+     */
+    public function setUserAgent($userAgent)
+    {
+        if (!is_string($userAgent)) {
+            throw new \InvalidArgumentException('User-agent must be a string.');
+        }
+  
+        $this->userAgent = $userAgent;
+        return $this;
+    }
+  
+    /**
+     * Gets the user agent of the api client
+     *
+     * @return string user agent
+     */
+    public function getUserAgent()
+    {
+        return $this->userAgent;
+    }
+  
+    /**
+     * Sets the HTTP timeout value
+     *
+     * @param integer $seconds Number of seconds before timing out [set to 0 for no timeout]
+     *
+     * @return ApiClient
+     */
+    public function setCurlTimeout($seconds)
+    {
+        if (!is_numeric($seconds) || $seconds < 0) {
+            throw new \InvalidArgumentException('Timeout value must be numeric and a non-negative number.');
+        }
+  
+        $this->curlTimeout = $seconds;
+        return $this;
+    }
+  
+    /**
+     * Gets the HTTP timeout value
+     *
+     * @return string HTTP timeout value
+     */
+    public function getCurlTimeout()
+    {
+        return $this->curlTimeout;
+    }
+  
+    /**
+     * Sets debug flag
+     * 
+     * @param bool $debug Debug flag
+     *
+     * @return Configuration
+     */
+    public function setDebug($debug)
+    {
+        $this->debug = $debug;
+        return $this;
+    }
+  
+    /**
+     * Gets the debug flag
+     *
+     * @return bool
+     */
+    public function getDebug()
+    {
+        return $this->debug;
+    }
+  
+    /**
+     * Sets the debug file
+     *
+     * @param string $debugFile Debug file
+     *
+     * @return Configuration
+     */
+    public function setDebugFile($debugFile)
+    {
+        $this->debugFile = $debugFile;
+        return $this;
+    }
+  
+    /**
+     * Gets the debug file
+     *
+     * @return string
+     */
+    public function getDebugFile()
+    {
+        return $this->debugFile;
+    }
+ 
+    /**
+     * Sets the temp folder path
+     *
+     * @param string $tempFolderPath Temp folder path
+     *
+     * @return Configuration
+     */
+    public function setTempFolderPath($tempFolderPath)
+    {
+        $this->tempFolderPath = $tempFolderPath;
+        return $this;
+    }
+ 
+    /**
+     * Gets the temp folder path
+     *
+     * @return string Temp folder path
+     */
+    public function getTempFolderPath()
+    {
+        return $this->tempFolderPath;
+    }
+ 
+    /**
+     * Gets the default configuration instance
+     *
+     * @return Configuration
+     */
+    public static function getDefaultConfiguration()
+    {
+        if (self::$_defaultConfiguration == null) {
+            self::$_defaultConfiguration = new Configuration();
+        }
+  
+        return self::$_defaultConfiguration;
+    }
+  
+    /**
+     * Sets the detault configuration instance
+     *
+     * @param Configuration $config An instance of the Configuration Object
+     *
+     * @return void
+     */
+    public static function setDefaultConfiguration(Configuration $config)
+    {
+        self::$_defaultConfiguration = $config;
+    }
+  
+    /**
+     * Gets the essential information for debugging
+     *
+     * @return string The report for debugging
+     */
+    public static function toDebugReport()
+    {
+        $report  = "PHP SDK (Swagger\Client) Debug Report:\n";
+        $report .= "    OS: ".php_uname()."\n";
+        $report .= "    PHP Version: ".phpversion()."\n";
+        $report .= "    Swagger Spec Version: 1.0.0\n";
+        $report .= "    SDK Package Version: 1.0.0\n";
+        $report .= "    Temp Folder Path: ".self::getDefaultConfiguration()->getTempFolderPath()."\n";
+  
+        return $report;
+    }
+  
 }
-
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php
new file mode 100644
index 00000000000..444c3c1ed7e
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php
@@ -0,0 +1,206 @@
+<?php
+/**
+ * Category
+ *
+ * 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 2015 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;
+/**
+ * Category 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 Category implements ArrayAccess
+{
+    /**
+      * Array of property to type mappings. Used for (de)serialization 
+      * @var string[]
+      */
+    static $swaggerTypes = array(
+        'id' => 'int',
+        'name' => 'string'
+    );
+  
+    /** 
+      * Array of attributes where the key is the local name, and the value is the original name
+      * @var string[] 
+      */
+    static $attributeMap = array(
+        'id' => 'id',
+        'name' => 'name'
+    );
+  
+    /**
+      * Array of attributes to setter functions (for deserialization of responses)
+      * @var string[]
+      */
+    static $setters = array(
+        'id' => 'setId',
+        'name' => 'setName'
+    );
+  
+    /**
+      * Array of attributes to getter functions (for serialization of requests)
+      * @var string[]
+      */
+    static $getters = array(
+        'id' => 'getId',
+        'name' => 'getName'
+    );
+  
+    
+    /**
+      * $id 
+      * @var int
+      */
+    protected $id;
+    
+    /**
+      * $name 
+      * @var string
+      */
+    protected $name;
+    
+
+    /**
+     * Constructor
+     * @param mixed[] $data Associated array of property value initalizing the model
+     */
+    public function __construct(array $data = null)
+    {
+        if ($data != null) {
+            $this->id = $data["id"];
+            $this->name = $data["name"];
+        }
+    }
+    
+    /**
+     * 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 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;
+    }
+    
+    /**
+     * 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(get_object_vars($this), JSON_PRETTY_PRINT);
+        } else {
+            return json_encode(get_object_vars($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
new file mode 100644
index 00000000000..b803bd7325e
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php
@@ -0,0 +1,337 @@
+<?php
+/**
+ * Order
+ *
+ * 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 2015 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;
+/**
+ * Order 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 Order implements ArrayAccess
+{
+    /**
+      * Array of property to type mappings. Used for (de)serialization 
+      * @var string[]
+      */
+    static $swaggerTypes = array(
+        'id' => 'int',
+        'pet_id' => 'int',
+        'quantity' => 'int',
+        'ship_date' => '\DateTime',
+        'status' => 'string',
+        'complete' => 'bool'
+    );
+  
+    /** 
+      * Array of attributes where the key is the local name, and the value is the original name
+      * @var string[] 
+      */
+    static $attributeMap = array(
+        'id' => 'id',
+        'pet_id' => 'petId',
+        'quantity' => 'quantity',
+        'ship_date' => 'shipDate',
+        'status' => 'status',
+        'complete' => 'complete'
+    );
+  
+    /**
+      * Array of attributes to setter functions (for deserialization of responses)
+      * @var string[]
+      */
+    static $setters = array(
+        'id' => 'setId',
+        'pet_id' => 'setPetId',
+        'quantity' => 'setQuantity',
+        'ship_date' => 'setShipDate',
+        'status' => 'setStatus',
+        'complete' => 'setComplete'
+    );
+  
+    /**
+      * Array of attributes to getter functions (for serialization of requests)
+      * @var string[]
+      */
+    static $getters = array(
+        'id' => 'getId',
+        'pet_id' => 'getPetId',
+        'quantity' => 'getQuantity',
+        'ship_date' => 'getShipDate',
+        'status' => 'getStatus',
+        'complete' => 'getComplete'
+    );
+  
+    
+    /**
+      * $id 
+      * @var int
+      */
+    protected $id;
+    
+    /**
+      * $pet_id 
+      * @var int
+      */
+    protected $pet_id;
+    
+    /**
+      * $quantity 
+      * @var int
+      */
+    protected $quantity;
+    
+    /**
+      * $ship_date 
+      * @var \DateTime
+      */
+    protected $ship_date;
+    
+    /**
+      * $status Order Status
+      * @var string
+      */
+    protected $status;
+    
+    /**
+      * $complete 
+      * @var bool
+      */
+    protected $complete;
+    
+
+    /**
+     * Constructor
+     * @param mixed[] $data Associated array of property value initalizing the model
+     */
+    public function __construct(array $data = null)
+    {
+        if ($data != null) {
+            $this->id = $data["id"];
+            $this->pet_id = $data["pet_id"];
+            $this->quantity = $data["quantity"];
+            $this->ship_date = $data["ship_date"];
+            $this->status = $data["status"];
+            $this->complete = $data["complete"];
+        }
+    }
+    
+    /**
+     * 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 pet_id
+     * @return int
+     */
+    public function getPetId()
+    {
+        return $this->pet_id;
+    }
+  
+    /**
+     * Sets pet_id
+     * @param int $pet_id 
+     * @return $this
+     */
+    public function setPetId($pet_id)
+    {
+        
+        $this->pet_id = $pet_id;
+        return $this;
+    }
+    
+    /**
+     * Gets quantity
+     * @return int
+     */
+    public function getQuantity()
+    {
+        return $this->quantity;
+    }
+  
+    /**
+     * Sets quantity
+     * @param int $quantity 
+     * @return $this
+     */
+    public function setQuantity($quantity)
+    {
+        
+        $this->quantity = $quantity;
+        return $this;
+    }
+    
+    /**
+     * Gets ship_date
+     * @return \DateTime
+     */
+    public function getShipDate()
+    {
+        return $this->ship_date;
+    }
+  
+    /**
+     * Sets ship_date
+     * @param \DateTime $ship_date 
+     * @return $this
+     */
+    public function setShipDate($ship_date)
+    {
+        
+        $this->ship_date = $ship_date;
+        return $this;
+    }
+    
+    /**
+     * Gets status
+     * @return string
+     */
+    public function getStatus()
+    {
+        return $this->status;
+    }
+  
+    /**
+     * Sets status
+     * @param string $status Order Status
+     * @return $this
+     */
+    public function setStatus($status)
+    {
+        $allowed_values = array("placed", "approved", "delivered");
+        if (!in_array($status, $allowed_values)) {
+            throw new \InvalidArgumentException("Invalid value for 'status', must be one of 'placed', 'approved', 'delivered'");
+        }
+        $this->status = $status;
+        return $this;
+    }
+    
+    /**
+     * Gets complete
+     * @return bool
+     */
+    public function getComplete()
+    {
+        return $this->complete;
+    }
+  
+    /**
+     * Sets complete
+     * @param bool $complete 
+     * @return $this
+     */
+    public function setComplete($complete)
+    {
+        
+        $this->complete = $complete;
+        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(get_object_vars($this), JSON_PRETTY_PRINT);
+        } else {
+            return json_encode(get_object_vars($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
new file mode 100644
index 00000000000..6871ea9d9be
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php
@@ -0,0 +1,337 @@
+<?php
+/**
+ * Pet
+ *
+ * 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 2015 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;
+/**
+ * Pet 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 Pet implements ArrayAccess
+{
+    /**
+      * Array of property to type mappings. Used for (de)serialization 
+      * @var string[]
+      */
+    static $swaggerTypes = array(
+        'id' => 'int',
+        'category' => '\Swagger\Client\Model\Category',
+        'name' => 'string',
+        'photo_urls' => 'string[]',
+        'tags' => '\Swagger\Client\Model\Tag[]',
+        'status' => 'string'
+    );
+  
+    /** 
+      * Array of attributes where the key is the local name, and the value is the original name
+      * @var string[] 
+      */
+    static $attributeMap = array(
+        'id' => 'id',
+        'category' => 'category',
+        'name' => 'name',
+        'photo_urls' => 'photoUrls',
+        'tags' => 'tags',
+        'status' => 'status'
+    );
+  
+    /**
+      * Array of attributes to setter functions (for deserialization of responses)
+      * @var string[]
+      */
+    static $setters = array(
+        'id' => 'setId',
+        'category' => 'setCategory',
+        'name' => 'setName',
+        'photo_urls' => 'setPhotoUrls',
+        'tags' => 'setTags',
+        'status' => 'setStatus'
+    );
+  
+    /**
+      * Array of attributes to getter functions (for serialization of requests)
+      * @var string[]
+      */
+    static $getters = array(
+        'id' => 'getId',
+        'category' => 'getCategory',
+        'name' => 'getName',
+        'photo_urls' => 'getPhotoUrls',
+        'tags' => 'getTags',
+        'status' => 'getStatus'
+    );
+  
+    
+    /**
+      * $id 
+      * @var int
+      */
+    protected $id;
+    
+    /**
+      * $category 
+      * @var \Swagger\Client\Model\Category
+      */
+    protected $category;
+    
+    /**
+      * $name 
+      * @var string
+      */
+    protected $name;
+    
+    /**
+      * $photo_urls 
+      * @var string[]
+      */
+    protected $photo_urls;
+    
+    /**
+      * $tags 
+      * @var \Swagger\Client\Model\Tag[]
+      */
+    protected $tags;
+    
+    /**
+      * $status pet status in the store
+      * @var string
+      */
+    protected $status;
+    
+
+    /**
+     * Constructor
+     * @param mixed[] $data Associated array of property value initalizing the model
+     */
+    public function __construct(array $data = null)
+    {
+        if ($data != null) {
+            $this->id = $data["id"];
+            $this->category = $data["category"];
+            $this->name = $data["name"];
+            $this->photo_urls = $data["photo_urls"];
+            $this->tags = $data["tags"];
+            $this->status = $data["status"];
+        }
+    }
+    
+    /**
+     * 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 \Swagger\Client\Model\Category
+     */
+    public function getCategory()
+    {
+        return $this->category;
+    }
+  
+    /**
+     * Sets category
+     * @param \Swagger\Client\Model\Category $category 
+     * @return $this
+     */
+    public function setCategory($category)
+    {
+        
+        $this->category = $category;
+        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;
+    }
+    
+    /**
+     * 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 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;
+    }
+    
+    /**
+     * 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(get_object_vars($this), JSON_PRETTY_PRINT);
+        } else {
+            return json_encode(get_object_vars($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
new file mode 100644
index 00000000000..bcecb32fa7e
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Tag.php
@@ -0,0 +1,206 @@
+<?php
+/**
+ * Tag
+ *
+ * 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 2015 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;
+/**
+ * Tag 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 Tag implements ArrayAccess
+{
+    /**
+      * Array of property to type mappings. Used for (de)serialization 
+      * @var string[]
+      */
+    static $swaggerTypes = array(
+        'id' => 'int',
+        'name' => 'string'
+    );
+  
+    /** 
+      * Array of attributes where the key is the local name, and the value is the original name
+      * @var string[] 
+      */
+    static $attributeMap = array(
+        'id' => 'id',
+        'name' => 'name'
+    );
+  
+    /**
+      * Array of attributes to setter functions (for deserialization of responses)
+      * @var string[]
+      */
+    static $setters = array(
+        'id' => 'setId',
+        'name' => 'setName'
+    );
+  
+    /**
+      * Array of attributes to getter functions (for serialization of requests)
+      * @var string[]
+      */
+    static $getters = array(
+        'id' => 'getId',
+        'name' => 'getName'
+    );
+  
+    
+    /**
+      * $id 
+      * @var int
+      */
+    protected $id;
+    
+    /**
+      * $name 
+      * @var string
+      */
+    protected $name;
+    
+
+    /**
+     * Constructor
+     * @param mixed[] $data Associated array of property value initalizing the model
+     */
+    public function __construct(array $data = null)
+    {
+        if ($data != null) {
+            $this->id = $data["id"];
+            $this->name = $data["name"];
+        }
+    }
+    
+    /**
+     * 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 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;
+    }
+    
+    /**
+     * 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(get_object_vars($this), JSON_PRETTY_PRINT);
+        } else {
+            return json_encode(get_object_vars($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
new file mode 100644
index 00000000000..1650635d8ce
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/User.php
@@ -0,0 +1,398 @@
+<?php
+/**
+ * User
+ *
+ * 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 2015 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;
+/**
+ * User 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 User implements ArrayAccess
+{
+    /**
+      * Array of property to type mappings. Used for (de)serialization 
+      * @var string[]
+      */
+    static $swaggerTypes = array(
+        'id' => 'int',
+        'username' => 'string',
+        'first_name' => 'string',
+        'last_name' => 'string',
+        'email' => 'string',
+        'password' => 'string',
+        'phone' => 'string',
+        'user_status' => 'int'
+    );
+  
+    /** 
+      * Array of attributes where the key is the local name, and the value is the original name
+      * @var string[] 
+      */
+    static $attributeMap = array(
+        'id' => 'id',
+        'username' => 'username',
+        'first_name' => 'firstName',
+        'last_name' => 'lastName',
+        'email' => 'email',
+        'password' => 'password',
+        'phone' => 'phone',
+        'user_status' => 'userStatus'
+    );
+  
+    /**
+      * Array of attributes to setter functions (for deserialization of responses)
+      * @var string[]
+      */
+    static $setters = array(
+        'id' => 'setId',
+        'username' => 'setUsername',
+        'first_name' => 'setFirstName',
+        'last_name' => 'setLastName',
+        'email' => 'setEmail',
+        'password' => 'setPassword',
+        'phone' => 'setPhone',
+        'user_status' => 'setUserStatus'
+    );
+  
+    /**
+      * Array of attributes to getter functions (for serialization of requests)
+      * @var string[]
+      */
+    static $getters = array(
+        'id' => 'getId',
+        'username' => 'getUsername',
+        'first_name' => 'getFirstName',
+        'last_name' => 'getLastName',
+        'email' => 'getEmail',
+        'password' => 'getPassword',
+        'phone' => 'getPhone',
+        'user_status' => 'getUserStatus'
+    );
+  
+    
+    /**
+      * $id 
+      * @var int
+      */
+    protected $id;
+    
+    /**
+      * $username 
+      * @var string
+      */
+    protected $username;
+    
+    /**
+      * $first_name 
+      * @var string
+      */
+    protected $first_name;
+    
+    /**
+      * $last_name 
+      * @var string
+      */
+    protected $last_name;
+    
+    /**
+      * $email 
+      * @var string
+      */
+    protected $email;
+    
+    /**
+      * $password 
+      * @var string
+      */
+    protected $password;
+    
+    /**
+      * $phone 
+      * @var string
+      */
+    protected $phone;
+    
+    /**
+      * $user_status User Status
+      * @var int
+      */
+    protected $user_status;
+    
+
+    /**
+     * Constructor
+     * @param mixed[] $data Associated array of property value initalizing the model
+     */
+    public function __construct(array $data = null)
+    {
+        if ($data != null) {
+            $this->id = $data["id"];
+            $this->username = $data["username"];
+            $this->first_name = $data["first_name"];
+            $this->last_name = $data["last_name"];
+            $this->email = $data["email"];
+            $this->password = $data["password"];
+            $this->phone = $data["phone"];
+            $this->user_status = $data["user_status"];
+        }
+    }
+    
+    /**
+     * 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 username
+     * @return string
+     */
+    public function getUsername()
+    {
+        return $this->username;
+    }
+  
+    /**
+     * Sets username
+     * @param string $username 
+     * @return $this
+     */
+    public function setUsername($username)
+    {
+        
+        $this->username = $username;
+        return $this;
+    }
+    
+    /**
+     * Gets first_name
+     * @return string
+     */
+    public function getFirstName()
+    {
+        return $this->first_name;
+    }
+  
+    /**
+     * Sets first_name
+     * @param string $first_name 
+     * @return $this
+     */
+    public function setFirstName($first_name)
+    {
+        
+        $this->first_name = $first_name;
+        return $this;
+    }
+    
+    /**
+     * Gets last_name
+     * @return string
+     */
+    public function getLastName()
+    {
+        return $this->last_name;
+    }
+  
+    /**
+     * Sets last_name
+     * @param string $last_name 
+     * @return $this
+     */
+    public function setLastName($last_name)
+    {
+        
+        $this->last_name = $last_name;
+        return $this;
+    }
+    
+    /**
+     * Gets email
+     * @return string
+     */
+    public function getEmail()
+    {
+        return $this->email;
+    }
+  
+    /**
+     * Sets email
+     * @param string $email 
+     * @return $this
+     */
+    public function setEmail($email)
+    {
+        
+        $this->email = $email;
+        return $this;
+    }
+    
+    /**
+     * Gets password
+     * @return string
+     */
+    public function getPassword()
+    {
+        return $this->password;
+    }
+  
+    /**
+     * Sets password
+     * @param string $password 
+     * @return $this
+     */
+    public function setPassword($password)
+    {
+        
+        $this->password = $password;
+        return $this;
+    }
+    
+    /**
+     * Gets phone
+     * @return string
+     */
+    public function getPhone()
+    {
+        return $this->phone;
+    }
+  
+    /**
+     * Sets phone
+     * @param string $phone 
+     * @return $this
+     */
+    public function setPhone($phone)
+    {
+        
+        $this->phone = $phone;
+        return $this;
+    }
+    
+    /**
+     * Gets user_status
+     * @return int
+     */
+    public function getUserStatus()
+    {
+        return $this->user_status;
+    }
+  
+    /**
+     * Sets user_status
+     * @param int $user_status User Status
+     * @return $this
+     */
+    public function setUserStatus($user_status)
+    {
+        
+        $this->user_status = $user_status;
+        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(get_object_vars($this), JSON_PRETTY_PRINT);
+        } else {
+            return json_encode(get_object_vars($this));
+        }
+    }
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php b/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php
new file mode 100644
index 00000000000..0d281b9d1fa
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php
@@ -0,0 +1,229 @@
+<?php
+/**
+ * ObjectSerializer 
+ *
+ * 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 2015 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;
+
+/**
+ * ObjectSerializer 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 ObjectSerializer
+{
+
+    /**
+     * Build a JSON POST object
+     *
+     * @param mixed $data the data to serialize
+     *
+     * @return string serialized form of $data
+     */
+    public function sanitizeForSerialization($data)
+    {
+        if (is_scalar($data) || null === $data) {
+            $sanitized = $data;
+        } else if ($data instanceof \DateTime) {
+            $sanitized = $data->format(\DateTime::ISO8601);
+        } else if (is_array($data)) {
+            foreach ($data as $property => $value) {
+                $data[$property] = $this->sanitizeForSerialization($value);
+            }
+            $sanitized = $data;
+        } else if (is_object($data)) {
+            $values = array();
+            foreach (array_keys($data::$swaggerTypes) as $property) {
+                $getter = $data::$getters[$property];
+                if ($data->$getter() !== null) {
+                    $values[$data::$attributeMap[$property]] = $this->sanitizeForSerialization($data->$getter());
+                }
+            }
+            $sanitized = $values;
+        } else {
+            $sanitized = (string)$data;
+        }
+
+        return $sanitized;
+    }
+
+    /**
+     * Take value and turn it into a string suitable for inclusion in
+     * the path, by url-encoding.
+     *
+     * @param string $value a string which will be part of the path
+     *
+     * @return string the serialized object
+     */
+    public function toPathValue($value)
+    {
+        return rawurlencode($this->toString($value));
+    }
+
+    /**
+     * Take value and turn it into a string suitable for inclusion in
+     * the query, by imploding comma-separated if it's an object.
+     * If it's a string, pass through unchanged. It will be url-encoded
+     * later.
+     *
+     * @param object $object an object to be serialized to a string
+     *
+     * @return string the serialized object
+     */
+    public function toQueryValue($object)
+    {
+        if (is_array($object)) {
+            return implode(',', $object);
+        } else {
+            return $this->toString($object);
+        }
+    }
+
+    /**
+     * Take value and turn it into a string suitable for inclusion in
+     * the header. If it's a string, pass through unchanged
+     * If it's a datetime object, format it in ISO8601
+     *
+     * @param string $value a string which will be part of the header
+     *
+     * @return string the header string
+     */
+    public function toHeaderValue($value)
+    {
+        return $this->toString($value);
+    }
+
+    /**
+     * Take value and turn it into a string suitable for inclusion in
+     * the http body (form parameter). If it's a string, pass through unchanged
+     * If it's a datetime object, format it in ISO8601
+     *
+     * @param string $value the value of the form parameter
+     *
+     * @return string the form string
+     */
+    public function toFormValue($value)
+    {
+        if ($value instanceof SplFileObject) {
+            return $value->getRealPath();
+        } else {
+            return $this->toString($value);
+        }
+    }
+
+    /**
+     * Take value and turn it into a string suitable for inclusion in
+     * the parameter. If it's a string, pass through unchanged
+     * If it's a datetime object, format it in ISO8601
+     *
+     * @param string $value the value of the parameter
+     *
+     * @return string the header string
+     */
+    public function toString($value)
+    {
+        if ($value instanceof \DateTime) { // datetime in ISO8601 format
+            return $value->format(\DateTime::ISO8601);
+        } else {
+            return $value;
+        }
+    }
+
+    /**
+     * 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
+     *
+     * @return object an instance of $class
+     */
+    public function deserialize($data, $class, $httpHeader=null)
+    {
+        if (null === $data) {
+            $deserialized = null;
+        } elseif (substr($class, 0, 4) === 'map[') { // for associative array e.g. map[string,int]
+            $inner = substr($class, 4, -1);
+            $deserialized = array();
+            if (strrpos($inner, ",") !== false) {
+                $subClass_array = explode(',', $inner, 2);
+                $subClass = $subClass_array[1];
+                foreach ($data as $key => $value) {
+                    $deserialized[$key] = $this->deserialize($value, $subClass);
+                }
+            }
+        } elseif (strcasecmp(substr($class, -2), '[]') == 0) {
+            $subClass = substr($class, 0, -2);
+            $values = array();
+            foreach ($data as $key => $value) {
+                $values[] = $this->deserialize($value, $subClass);
+            }
+            $deserialized = $values;
+        } elseif ($class === '\DateTime') {
+            $deserialized = new \DateTime($data);
+        } 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 (preg_match('/Content-Disposition: inline; filename=[\'"]?([^\'"\s]+)[\'"]?$/i', $httpHeader, $match)) {
+                $filename = Configuration::getDefaultConfiguration()->getTempFolderPath().$match[1];
+            } else {
+                $filename = tempnam(Configuration::getDefaultConfiguration()->getTempFolderPath(), '');
+            }
+            $deserialized = new \SplFileObject($filename, "w");
+            $byte_written = $deserialized->fwrite($data);
+            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 {
+            $instance = new $class();
+            foreach ($instance::$swaggerTypes as $property => $type) {
+                $propertySetter = $instance::$setters[$property];
+     
+                if (!isset($propertySetter) || !isset($data->{$instance::$attributeMap[$property]})) {
+                    continue;
+                }
+     
+                $propertyValue = $data->{$instance::$attributeMap[$property]};
+                if (isset($propertyValue)) {
+                    $instance->$propertySetter($this->deserialize($propertyValue, $type));
+                }
+            }
+            $deserialized = $instance;
+        }
+     
+        return $deserialized;
+    }
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/PetApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/PetApi.php
deleted file mode 100644
index 2e1b2aa262e..00000000000
--- a/samples/client/petstore/php/SwaggerClient-php/lib/PetApi.php
+++ /dev/null
@@ -1,543 +0,0 @@
-<?php
-/**
- *  Copyright 2015 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.
- */
-
-namespace SwaggerClient;
-
-class PetApi {
-
-  function __construct($apiClient = null) {
-    if (null === $apiClient) {
-      if (Configuration::$apiClient === null) {
-        Configuration::$apiClient = new ApiClient(); // create a new API client if not present
-        $this->apiClient = Configuration::$apiClient;
-      }
-      else
-        $this->apiClient = Configuration::$apiClient; // use the default one
-    } else {
-      $this->apiClient = $apiClient; // use the one provided by the user
-    }
-  }
-
-  private $apiClient; // instance of the ApiClient
-
-  /**
-   * get the API client
-   */
-  public function getApiClient() {
-    return $this->apiClient;
-  }
-
-  /**
-   * set the API client
-   */
-  public function setApiClient($apiClient) {
-    $this->apiClient = $apiClient;
-  }
-
-  
-  /**
-   * updatePet
-   *
-   * Update an existing pet
-   *
-   * @param Pet $body Pet object that needs to be added to the store (required)
-   * @return void
-   */
-   public function updatePet($body) {
-      
-
-      // parse inputs
-      $resourcePath = "/pet";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "PUT";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->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
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array('petstore_auth');
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      
-  }
-  
-  /**
-   * addPet
-   *
-   * Add a new pet to the store
-   *
-   * @param Pet $body Pet object that needs to be added to the store (required)
-   * @return void
-   */
-   public function addPet($body) {
-      
-
-      // parse inputs
-      $resourcePath = "/pet";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "POST";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->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
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array('petstore_auth');
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      
-  }
-  
-  /**
-   * findPetsByStatus
-   *
-   * Finds Pets by status
-   *
-   * @param array[string] $status Status values that need to be considered for filter (required)
-   * @return array[Pet]
-   */
-   public function findPetsByStatus($status) {
-      
-
-      // parse inputs
-      $resourcePath = "/pet/findByStatus";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "GET";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      // query params
-      if($status !== null) {
-        $queryParams['status'] = $this->apiClient->toQueryValue($status);
-      }
-      
-      
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array('petstore_auth');
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      if(! $response) {
-        return null;
-      }
-
-      $responseObject = $this->apiClient->deserialize($response,'array[Pet]');
-      return $responseObject;
-  }
-  
-  /**
-   * findPetsByTags
-   *
-   * Finds Pets by tags
-   *
-   * @param array[string] $tags Tags to filter by (required)
-   * @return array[Pet]
-   */
-   public function findPetsByTags($tags) {
-      
-
-      // parse inputs
-      $resourcePath = "/pet/findByTags";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "GET";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      // query params
-      if($tags !== null) {
-        $queryParams['tags'] = $this->apiClient->toQueryValue($tags);
-      }
-      
-      
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array('petstore_auth');
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      if(! $response) {
-        return null;
-      }
-
-      $responseObject = $this->apiClient->deserialize($response,'array[Pet]');
-      return $responseObject;
-  }
-  
-  /**
-   * getPetById
-   *
-   * Find pet by ID
-   *
-   * @param int $pet_id ID of pet that needs to be fetched (required)
-   * @return Pet
-   */
-   public function getPetById($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 = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      
-      
-      // path params
-      if($pet_id !== null) {
-        $resourcePath = str_replace("{" . "petId" . "}",
-                                    $this->apiClient->toPathValue($pet_id), $resourcePath);
-      }
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array('petstore_auth', 'api_key');
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      if(! $response) {
-        return null;
-      }
-
-      $responseObject = $this->apiClient->deserialize($response,'Pet');
-      return $responseObject;
-  }
-  
-  /**
-   * 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 (required)
-   * @param string $status Updated status of the pet (required)
-   * @return void
-   */
-   public function updatePetWithForm($pet_id, $name, $status) {
-      
-      // 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";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array('application/x-www-form-urlencoded'));
-
-      
-      
-      // path params
-      if($pet_id !== null) {
-        $resourcePath = str_replace("{" . "petId" . "}",
-                                    $this->apiClient->toPathValue($pet_id), $resourcePath);
-      }
-      // form params
-      if ($name !== null) {
-        $formParams['name'] = $this->apiClient->toFormValue($name);
-      }// form params
-      if ($status !== null) {
-        $formParams['status'] = $this->apiClient->toFormValue($status);
-      }
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array('petstore_auth');
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      
-  }
-  
-  /**
-   * deletePet
-   *
-   * Deletes a pet
-   *
-   * @param string $api_key  (required)
-   * @param int $pet_id Pet id to delete (required)
-   * @return void
-   */
-   public function deletePet($api_key, $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 deletePet');
-      }
-      
-
-      // parse inputs
-      $resourcePath = "/pet/{petId}";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "DELETE";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      
-      // header params
-      if($api_key !== null) {
-        $headerParams['api_key'] = $this->apiClient->toHeaderValue($api_key);
-      }
-      // path params
-      if($pet_id !== null) {
-        $resourcePath = str_replace("{" . "petId" . "}",
-                                    $this->apiClient->toPathValue($pet_id), $resourcePath);
-      }
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array('petstore_auth');
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      
-  }
-  
-  /**
-   * uploadFile
-   *
-   * uploads an image
-   *
-   * @param int $pet_id ID of pet to update (required)
-   * @param string $additional_metadata Additional data to pass to server (required)
-   * @param string $file file to upload (required)
-   * @return void
-   */
-   public function uploadFile($pet_id, $additional_metadata, $file) {
-      
-      // verify the required parameter 'pet_id' is set
-      if ($pet_id === null) {
-        throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling uploadFile');
-      }
-      
-
-      // parse inputs
-      $resourcePath = "/pet/{petId}/uploadImage";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "POST";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array('multipart/form-data'));
-
-      
-      
-      // path params
-      if($pet_id !== null) {
-        $resourcePath = str_replace("{" . "petId" . "}",
-                                    $this->apiClient->toPathValue($pet_id), $resourcePath);
-      }
-      // form params
-      if ($additional_metadata !== null) {
-        $formParams['additionalMetadata'] = $this->apiClient->toFormValue($additional_metadata);
-      }// form params
-      if ($file !== null) {
-        $formParams['file'] = '@' . $this->apiClient->toFormValue($file);
-      }
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array('petstore_auth');
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      
-  }
-  
-
-}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/StoreApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/StoreApi.php
deleted file mode 100644
index 87937a60283..00000000000
--- a/samples/client/petstore/php/SwaggerClient-php/lib/StoreApi.php
+++ /dev/null
@@ -1,294 +0,0 @@
-<?php
-/**
- *  Copyright 2015 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.
- */
-
-namespace SwaggerClient;
-
-class StoreApi {
-
-  function __construct($apiClient = null) {
-    if (null === $apiClient) {
-      if (Configuration::$apiClient === null) {
-        Configuration::$apiClient = new ApiClient(); // create a new API client if not present
-        $this->apiClient = Configuration::$apiClient;
-      }
-      else
-        $this->apiClient = Configuration::$apiClient; // use the default one
-    } else {
-      $this->apiClient = $apiClient; // use the one provided by the user
-    }
-  }
-
-  private $apiClient; // instance of the ApiClient
-
-  /**
-   * get the API client
-   */
-  public function getApiClient() {
-    return $this->apiClient;
-  }
-
-  /**
-   * set the API client
-   */
-  public function setApiClient($apiClient) {
-    $this->apiClient = $apiClient;
-  }
-
-  
-  /**
-   * getInventory
-   *
-   * Returns pet inventories by status
-   *
-   * @return map[string,int]
-   */
-   public function getInventory() {
-      
-
-      // parse inputs
-      $resourcePath = "/store/inventory";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "GET";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      
-      
-      
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array('api_key');
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      if(! $response) {
-        return null;
-      }
-
-      $responseObject = $this->apiClient->deserialize($response,'map[string,int]');
-      return $responseObject;
-  }
-  
-  /**
-   * placeOrder
-   *
-   * Place an order for a pet
-   *
-   * @param Order $body order placed for purchasing the pet (required)
-   * @return Order
-   */
-   public function placeOrder($body) {
-      
-
-      // parse inputs
-      $resourcePath = "/store/order";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "POST";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      
-      
-      
-      
-      // 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
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array();
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      if(! $response) {
-        return null;
-      }
-
-      $responseObject = $this->apiClient->deserialize($response,'Order');
-      return $responseObject;
-  }
-  
-  /**
-   * getOrderById
-   *
-   * Find purchase order by ID
-   *
-   * @param string $order_id ID of pet that needs to be fetched (required)
-   * @return Order
-   */
-   public function getOrderById($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 getOrderById');
-      }
-      
-
-      // parse inputs
-      $resourcePath = "/store/order/{orderId}";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "GET";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      
-      
-      // path params
-      if($order_id !== null) {
-        $resourcePath = str_replace("{" . "orderId" . "}",
-                                    $this->apiClient->toPathValue($order_id), $resourcePath);
-      }
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array();
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      if(! $response) {
-        return null;
-      }
-
-      $responseObject = $this->apiClient->deserialize($response,'Order');
-      return $responseObject;
-  }
-  
-  /**
-   * deleteOrder
-   *
-   * Delete purchase order by ID
-   *
-   * @param string $order_id ID of the order that needs to be deleted (required)
-   * @return void
-   */
-   public function deleteOrder($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}";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "DELETE";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      
-      
-      // path params
-      if($order_id !== null) {
-        $resourcePath = str_replace("{" . "orderId" . "}",
-                                    $this->apiClient->toPathValue($order_id), $resourcePath);
-      }
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array();
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      
-  }
-  
-
-}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/UserApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/UserApi.php
deleted file mode 100644
index 2e16022f25a..00000000000
--- a/samples/client/petstore/php/SwaggerClient-php/lib/UserApi.php
+++ /dev/null
@@ -1,518 +0,0 @@
-<?php
-/**
- *  Copyright 2015 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.
- */
-
-namespace SwaggerClient;
-
-class UserApi {
-
-  function __construct($apiClient = null) {
-    if (null === $apiClient) {
-      if (Configuration::$apiClient === null) {
-        Configuration::$apiClient = new ApiClient(); // create a new API client if not present
-        $this->apiClient = Configuration::$apiClient;
-      }
-      else
-        $this->apiClient = Configuration::$apiClient; // use the default one
-    } else {
-      $this->apiClient = $apiClient; // use the one provided by the user
-    }
-  }
-
-  private $apiClient; // instance of the ApiClient
-
-  /**
-   * get the API client
-   */
-  public function getApiClient() {
-    return $this->apiClient;
-  }
-
-  /**
-   * set the API client
-   */
-  public function setApiClient($apiClient) {
-    $this->apiClient = $apiClient;
-  }
-
-  
-  /**
-   * createUser
-   *
-   * Create user
-   *
-   * @param User $body Created user object (required)
-   * @return void
-   */
-   public function createUser($body) {
-      
-
-      // parse inputs
-      $resourcePath = "/user";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "POST";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      
-      
-      
-      
-      // 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
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array();
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      
-  }
-  
-  /**
-   * createUsersWithArrayInput
-   *
-   * Creates list of users with given input array
-   *
-   * @param array[User] $body List of user object (required)
-   * @return void
-   */
-   public function createUsersWithArrayInput($body) {
-      
-
-      // parse inputs
-      $resourcePath = "/user/createWithArray";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "POST";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      
-      
-      
-      
-      // 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
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array();
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      
-  }
-  
-  /**
-   * createUsersWithListInput
-   *
-   * Creates list of users with given input array
-   *
-   * @param array[User] $body List of user object (required)
-   * @return void
-   */
-   public function createUsersWithListInput($body) {
-      
-
-      // parse inputs
-      $resourcePath = "/user/createWithList";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "POST";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      
-      
-      
-      
-      // 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
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array();
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      
-  }
-  
-  /**
-   * loginUser
-   *
-   * Logs user into the system
-   *
-   * @param string $username The user name for login (required)
-   * @param string $password The password for login in clear text (required)
-   * @return string
-   */
-   public function loginUser($username, $password) {
-      
-
-      // parse inputs
-      $resourcePath = "/user/login";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "GET";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      // query params
-      if($username !== null) {
-        $queryParams['username'] = $this->apiClient->toQueryValue($username);
-      }// query params
-      if($password !== null) {
-        $queryParams['password'] = $this->apiClient->toQueryValue($password);
-      }
-      
-      
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array();
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      if(! $response) {
-        return null;
-      }
-
-      $responseObject = $this->apiClient->deserialize($response,'string');
-      return $responseObject;
-  }
-  
-  /**
-   * logoutUser
-   *
-   * Logs out current logged in user session
-   *
-   * @return void
-   */
-   public function logoutUser() {
-      
-
-      // parse inputs
-      $resourcePath = "/user/logout";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "GET";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      
-      
-      
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array();
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      
-  }
-  
-  /**
-   * getUserByName
-   *
-   * Get user by user name
-   *
-   * @param string $username The name that needs to be fetched. Use user1 for testing.  (required)
-   * @return User
-   */
-   public function getUserByName($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 = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      
-      
-      // path params
-      if($username !== null) {
-        $resourcePath = str_replace("{" . "username" . "}",
-                                    $this->apiClient->toPathValue($username), $resourcePath);
-      }
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array();
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      if(! $response) {
-        return null;
-      }
-
-      $responseObject = $this->apiClient->deserialize($response,'User');
-      return $responseObject;
-  }
-  
-  /**
-   * updateUser
-   *
-   * Updated user
-   *
-   * @param string $username name that need to be deleted (required)
-   * @param User $body Updated user object (required)
-   * @return void
-   */
-   public function updateUser($username, $body) {
-      
-      // 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 = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      
-      
-      // path params
-      if($username !== null) {
-        $resourcePath = str_replace("{" . "username" . "}",
-                                    $this->apiClient->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
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array();
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      
-  }
-  
-  /**
-   * deleteUser
-   *
-   * Delete user
-   *
-   * @param string $username The name that needs to be deleted (required)
-   * @return void
-   */
-   public function deleteUser($username) {
-      
-      // verify the required parameter 'username' is set
-      if ($username === null) {
-        throw new \InvalidArgumentException('Missing the required parameter $username when calling deleteUser');
-      }
-      
-
-      // parse inputs
-      $resourcePath = "/user/{username}";
-      $resourcePath = str_replace("{format}", "json", $resourcePath);
-      $method = "DELETE";
-      $httpBody = '';
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
-      if (!is_null($_header_accept)) {
-        $headerParams['Accept'] = $_header_accept;
-      }
-      $headerParams['Content-Type'] = $this->apiClient->selectHeaderContentType(array());
-
-      
-      
-      // path params
-      if($username !== null) {
-        $resourcePath = str_replace("{" . "username" . "}",
-                                    $this->apiClient->toPathValue($username), $resourcePath);
-      }
-      
-      
-
-      // for model (json/xml)
-      if (isset($_tempBody)) {
-        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-      } else if (count($formParams) > 0) {
-        // for HTTP post (form)
-        $httpBody = $formParams;
-      }
-
-      // authentication setting, if any
-      $authSettings = array();
-
-      // make the API Call
-      $response = $this->apiClient->callAPI($resourcePath, $method,
-                                            $queryParams, $httpBody,
-                                            $headerParams, $authSettings);
-
-      
-  }
-  
-
-}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/models/Category.php b/samples/client/petstore/php/SwaggerClient-php/lib/models/Category.php
deleted file mode 100644
index 7512921b898..00000000000
--- a/samples/client/petstore/php/SwaggerClient-php/lib/models/Category.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- *  Copyright 2015 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.
- *
- */
-
-namespace SwaggerClient\models;
-
-use \ArrayAccess;
-
-class Category implements ArrayAccess {
-  static $swaggerTypes = array(
-      'id' => 'int',
-      'name' => 'string'
-  );
-
-  static $attributeMap = array(
-      'id' => 'id',
-      'name' => 'name'
-  );
-
-  
-  public $id; /* int */
-  public $name; /* string */
-
-  public function __construct(array $data = null) {
-    $this->id = $data["id"];
-    $this->name = $data["name"];
-  }
-
-  public function offsetExists($offset) {
-    return isset($this->$offset);
-  }
-
-  public function offsetGet($offset) {
-    return $this->$offset;
-  }
-
-  public function offsetSet($offset, $value) {
-    $this->$offset = $value;
-  }
-
-  public function offsetUnset($offset) {
-    unset($this->$offset);
-  }
-}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/models/Order.php b/samples/client/petstore/php/SwaggerClient-php/lib/models/Order.php
deleted file mode 100644
index 4314d0df6f3..00000000000
--- a/samples/client/petstore/php/SwaggerClient-php/lib/models/Order.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- *  Copyright 2015 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.
- *
- */
-
-namespace SwaggerClient\models;
-
-use \ArrayAccess;
-
-class Order implements ArrayAccess {
-  static $swaggerTypes = array(
-      'id' => 'int',
-      'pet_id' => 'int',
-      'quantity' => 'int',
-      'ship_date' => 'DateTime',
-      'status' => 'string',
-      'complete' => 'boolean'
-  );
-
-  static $attributeMap = array(
-      'id' => 'id',
-      'pet_id' => 'petId',
-      'quantity' => 'quantity',
-      'ship_date' => 'shipDate',
-      'status' => 'status',
-      'complete' => 'complete'
-  );
-
-  
-  public $id; /* int */
-  public $pet_id; /* int */
-  public $quantity; /* int */
-  public $ship_date; /* DateTime */
-  /**
-  * Order Status
-  */
-  public $status; /* string */
-  public $complete; /* boolean */
-
-  public function __construct(array $data = null) {
-    $this->id = $data["id"];
-    $this->pet_id = $data["pet_id"];
-    $this->quantity = $data["quantity"];
-    $this->ship_date = $data["ship_date"];
-    $this->status = $data["status"];
-    $this->complete = $data["complete"];
-  }
-
-  public function offsetExists($offset) {
-    return isset($this->$offset);
-  }
-
-  public function offsetGet($offset) {
-    return $this->$offset;
-  }
-
-  public function offsetSet($offset, $value) {
-    $this->$offset = $value;
-  }
-
-  public function offsetUnset($offset) {
-    unset($this->$offset);
-  }
-}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/models/Pet.php b/samples/client/petstore/php/SwaggerClient-php/lib/models/Pet.php
deleted file mode 100644
index f74c9a88315..00000000000
--- a/samples/client/petstore/php/SwaggerClient-php/lib/models/Pet.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- *  Copyright 2015 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.
- *
- */
-
-namespace SwaggerClient\models;
-
-use \ArrayAccess;
-
-class Pet implements ArrayAccess {
-  static $swaggerTypes = array(
-      'id' => 'int',
-      'category' => 'Category',
-      'name' => 'string',
-      'photo_urls' => 'array[string]',
-      'tags' => 'array[Tag]',
-      'status' => 'string'
-  );
-
-  static $attributeMap = array(
-      'id' => 'id',
-      'category' => 'category',
-      'name' => 'name',
-      'photo_urls' => 'photoUrls',
-      'tags' => 'tags',
-      'status' => 'status'
-  );
-
-  
-  public $id; /* int */
-  public $category; /* Category */
-  public $name; /* string */
-  public $photo_urls; /* array[string] */
-  public $tags; /* array[Tag] */
-  /**
-  * pet status in the store
-  */
-  public $status; /* string */
-
-  public function __construct(array $data = null) {
-    $this->id = $data["id"];
-    $this->category = $data["category"];
-    $this->name = $data["name"];
-    $this->photo_urls = $data["photo_urls"];
-    $this->tags = $data["tags"];
-    $this->status = $data["status"];
-  }
-
-  public function offsetExists($offset) {
-    return isset($this->$offset);
-  }
-
-  public function offsetGet($offset) {
-    return $this->$offset;
-  }
-
-  public function offsetSet($offset, $value) {
-    $this->$offset = $value;
-  }
-
-  public function offsetUnset($offset) {
-    unset($this->$offset);
-  }
-}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/models/Tag.php b/samples/client/petstore/php/SwaggerClient-php/lib/models/Tag.php
deleted file mode 100644
index 309d4087088..00000000000
--- a/samples/client/petstore/php/SwaggerClient-php/lib/models/Tag.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- *  Copyright 2015 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.
- *
- */
-
-namespace SwaggerClient\models;
-
-use \ArrayAccess;
-
-class Tag implements ArrayAccess {
-  static $swaggerTypes = array(
-      'id' => 'int',
-      'name' => 'string'
-  );
-
-  static $attributeMap = array(
-      'id' => 'id',
-      'name' => 'name'
-  );
-
-  
-  public $id; /* int */
-  public $name; /* string */
-
-  public function __construct(array $data = null) {
-    $this->id = $data["id"];
-    $this->name = $data["name"];
-  }
-
-  public function offsetExists($offset) {
-    return isset($this->$offset);
-  }
-
-  public function offsetGet($offset) {
-    return $this->$offset;
-  }
-
-  public function offsetSet($offset, $value) {
-    $this->$offset = $value;
-  }
-
-  public function offsetUnset($offset) {
-    unset($this->$offset);
-  }
-}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/models/User.php b/samples/client/petstore/php/SwaggerClient-php/lib/models/User.php
deleted file mode 100644
index bbdaa1082b4..00000000000
--- a/samples/client/petstore/php/SwaggerClient-php/lib/models/User.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- *  Copyright 2015 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.
- *
- */
-
-namespace SwaggerClient\models;
-
-use \ArrayAccess;
-
-class User implements ArrayAccess {
-  static $swaggerTypes = array(
-      'id' => 'int',
-      'username' => 'string',
-      'first_name' => 'string',
-      'last_name' => 'string',
-      'email' => 'string',
-      'password' => 'string',
-      'phone' => 'string',
-      'user_status' => 'int'
-  );
-
-  static $attributeMap = array(
-      'id' => 'id',
-      'username' => 'username',
-      'first_name' => 'firstName',
-      'last_name' => 'lastName',
-      'email' => 'email',
-      'password' => 'password',
-      'phone' => 'phone',
-      'user_status' => 'userStatus'
-  );
-
-  
-  public $id; /* int */
-  public $username; /* string */
-  public $first_name; /* string */
-  public $last_name; /* string */
-  public $email; /* string */
-  public $password; /* string */
-  public $phone; /* string */
-  /**
-  * User Status
-  */
-  public $user_status; /* int */
-
-  public function __construct(array $data = null) {
-    $this->id = $data["id"];
-    $this->username = $data["username"];
-    $this->first_name = $data["first_name"];
-    $this->last_name = $data["last_name"];
-    $this->email = $data["email"];
-    $this->password = $data["password"];
-    $this->phone = $data["phone"];
-    $this->user_status = $data["user_status"];
-  }
-
-  public function offsetExists($offset) {
-    return isset($this->$offset);
-  }
-
-  public function offsetGet($offset) {
-    return $this->$offset;
-  }
-
-  public function offsetSet($offset, $value) {
-    $this->$offset = $value;
-  }
-
-  public function offsetUnset($offset) {
-    unset($this->$offset);
-  }
-}
diff --git a/samples/client/petstore/php/SwaggerClient-php/tests/OrderApiTest.php b/samples/client/petstore/php/SwaggerClient-php/tests/OrderApiTest.php
new file mode 100644
index 00000000000..3eb0d11a9b2
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/tests/OrderApiTest.php
@@ -0,0 +1,63 @@
+<?php
+
+require_once('autoload.php');
+
+class OrderApiTest 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);
+    }
+  
+    // test get inventory
+    public function testOrder()
+    {
+        // initialize the API client
+        $order = new Swagger\Client\Model\Order();
+  
+        $order->setStatus("placed");
+        $this->assertSame("placed", $order->getStatus());
+    }
+ 
+    /**
+     * @expectedException InvalidArgumentException
+     */ 
+    public function testOrderException()
+    {
+        // initialize the API client
+        $order = new Swagger\Client\Model\Order();
+        $order->setStatus("invalid_value");
+    }
+
+    // test deseralization of order
+    public function testDeserializationOfOrder()
+    {
+        $order_json = <<<ORDER
+{
+  "id": 10,
+  "petId": 20,
+  "quantity": 30,
+  "shipDate": "2015-08-22T07:13:36.613Z",
+  "status": "placed",
+  "complete": false
+}
+ORDER;
+        $serializer = new Swagger\Client\ObjectSerializer;
+        $order = $serializer->deserialize(json_decode($order_json), 'Swagger\Client\Model\Order');
+        
+        $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 390cf332b23..fe818069dac 100644
--- a/samples/client/petstore/php/SwaggerClient-php/tests/PetApiTest.php
+++ b/samples/client/petstore/php/SwaggerClient-php/tests/PetApiTest.php
@@ -1,35 +1,44 @@
 <?php
 
-require_once('SwaggerClient.php');
+require_once('autoload.php');
 
 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 
-    //SwaggerClient\Configuration::$debug = true;
+    //Swagger\Client\Configuration::$debug = true;
 
     // skip initializing the API client as it should be automatic
-    //$api_client = new SwaggerClient\ApiClient('http://petstore.swagger.io/v2');
+    //$api_client = new Swagger\Client\ApiClient('http://petstore.swagger.io/v2');
     // new pet
     $new_pet_id = 10005;
-    $new_pet = new SwaggerClient\models\Pet;
-    $new_pet->id = $new_pet_id;
-    $new_pet->name = "PHP Unit Test";
+    $new_pet = new Swagger\Client\Model\Pet;
+    $new_pet->setId($new_pet_id);
+    $new_pet->setName("PHP Unit Test");
     // new tag
-    $tag= new SwaggerClient\models\Tag;
-    $tag->id = $new_pet_id; // use the same id as pet
-    $tag->name = "test php 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 SwaggerClient\models\Category;
-    $category->id = $new_pet_id; // use the same id as pet
-    $category->name = "test php 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->tags = array($tag);
-    $new_pet->category = $category;
+    $new_pet->setTags(array($tag));
+    $new_pet->setCategory($category);
 
-    $pet_api = new SwaggerClient\PetAPI();
+    $pet_api = new Swagger\Client\Api\PetAPI();
     // add a new pet (model)
     $add_response = $pet_api->addPet($new_pet);
   }
@@ -38,80 +47,71 @@ public static function setUpBeforeClass() {
   public function testApiClient()
   { 
     // test selectHeaderAccept
-    $this->assertSame('application/json', SwaggerClient\ApiClient::selectHeaderAccept(array('application/xml','application/json')));
-    $this->assertSame(NULL, SwaggerClient\ApiClient::selectHeaderAccept(array()));
-    $this->assertSame('application/yaml,application/xml', SwaggerClient\ApiClient::selectHeaderAccept(array('application/yaml','application/xml')));
+    $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', SwaggerClient\ApiClient::selectHeaderContentType(array('application/xml','application/json')));
-    $this->assertSame('application/json', SwaggerClient\ApiClient::selectHeaderContentType(array()));
-    $this->assertSame('application/yaml,application/xml', SwaggerClient\ApiClient::selectHeaderContentType(array('application/yaml','application/xml')));
+    $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
-    SwaggerClient\ApiClient::addDefaultHeader('test1', 'value1');
-    SwaggerClient\ApiClient::addDefaultHeader('test2', 200);
-    $defaultHeader = SwaggerClient\ApiClient::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
-    SwaggerClient\ApiClient::deleteDefaultHeader('test2');
-    $defaultHeader = SwaggerClient\ApiClient::getDefaultHeader();
+    $api_client->getConfig()->deleteDefaultHeader('test2');
+    $defaultHeader = $api_client->getConfig()->getDefaultHeaders();
     $this->assertFalse(isset($defaultHeader['test2']));
 
-    $pet_api = new SwaggerClient\PetAPI();
-    $pet_api2 = new SwaggerClient\PetAPI();
-    $apiClient3 = new SwaggerClient\ApiClient();
-    $apiClient3->setUserAgent = 'api client 3';
-    $apiClient4 = new SwaggerClient\ApiClient();
-    $apiClient4->setUserAgent = 'api client 4';
-    $pet_api3 = new SwaggerClient\PetAPI($apiClient3);
-
-    // same default api client
-    $this->assertSame($pet_api->getApiClient(), $pet_api2->getApiClient());
-    // confirm using the default api client in the Configuration
-    $this->assertSame($pet_api->getApiClient(), SwaggerClient\Configuration::$apiClient);
+    $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);
-    // customized pet api not using the default (configuration) api client
-    $this->assertNotEquals($pet_api3->getApiClient(), SwaggerClient\Configuration::$apiClient);
     // customied pet api not using the old pet api's api client
     $this->assertNotEquals($pet_api2->getApiClient(), $pet_api3->getApiClient());
-
-    // both pet api and pet api2 share the same api client and confirm using timeout value
-    $pet_api->getApiClient()->setTimeout(999);
-    $this->assertSame(999, $pet_api2->getApiClient()->getTimeout());
-
   }
 
   // test getPetById with a Pet object (id 10005)
   public function testGetPetById()
   {
     // initialize the API client without host
-    $api_client = new SwaggerClient\ApiClient();
-    SwaggerClient\Configuration::$apiKey['api_key'] = '111222333444555';
     $pet_id = 10005;  // ID of pet that needs to be fetched
-    $pet_api = new SwaggerClient\PetAPI($api_client);
+    $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->id, $pet_id);
-    $this->assertSame($response->name, 'PHP Unit Test');
-    $this->assertSame($response->category->id, $pet_id);
-    $this->assertSame($response->category->name, 'test php category');
-    $this->assertSame($response->tags[0]->id, $pet_id);
-    $this->assertSame($response->tags[0]->name, 'test php tag');
+    $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 getPetByStatus and verify by the "id" of the response
   public function testFindPetByStatus()
   {
     // initialize the API client
-    $api_client = new SwaggerClient\ApiClient('http://petstore.swagger.io/v2');
-    $pet_api = new SwaggerClient\PetAPI($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]), "SwaggerClient\models\Pet"); // verify the object is Pet
+    $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");
@@ -125,68 +125,72 @@ public function testFindPetByStatus()
   public function testUpdatePet()
   {
     // initialize the API client
-    $api_client = new SwaggerClient\ApiClient('http://petstore.swagger.io/v2');
+    $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 SwaggerClient\PetAPI($api_client);
+    $pet_api = new Swagger\Client\Api\PetAPI($api_client);
     // create updated pet object
-    $updated_pet = new SwaggerClient\models\Pet;
-    $updated_pet->id = $pet_id;
-    $updated_pet->name = 'updatePet'; // new name
-    $updated_pet->status = 'pending'; // new status
+    $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->id, $pet_id);
-    $this->assertSame($response->status, 'pending');
-    $this->assertSame($response->name, 'updatePet');
+    $this->assertSame($response->getId(), $pet_id);
+    $this->assertSame($response->getStatus(), 'pending');
+    $this->assertSame($response->getName(), 'updatePet');
   }
 
   // test updatePet and verify by the "id" of the response
   public function testUpdatePetWithForm()
   {
     // initialize the API client
-    $api_client = new SwaggerClient\ApiClient('http://petstore.swagger.io/v2');
+    $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 SwaggerClient\PetAPI($api_client);
+    $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->id, $pet_id);
-    $this->assertSame($response->name, 'update pet with form');
-    $this->assertSame($response->status, 'sold');
+    $this->assertSame($response->getId(), $pet_id);
+    $this->assertSame($response->getName(), 'update pet with form');
+    $this->assertSame($response->getStatus(), 'sold');
   }
 
   // test addPet and verify by the "id" and "name" of the response
   public function testAddPet()
   {
     // initialize the API client
-    $api_client = new SwaggerClient\ApiClient('http://petstore.swagger.io/v2');
+    $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 SwaggerClient\models\Pet;
-    $new_pet->id = $new_pet_id;
-    $new_pet->name = "PHP Unit Test";
-    $pet_api = new SwaggerClient\PetAPI($api_client);
+    $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->id, $new_pet_id);
-    $this->assertSame($response->name, 'PHP Unit Test');
+    $this->assertSame($response->getId(), $new_pet_id);
+    $this->assertSame($response->getName(), 'PHP Unit Test');
   }
 
   // test upload file
   public function testUploadFile()
   {
     // initialize the API client
-    $api_client = new SwaggerClient\ApiClient('http://petstore.swagger.io/v2');
-    $pet_api = new SwaggerClient\PetAPI($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");
@@ -198,8 +202,10 @@ public function testUploadFile()
   public function testGetInventory()
   {
     // initialize the API client
-    $api_client = new SwaggerClient\APIClient('http://petstore.swagger.io/v2');
-    $store_api = new SwaggerClient\StoreAPI($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();
 
diff --git a/samples/client/petstore/php/SwaggerClient-php/tests/StoreApiTest.php b/samples/client/petstore/php/SwaggerClient-php/tests/StoreApiTest.php
new file mode 100644
index 00000000000..fcba8adf20a
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/tests/StoreApiTest.php
@@ -0,0 +1,53 @@
+<?php
+
+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");
+
+    $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 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']);
+
+  }
+
+}
+
+?>
+
diff --git a/samples/client/petstore/php/SwaggerClient-php/tests/UserApiTest.php b/samples/client/petstore/php/SwaggerClient-php/tests/UserApiTest.php
new file mode 100644
index 00000000000..3efce8b08ba
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/tests/UserApiTest.php
@@ -0,0 +1,33 @@
+<?php
+
+require_once('autoload.php');
+
+class UserApiTest 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);
+  }
+
+  // test login user
+  public function testLoginUser()
+  {
+    // initialize the API client
+    $config = (new Swagger\Client\Configuration())->setHost('http://petstore.swagger.io/v2');
+    $api_client = new Swagger\Client\ApiClient($config);
+    $user_api = new Swagger\Client\Api\UserApi($api_client);
+    // login
+    $response = $user_api->loginUser("xxxxx", "yyyyyyyy");
+
+    $this->assertInternalType("string", $response);
+    $this->assertRegExp("/^logged in user session/", $response, "response string starts with 'logged in user session'");
+
+  }
+
+}
+
+?>
+
diff --git a/samples/client/petstore/php/test.php b/samples/client/petstore/php/test.php
index f39e0dae4cf..099e2975a4a 100644
--- a/samples/client/petstore/php/test.php
+++ b/samples/client/petstore/php/test.php
@@ -1,56 +1,62 @@
 <?php
-//require_once('vendor/autoload.php');
-require_once('SwaggerClient-php/SwaggerClient.php');
+require_once(__DIR__ . '/SwaggerClient-php/autoload.php');
 
-// initialize the API client
-//$api_client = new SwaggerClient\ApiClient('http://petstore.swagger.io/v2');
-//$api_client->addDefaultHeader("test1", "value1");
+// show error reporting
+//ini_set('display_errors', 1);
+//error_reporting(~0);
 
 // to enable logging
-//SwaggerClient\Configuration::$debug = true;
-//SwaggerClient\Configuration::$debug_file = '/var/tmp/php_debug.log';
+//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/');
 
 $petId = 10005; // ID of pet that needs to be fetched
 try {
     // get pet by id
-    //$pet_api = new SwaggerClient\PetAPI($api_client);
-    $pet_api = new SwaggerClient\PetAPI();
+    //$api_client = new Swagger\Client\ApiClient('http://petstore.swagger.io/v2');
+    //$api_client->getConfig()->addDefaultHeader("test1", "value1");
+    //$pet_api = new Swagger\Client\PetAPI($api_client);
+    $pet_api = new Swagger\Client\Api\PetApi();
+    $pet_api->getApiClient()->getConfig()->setTempFolderPath('/var/tmp/php/');
     // test default header
-    $pet_api->getApiClient()->addDefaultHeader("TEST_API_KEY", "09182sdkanafndsl903");
+    //$pet_api->getApiClient()->addDefaultHeader("TEST_API_KEY", "09182sdkanafndsl903");
     // return Pet (model)
     $response = $pet_api->getPetById($petId);
-    var_dump($response);
-
-    // test upload file (exception)
-    $upload_response = $pet_api->uploadFile($petId, "test meta", NULL);
+    // to test __toString()
+    print ($response);
 
     // add pet (post json)
     $new_pet_id = 10005;
-    $new_pet = new SwaggerClient\models\Pet;
-    $new_pet->id = $new_pet_id;
-    $new_pet->name = "PHP Unit Test";
+    $new_pet = new Swagger\Client\Model\Pet;
+    $new_pet->setId($new_pet_id);
+    $new_pet->setName("PHP Unit Test");
     // new tag
-    $tag= new SwaggerClient\models\Tag;
-    $tag->id = $new_pet_id; // use the same id as pet
+    $tag= new Swagger\Client\Model\Tag;
+    $tag->setId($new_pet_id); // use the same id as pet
     //$tag->name = "test php tag";
     // new category
-    $category = new SwaggerClient\models\Category;
-    $category->id = 0; // use the same id as pet
+    $category = new Swagger\Client\Model\Category;
+    $category->setId(10005); // use the same id as pet
     //$category->name = "test php category";
 
-    $new_pet->tags = array($tag);
-    $new_pet->category = $category;
+    $new_pet->setTags(array($tag));
+    $new_pet->setCategory($category);
 
-    $pet_api = new SwaggerClient\PetAPI();
+    $pet_api = new Swagger\Client\Api\PetApi();
     // add a new pet (model)
     $add_response = $pet_api->addPet($new_pet);
 
-} catch (Exception $e) {
+    // test upload file (should return exception)
+    $upload_response = $pet_api->uploadFile($petId, "test meta", NULL);
+
+} catch (Swagger\Client\ApiException $e) {
     echo 'Caught exception: ', $e->getMessage(), "\n";
     echo 'HTTP response headers: ', $e->getResponseHeaders(), "\n";
     echo 'HTTP response body: ', $e->getResponseBody(), "\n";
     echo 'HTTP status code: ', $e->getCode(), "\n";
 }
-
-
-?>
diff --git a/samples/client/petstore/python/.coverage b/samples/client/petstore/python/.coverage
new file mode 100644
index 00000000000..d58a8fe9c63
Binary files /dev/null and b/samples/client/petstore/python/.coverage differ
diff --git a/samples/client/petstore/python/.travis.yml b/samples/client/petstore/python/.travis.yml
new file mode 100644
index 00000000000..bde258c4161
--- /dev/null
+++ b/samples/client/petstore/python/.travis.yml
@@ -0,0 +1,12 @@
+language: python
+python:
+  - "2.6"
+  - "2.7"
+  - "3.2"
+  - "3.3"
+  - "3.4"
+install:
+  - pip install . --use-mirrors
+  - pip install -r dev-requirements.txt --use-mirrors
+script: 
+  - nosetests
diff --git a/samples/client/petstore/python/Makefile b/samples/client/petstore/python/Makefile
new file mode 100644
index 00000000000..0f65e0c6ac3
--- /dev/null
+++ b/samples/client/petstore/python/Makefile
@@ -0,0 +1,21 @@
+ #!/bin/bash
+
+REQUIREMENTS_FILE=dev-requirements.txt
+REQUIREMENTS_OUT=dev-requirements.txt.log
+SETUP_OUT=*.egg-info
+VENV=.venv
+
+clean:
+		rm -rf $(REQUIREMENTS_OUT)
+		rm -rf $(SETUP_OUT)
+		rm -rf $(VENV)
+		rm -rf .tox
+		rm -rf .coverage
+		find . -name "*.py[oc]" -delete
+		find . -name "__pycache__" -delete
+
+test: clean 
+		bash ./test.sh
+
+test-all: clean 
+		bash ./test-all.sh
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/README.md b/samples/client/petstore/python/README.md
similarity index 80%
rename from samples/client/petstore/python/SwaggerPetstore-python/README.md
rename to samples/client/petstore/python/README.md
index 9c590a9a508..463bbb37a18 100644
--- a/samples/client/petstore/python/SwaggerPetstore-python/README.md
+++ b/samples/client/petstore/python/README.md
@@ -11,13 +11,13 @@ python setup.py install
 Or you can install from Github via pip:
 
 ```sh
-pip install git+https://github.com/geekerzp/SwaggerPetstore-python.git
+pip install git+https://github.com/geekerzp/swagger_client.git
 ```
 
 To use the bindings, import the pacakge:
 
 ```python
-import SwaggerPetstore
+import swagger_client
 ```
 
 ## Manual Installation
@@ -25,7 +25,7 @@ If you do not wish to use setuptools, you can download the latest release.
 Then, to use the bindings, import the package:
 
 ```python
-import path.to.SwaggerPetstore-python.SwaggerPetstore
+import path.to.swagger_client
 ```
 
 ## Getting Started
@@ -38,9 +38,9 @@ TODO
 
 ## Tests
 
-(Make sure you are running it inside of a [virtualenv](http://docs.python-guide.org/en/latest/dev/virtualenvs/))
+(Please make sure you have [virtualenv](http://docs.python-guide.org/en/latest/dev/virtualenvs/) installed)
 
-You can run the tests in the current python platform:
+ Execute the following command to run the tests in the current Python (v2 or v3) environment:
 
 ```sh
 $ make test
@@ -71,4 +71,3 @@ $ make test-all
   py34: commands succeeded
   congratulations :)
 ```
-
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/Makefile b/samples/client/petstore/python/SwaggerPetstore-python/Makefile
deleted file mode 100644
index 2811b735b54..00000000000
--- a/samples/client/petstore/python/SwaggerPetstore-python/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-REQUIREMENTS_FILE=dev-requirements.txt
-REQUIREMENTS_OUT=dev-requirements.txt.log
-SETUP_OUT=*.egg-info
-
-virtualenv:
-ifndef VIRTUAL_ENV
-		$(error Must be run inside of a virtualenv\
-     http://docs.python-guide.org/en/latest/dev/virtualenvs/)
-endif
-
-setup: virtualenv $(SETUP_OUT)
-
-$(SETUP_OUT): setup.py setup.cfg
-		python setup.py develop
-		touch $(SETUP_OUT)
-
-$(REQUIREMENTS_OUT): $(REQUIREMENTS_FILE)
-		pip install -r $(REQUIREMENTS_FILE) | tee -a $(REQUIREMENTS_OUT)
-		python setup.py develop
-
-clean:
-		rm -rf $(REQUIREMENTS_OUT)
-		rm -rf $(SETUP_OUT)
-		rm -rf .tox
-		rm -rf .coverage
-		find . -name "*.py[oc]" -delete
-		find . -name "__pycache__" -delete
-
-requirements: setup $(REQUIREMENTS_OUT)
-
-test: clean requirements
-		nosetests
-
-test-all: clean requirements
-		tox
-
-
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/api_client.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/api_client.py
deleted file mode 100644
index b8cc4cc2a84..00000000000
--- a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/api_client.py
+++ /dev/null
@@ -1,303 +0,0 @@
-#!/usr/bin/env python
-# coding: utf-8
-
-"""Swagger generic API client. This client handles the client-
-server communication, and is invariant across implementations. Specifics of
-the methods and models for each application are generated from the Swagger
-templates."""
-
-from __future__ import absolute_import
-from . import models
-from .rest import RESTClient
-
-import os
-import re
-import urllib
-import json
-import datetime
-import mimetypes
-import random
-
-# python 2 and python 3 compatibility library
-from six import iteritems
-
-try:
-  # for python3
-  from urllib.parse import quote
-except ImportError:
-  # for python2
-  from urllib import quote
-
-from . import configuration
-
-class ApiClient(object):
-  """
-  Generic API client for Swagger client library builds
-
-  :param host: The base path for the server to call
-  :param header_name: a header to pass when making calls to the API
-  :param header_value: a header value to pass when making calls to the API
-  """
-  def __init__(self, host=configuration.host, header_name=None, header_value=None):
-    self.default_headers = {}
-    if header_name is not None:
-      self.default_headers[header_name] = header_value
-    self.host = host
-    self.cookie = None
-    # Set default User-Agent.
-    self.user_agent = 'Python-Swagger'
-
-  @property
-  def user_agent(self):
-    return self.default_headers['User-Agent']
-
-  @user_agent.setter
-  def user_agent(self, value):
-    self.default_headers['User-Agent'] = value
-
-  def set_default_header(self, header_name, header_value):
-    self.default_headers[header_name] = header_value
-
-  def call_api(self, resource_path, method, path_params=None, query_params=None, header_params=None,
-               body=None, post_params=None, files=None, response=None, auth_settings=None):
-
-    # headers parameters
-    header_params = header_params or {}
-    header_params.update(self.default_headers)
-    if self.cookie:
-      header_params['Cookie'] = self.cookie
-    if header_params:
-      header_params = self.sanitize_for_serialization(header_params)
-
-    # path parameters
-    if path_params:
-      path_params = self.sanitize_for_serialization(path_params)
-      for k, v in iteritems(path_params):
-        replacement = quote(str(self.to_path_value(v)))
-        resource_path = resource_path.replace('{' + k + '}', replacement)
-
-    # query parameters
-    if query_params:
-      query_params = self.sanitize_for_serialization(query_params)
-      query_params = {k: self.to_path_value(v) for k, v in iteritems(query_params)}
-
-    # post parameters
-    if post_params:
-      post_params = self.prepare_post_parameters(post_params, files)
-      post_params = self.sanitize_for_serialization(post_params)
-
-    # auth setting
-    self.update_params_for_auth(header_params, query_params, auth_settings)
-
-    # body
-    if body:
-      body = self.sanitize_for_serialization(body)
-
-    # request url
-    url = self.host + resource_path
-
-    # perform request and return response
-    response_data = self.request(method, url, query_params=query_params, headers=header_params,
-                                 post_params=post_params, body=body)
-
-    # deserialize response data
-    if response:
-      return self.deserialize(response_data, response)
-    else:
-      return None
-
-  def to_path_value(self, obj):
-    """
-    Convert a string or object to a path-friendly value
-
-    :param obj: object or string value
-
-    :return string: quoted value
-    """
-    if type(obj) == list:
-      return ','.join(obj)
-    else:
-      return str(obj)
-
-  def sanitize_for_serialization(self, obj):
-    """
-    Sanitize an object for Request.
-
-    If obj is None, return None.
-    If obj is str, int, float, bool, return directly.
-    If obj is datetime.datetime, datetime.date convert to string in iso8601 format.
-    If obj is list, santize each element in the list.
-    If obj is dict, return the dict.
-    If obj is swagger model, return the properties dict.
-    """
-    if isinstance(obj, type(None)):
-      return None
-    elif isinstance(obj, (str, int, float, bool, tuple)):
-      return obj
-    elif isinstance(obj, list):
-      return [self.sanitize_for_serialization(sub_obj) for sub_obj in obj]
-    elif isinstance(obj, (datetime.datetime, datetime.date)):
-      return obj.isoformat()
-    else:
-      if isinstance(obj, dict):
-        obj_dict = obj
-      else:
-        # Convert model obj to dict except attributes `swagger_types`, `attribute_map`
-        # and attributes which value is not None.
-        # Convert attribute name to json key in model definition for request.
-        obj_dict = {obj.attribute_map[key]: val
-                    for key, val in iteritems(obj.__dict__)
-                    if key != 'swagger_types' and key != 'attribute_map' and val is not None}
-      return {key: self.sanitize_for_serialization(val)
-              for key, val in iteritems(obj_dict)}
-
-  def deserialize(self, obj, obj_class):
-    """
-    Derialize a JSON string into an object.
-
-    :param obj: string or object to be deserialized
-    :param obj_class: class literal for deserialzied object, or string of class name
-
-    :return object: deserialized object
-    """
-    # Have to accept obj_class as string or actual type. Type could be a
-    # native Python type, or one of the model classes.
-    if type(obj_class) == str:
-      if 'list[' in obj_class:
-        match = re.match('list\[(.*)\]', obj_class)
-        sub_class = match.group(1)
-        return [self.deserialize(sub_obj, sub_class) for sub_obj in obj]
-
-      if obj_class in ['int', 'float', 'dict', 'list', 'str', 'bool', 'datetime']:
-        obj_class = eval(obj_class)
-      else:  # not a native type, must be model class
-        obj_class = eval('models.' + obj_class)
-
-    if obj_class in [int, float, dict, list, str, bool]:
-      return obj_class(obj)
-    elif obj_class == datetime:
-      return self.__parse_string_to_datetime(obj)
-
-    instance = obj_class()
-
-    for attr, attr_type in iteritems(instance.swagger_types):
-        if obj is not None and instance.attribute_map[attr] in obj and type(obj) in [list, dict]:
-          value = obj[instance.attribute_map[attr]]
-          if attr_type in ['str', 'int', 'float', 'bool']:
-            attr_type = eval(attr_type)
-            try:
-              value = attr_type(value)
-            except UnicodeEncodeError:
-              value = unicode(value)
-            except TypeError:
-              value = value
-            setattr(instance, attr, value)
-          elif attr_type == 'datetime':
-            setattr(instance, attr, self.__parse_string_to_datetime(value))
-          elif 'list[' in attr_type:
-            match = re.match('list\[(.*)\]', attr_type)
-            sub_class = match.group(1)
-            sub_values = []
-            if not value:
-              setattr(instance, attr, None)
-            else:
-              for sub_value in value:
-                sub_values.append(self.deserialize(sub_value, sub_class))
-              setattr(instance, attr, sub_values)
-          else:
-            setattr(instance, attr, self.deserialize(value, attr_type))
-
-    return instance
-
-  def __parse_string_to_datetime(self, string):
-    """
-    Parse datetime in string to datetime.
-
-    The string should be in iso8601 datetime format.
-    """
-    try:
-        from dateutil.parser import parse
-        return parse(string)
-    except ImportError:
-        return string
-
-  def request(self, method, url, query_params=None, headers=None, post_params=None, body=None):
-    """
-    Perform http request using RESTClient.
-    """
-    if method == "GET":
-      return RESTClient.GET(url, query_params=query_params, headers=headers)
-    elif method == "HEAD":
-      return RESTClient.HEAD(url, query_params=query_params, headers=headers)
-    elif method == "POST":
-      return RESTClient.POST(url, headers=headers, post_params=post_params, body=body)
-    elif method == "PUT":
-      return RESTClient.PUT(url, headers=headers, post_params=post_params, body=body)
-    elif method == "PATCH":
-      return RESTClient.PATCH(url, headers=headers, post_params=post_params, body=body)
-    elif method == "DELETE":
-      return RESTClient.DELETE(url, query_params=query_params, headers=headers)
-    else:
-      raise ValueError("http method must be `GET`, `HEAD`, `POST`, `PATCH`, `PUT` or `DELETE`")
-
-  def prepare_post_parameters(self, post_params=None, files=None):
-    params = {}
-
-    if post_params:
-      params.update(post_params)
-
-    if files:
-      for k, v in iteritems(files):
-        if v:
-          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])
-
-    return params
-
-  def select_header_accept(self, accepts):
-    """
-    Return `Accept` based on an array of accepts provided
-    """
-    if not accepts:
-      return
-
-    accepts = list(map(lambda x: x.lower(), accepts))
-
-    if 'application/json' in accepts:
-      return 'application/json'
-    else:
-      return ', '.join(accepts)
-
-  def select_header_content_type(self, content_types):
-    """
-    Return `Content-Type` baseed on an array of content_types provided
-    """
-    if not content_types:
-      return 'application/json'
-
-    content_types = list(map(lambda x: x.lower(), content_types))
-
-    if 'application/json' in content_types:
-      return 'application/json'
-    else:
-      return content_types[0]
-
-  def update_params_for_auth(self, headers, querys, auth_settings):
-    """
-    Update header and query params based on authentication setting
-    """
-    if not auth_settings:
-      return
-    
-    for auth in auth_settings:
-      auth_setting = configuration.auth_settings().get(auth)
-      if auth_setting:
-        if auth_setting['in'] == 'header':
-          headers[auth_setting['key']] = auth_setting['value']
-        elif auth_setting['in'] == 'query':
-          querys[auth_setting['key']] = auth_setting['value']
-        else:
-          raise ValueError('Authentication token must be in `query` or `header`')
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/apis/pet_api.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/apis/pet_api.py
deleted file mode 100644
index 19f11fea66b..00000000000
--- a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/apis/pet_api.py
+++ /dev/null
@@ -1,502 +0,0 @@
-#!/usr/bin/env python
-# coding: utf-8
-
-"""
-PetApi.py
-Copyright 2015 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.
-"""
-from __future__ import absolute_import
-
-import sys
-import os
-
-# python 2 and python 3 compatibility library
-from six import iteritems
-
-from .. import configuration
-from ..api_client import ApiClient
-
-class PetApi(object):
-
-    def __init__(self, api_client=None):
-        if api_client:
-            self.api_client = api_client
-        else:
-            if not configuration.api_client:
-                configuration.api_client = ApiClient('http://petstore.swagger.io/v2')
-            self.api_client = configuration.api_client
-    
-    
-    def update_pet(self, **kwargs):
-        """
-        Update an existing pet
-        
-
-        :param Pet body: Pet object that needs to be added to the store 
-        
-        :return: None
-        """
-        
-        all_params = ['body']
-
-        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=None, auth_settings=auth_settings)
-        
-    def add_pet(self, **kwargs):
-        """
-        Add a new pet to the store
-        
-
-        :param Pet body: Pet object that needs to be added to the store 
-        
-        :return: None
-        """
-        
-        all_params = ['body']
-
-        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 add_pet" % key)
-            params[key] = val
-        del params['kwargs']
-
-        resource_path = '/pet'.replace('{format}', 'json')
-        method = 'POST'
-
-        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=None, auth_settings=auth_settings)
-        
-    def find_pets_by_status(self, **kwargs):
-        """
-        Finds Pets by status
-        Multiple status values can be provided with comma seperated strings
-
-        :param list[str] status: Status values that need to be considered for filter 
-        
-        :return: list[Pet]
-        """
-        
-        all_params = ['status']
-
-        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='list[Pet]', auth_settings=auth_settings)
-        
-        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.
-
-        :param list[str] tags: Tags to filter by 
-        
-        :return: list[Pet]
-        """
-        
-        all_params = ['tags']
-
-        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='list[Pet]', auth_settings=auth_settings)
-        
-        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
-
-        :param int pet_id: ID of pet that needs to be fetched (required)
-        
-        :return: Pet
-        """
-        
-        # verify the required parameter 'pet_id' is set
-        if pet_id is None:
-            raise ValueError("Missing the required parameter `pet_id` when calling `get_pet_by_id`")
-        
-        all_params = ['pet_id']
-
-        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']
-
-        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 = ['petstore_auth', 'api_key']
-
-        response = self.api_client.call_api(resource_path, method, path_params, query_params, header_params,
-                                            body=body_params, post_params=form_params, files=files,
-                                            response='Pet', auth_settings=auth_settings)
-        
-        return response
-        
-    def update_pet_with_form(self, pet_id, **kwargs):
-        """
-        Updates a pet in the store with form data
-        
-
-        :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
-        """
-        
-        # verify the required parameter 'pet_id' is set
-        if pet_id is None:
-            raise ValueError("Missing the required parameter `pet_id` when calling `update_pet_with_form`")
-        
-        all_params = ['pet_id', 'name', 'status']
-
-        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']
-
-        resource_path = '/pet/{petId}'.replace('{format}', 'json')
-        method = 'POST'
-
-        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']
-        
-        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, method, path_params, query_params, header_params,
-                                            body=body_params, post_params=form_params, files=files,
-                                            response=None, auth_settings=auth_settings)
-        
-    def delete_pet(self, pet_id, **kwargs):
-        """
-        Deletes a pet
-        
-
-        :param str api_key:  
-        :param int pet_id: Pet id to delete (required)
-        
-        :return: None
-        """
-        
-        # verify the required parameter 'pet_id' is set
-        if pet_id is None:
-            raise ValueError("Missing the required parameter `pet_id` when calling `delete_pet`")
-        
-        all_params = ['api_key', 'pet_id']
-
-        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_pet" % key)
-            params[key] = val
-        del params['kwargs']
-
-        resource_path = '/pet/{petId}'.replace('{format}', 'json')
-        method = 'DELETE'
-
-        path_params = {}
-        
-        if 'pet_id' in params:
-            path_params['petId'] = params['pet_id']  
-        
-        query_params = {}
-        
-        header_params = {}
-        
-        if 'api_key' in params:
-            header_params['api_key'] = params['api_key']
-        
-        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=None, auth_settings=auth_settings)
-        
-    def upload_file(self, pet_id, **kwargs):
-        """
-        uploads an image
-        
-
-        :param int pet_id: ID of pet to update (required)
-        :param str additional_metadata: Additional data to pass to server 
-        :param File file: file to upload 
-        
-        :return: None
-        """
-        
-        # verify the required parameter 'pet_id' is set
-        if pet_id is None:
-            raise ValueError("Missing the required parameter `pet_id` when calling `upload_file`")
-        
-        all_params = ['pet_id', 'additional_metadata', 'file']
-
-        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 upload_file" % key)
-            params[key] = val
-        del params['kwargs']
-
-        resource_path = '/pet/{petId}/uploadImage'.replace('{format}', 'json')
-        method = 'POST'
-
-        path_params = {}
-        
-        if 'pet_id' in params:
-            path_params['petId'] = params['pet_id']  
-        
-        query_params = {}
-        
-        header_params = {}
-        
-        form_params = {}
-        files = {}
-        
-        if 'additional_metadata' in params:
-            form_params['additionalMetadata'] = params['additional_metadata']
-        
-        if 'file' in params:
-            files['file'] = params['file']
-        
-        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(['multipart/form-data'])
-
-        # 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=None, auth_settings=auth_settings)
-        
-
-
-
-
-
-
-
-
-
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/apis/store_api.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/apis/store_api.py
deleted file mode 100644
index 1523e3b4be4..00000000000
--- a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/apis/store_api.py
+++ /dev/null
@@ -1,266 +0,0 @@
-#!/usr/bin/env python
-# coding: utf-8
-
-"""
-StoreApi.py
-Copyright 2015 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.
-"""
-from __future__ import absolute_import
-
-import sys
-import os
-
-# python 2 and python 3 compatibility library
-from six import iteritems
-
-from .. import configuration
-from ..api_client import ApiClient
-
-class StoreApi(object):
-
-    def __init__(self, api_client=None):
-        if api_client:
-            self.api_client = api_client
-        else:
-            if not configuration.api_client:
-                configuration.api_client = ApiClient('http://petstore.swagger.io/v2')
-            self.api_client = configuration.api_client
-    
-    
-    def get_inventory(self, **kwargs):
-        """
-        Returns pet inventories by status
-        Returns a map of status codes to quantities
-
-        
-        :return: map(String, int)
-        """
-        
-        all_params = []
-
-        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_inventory" % key)
-            params[key] = val
-        del params['kwargs']
-
-        resource_path = '/store/inventory'.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 = ['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='map(String, int)', auth_settings=auth_settings)
-        
-        return response
-        
-    def place_order(self, **kwargs):
-        """
-        Place an order for a pet
-        
-
-        :param Order body: order placed for purchasing the pet 
-        
-        :return: Order
-        """
-        
-        all_params = ['body']
-
-        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 place_order" % key)
-            params[key] = val
-        del params['kwargs']
-
-        resource_path = '/store/order'.replace('{format}', 'json')
-        method = 'POST'
-
-        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([])
-
-        # 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='Order', auth_settings=auth_settings)
-        
-        return response
-        
-    def get_order_by_id(self, order_id, **kwargs):
-        """
-        Find purchase order by ID
-        For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
-
-        :param str order_id: ID of pet that needs to be fetched (required)
-        
-        :return: Order
-        """
-        
-        # verify the required parameter 'order_id' is set
-        if order_id is None:
-            raise ValueError("Missing the required parameter `order_id` when calling `get_order_by_id`")
-        
-        all_params = ['order_id']
-
-        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_order_by_id" % key)
-            params[key] = val
-        del params['kwargs']
-
-        resource_path = '/store/order/{orderId}'.replace('{format}', 'json')
-        method = 'GET'
-
-        path_params = {}
-        
-        if 'order_id' in params:
-            path_params['orderId'] = params['order_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 = []
-
-        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='Order', auth_settings=auth_settings)
-        
-        return response
-        
-    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
-
-        :param str order_id: ID of the order that needs to be deleted (required)
-        
-        :return: None
-        """
-        
-        # verify the required parameter 'order_id' is set
-        if order_id is None:
-            raise ValueError("Missing the required parameter `order_id` when calling `delete_order`")
-        
-        all_params = ['order_id']
-
-        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']
-
-        resource_path = '/store/order/{orderId}'.replace('{format}', 'json')
-        method = 'DELETE'
-
-        path_params = {}
-        
-        if 'order_id' in params:
-            path_params['orderId'] = params['order_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 = []
-
-        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=None, auth_settings=auth_settings)
-        
-
-
-
-
-
-
-
-
-
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/apis/user_api.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/apis/user_api.py
deleted file mode 100644
index 84a40b06579..00000000000
--- a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/apis/user_api.py
+++ /dev/null
@@ -1,480 +0,0 @@
-#!/usr/bin/env python
-# coding: utf-8
-
-"""
-UserApi.py
-Copyright 2015 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.
-"""
-from __future__ import absolute_import
-
-import sys
-import os
-
-# python 2 and python 3 compatibility library
-from six import iteritems
-
-from .. import configuration
-from ..api_client import ApiClient
-
-class UserApi(object):
-
-    def __init__(self, api_client=None):
-        if api_client:
-            self.api_client = api_client
-        else:
-            if not configuration.api_client:
-                configuration.api_client = ApiClient('http://petstore.swagger.io/v2')
-            self.api_client = configuration.api_client
-    
-    
-    def create_user(self, **kwargs):
-        """
-        Create user
-        This can only be done by the logged in user.
-
-        :param User body: Created user object 
-        
-        :return: None
-        """
-        
-        all_params = ['body']
-
-        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 create_user" % key)
-            params[key] = val
-        del params['kwargs']
-
-        resource_path = '/user'.replace('{format}', 'json')
-        method = 'POST'
-
-        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([])
-
-        # 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=None, auth_settings=auth_settings)
-        
-    def create_users_with_array_input(self, **kwargs):
-        """
-        Creates list of users with given input array
-        
-
-        :param list[User] body: List of user object 
-        
-        :return: None
-        """
-        
-        all_params = ['body']
-
-        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 create_users_with_array_input" % key)
-            params[key] = val
-        del params['kwargs']
-
-        resource_path = '/user/createWithArray'.replace('{format}', 'json')
-        method = 'POST'
-
-        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([])
-
-        # 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=None, auth_settings=auth_settings)
-        
-    def create_users_with_list_input(self, **kwargs):
-        """
-        Creates list of users with given input array
-        
-
-        :param list[User] body: List of user object 
-        
-        :return: None
-        """
-        
-        all_params = ['body']
-
-        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 create_users_with_list_input" % key)
-            params[key] = val
-        del params['kwargs']
-
-        resource_path = '/user/createWithList'.replace('{format}', 'json')
-        method = 'POST'
-
-        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([])
-
-        # 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=None, auth_settings=auth_settings)
-        
-    def login_user(self, **kwargs):
-        """
-        Logs user into the system
-        
-
-        :param str username: The user name for login 
-        :param str password: The password for login in clear text 
-        
-        :return: str
-        """
-        
-        all_params = ['username', 'password']
-
-        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='str', auth_settings=auth_settings)
-        
-        return response
-        
-    def logout_user(self, **kwargs):
-        """
-        Logs out current logged in user session
-        
-
-        
-        :return: None
-        """
-        
-        all_params = []
-
-        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=None, auth_settings=auth_settings)
-        
-    def get_user_by_name(self, username, **kwargs):
-        """
-        Get user by user name
-        
-
-        :param str username: The name that needs to be fetched. Use user1 for testing.  (required)
-        
-        :return: User
-        """
-        
-        # verify the required parameter 'username' is set
-        if username is None:
-            raise ValueError("Missing the required parameter `username` when calling `get_user_by_name`")
-        
-        all_params = ['username']
-
-        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']
-
-        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='User', auth_settings=auth_settings)
-        
-        return response
-        
-    def update_user(self, username, **kwargs):
-        """
-        Updated user
-        This can only be done by the logged in user.
-
-        :param str username: name that need to be deleted (required)
-        :param User body: Updated user object 
-        
-        :return: None
-        """
-        
-        # verify the required parameter 'username' is set
-        if username is None:
-            raise ValueError("Missing the required parameter `username` when calling `update_user`")
-        
-        all_params = ['username', 'body']
-
-        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']
-
-        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,
-                                            response=None, auth_settings=auth_settings)
-        
-    def delete_user(self, username, **kwargs):
-        """
-        Delete user
-        This can only be done by the logged in user.
-
-        :param str username: The name that needs to be deleted (required)
-        
-        :return: None
-        """
-        
-        # verify the required parameter 'username' is set
-        if username is None:
-            raise ValueError("Missing the required parameter `username` when calling `delete_user`")
-        
-        all_params = ['username']
-
-        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_user" % key)
-            params[key] = val
-        del params['kwargs']
-
-        resource_path = '/user/{username}'.replace('{format}', 'json')
-        method = 'DELETE'
-
-        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=None, auth_settings=auth_settings)
-        
-
-
-
-
-
-
-
-
-
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/configuration.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/configuration.py
deleted file mode 100644
index b5bd0a64e0a..00000000000
--- a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/configuration.py
+++ /dev/null
@@ -1,44 +0,0 @@
-from __future__ import absolute_import
-import base64
-import urllib3
-
-def get_api_key_with_prefix(key):
-    global api_key
-    global api_key_prefix
-
-    if api_key.get(key) and api_key_prefix.get(key):
-      return api_key_prefix[key] + ' ' + api_key[key]
-    elif api_key.get(key):
-      return api_key[key]
-
-def get_basic_auth_token():
-    global username
-    global password
-
-    return urllib3.util.make_headers(basic_auth=username + ':' + password).get('authorization')
-
-def auth_settings():
-    return { 
-               'api_key': {
-                   'type': 'api_key',
-                   'in': 'header',
-                   'key': 'api_key',
-                   'value': get_api_key_with_prefix('api_key')
-               },
-             
-           }
-
-# Default Base url
-host = "http://petstore.swagger.io/v2"
-
-# Default api client
-api_client = None
-             
-# Authentication settings
-
-api_key = {}
-api_key_prefix = {}
-username = ''
-password = ''
-
-
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/category.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/category.py
deleted file mode 100644
index cfd69ee955c..00000000000
--- a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/category.py
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env python
-# coding: utf-8
-
-"""
-Copyright 2015 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.
-"""
-
-class Category(object):
-    """
-    NOTE: This class is auto generated by the swagger code generator program.
-    Do not edit the class manually.
-    """
-
-    def __init__(self):
-        """
-        Swagger model
-
-        :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 = {
-            'id': 'int',
-            'name': 'str'
-        }
-
-        self.attribute_map = {
-            'id': 'id',
-            'name': 'name'
-        }
-        
-        
-        self.id = None  # int
-        
-        
-        self.name = None  # str
-        
-
-    def __repr__(self):
-        properties = []
-        for p in self.__dict__:
-            if p != 'swaggerTypes' and p != 'attributeMap':
-                properties.append('{prop}={val!r}'.format(prop=p, val=self.__dict__[p]))
-
-        return '<{name} {props}>'.format(name=__name__, props=' '.join(properties))
-
-
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/order.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/order.py
deleted file mode 100644
index e364ba5b155..00000000000
--- a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/order.py
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/env python
-# coding: utf-8
-
-"""
-Copyright 2015 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.
-"""
-
-class Order(object):
-    """
-    NOTE: This class is auto generated by the swagger code generator program.
-    Do not edit the class manually.
-    """
-
-    def __init__(self):
-        """
-        Swagger model
-
-        :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 = {
-            'id': 'int',
-            'pet_id': 'int',
-            'quantity': 'int',
-            'ship_date': 'DateTime',
-            'status': 'str',
-            'complete': 'bool'
-        }
-
-        self.attribute_map = {
-            'id': 'id',
-            'pet_id': 'petId',
-            'quantity': 'quantity',
-            'ship_date': 'shipDate',
-            'status': 'status',
-            'complete': 'complete'
-        }
-        
-        
-        self.id = None  # int
-        
-        
-        self.pet_id = None  # int
-        
-        
-        self.quantity = None  # int
-        
-        
-        self.ship_date = None  # DateTime
-        
-        # Order Status
-        self.status = None  # str
-        
-        
-        self.complete = None  # bool
-        
-
-    def __repr__(self):
-        properties = []
-        for p in self.__dict__:
-            if p != 'swaggerTypes' and p != 'attributeMap':
-                properties.append('{prop}={val!r}'.format(prop=p, val=self.__dict__[p]))
-
-        return '<{name} {props}>'.format(name=__name__, props=' '.join(properties))
-
-
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/pet.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/pet.py
deleted file mode 100644
index a943b639663..00000000000
--- a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/pet.py
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/env python
-# coding: utf-8
-
-"""
-Copyright 2015 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.
-"""
-
-class Pet(object):
-    """
-    NOTE: This class is auto generated by the swagger code generator program.
-    Do not edit the class manually.
-    """
-
-    def __init__(self):
-        """
-        Swagger model
-
-        :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 = {
-            'id': 'int',
-            'category': 'Category',
-            'name': 'str',
-            'photo_urls': 'list[str]',
-            'tags': 'list[Tag]',
-            'status': 'str'
-        }
-
-        self.attribute_map = {
-            'id': 'id',
-            'category': 'category',
-            'name': 'name',
-            'photo_urls': 'photoUrls',
-            'tags': 'tags',
-            'status': 'status'
-        }
-        
-        
-        self.id = None  # int
-        
-        
-        self.category = None  # Category
-        
-        
-        self.name = None  # str
-        
-        
-        self.photo_urls = None  # list[str]
-        
-        
-        self.tags = None  # list[Tag]
-        
-        # pet status in the store
-        self.status = None  # str
-        
-
-    def __repr__(self):
-        properties = []
-        for p in self.__dict__:
-            if p != 'swaggerTypes' and p != 'attributeMap':
-                properties.append('{prop}={val!r}'.format(prop=p, val=self.__dict__[p]))
-
-        return '<{name} {props}>'.format(name=__name__, props=' '.join(properties))
-
-
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/tag.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/tag.py
deleted file mode 100644
index 6347352eba7..00000000000
--- a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/tag.py
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env python
-# coding: utf-8
-
-"""
-Copyright 2015 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.
-"""
-
-class Tag(object):
-    """
-    NOTE: This class is auto generated by the swagger code generator program.
-    Do not edit the class manually.
-    """
-
-    def __init__(self):
-        """
-        Swagger model
-
-        :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 = {
-            'id': 'int',
-            'name': 'str'
-        }
-
-        self.attribute_map = {
-            'id': 'id',
-            'name': 'name'
-        }
-        
-        
-        self.id = None  # int
-        
-        
-        self.name = None  # str
-        
-
-    def __repr__(self):
-        properties = []
-        for p in self.__dict__:
-            if p != 'swaggerTypes' and p != 'attributeMap':
-                properties.append('{prop}={val!r}'.format(prop=p, val=self.__dict__[p]))
-
-        return '<{name} {props}>'.format(name=__name__, props=' '.join(properties))
-
-
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/user.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/user.py
deleted file mode 100644
index 83efcd9ee2b..00000000000
--- a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/user.py
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/usr/bin/env python
-# coding: utf-8
-
-"""
-Copyright 2015 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.
-"""
-
-class User(object):
-    """
-    NOTE: This class is auto generated by the swagger code generator program.
-    Do not edit the class manually.
-    """
-
-    def __init__(self):
-        """
-        Swagger model
-
-        :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 = {
-            'id': 'int',
-            'username': 'str',
-            'first_name': 'str',
-            'last_name': 'str',
-            'email': 'str',
-            'password': 'str',
-            'phone': 'str',
-            'user_status': 'int'
-        }
-
-        self.attribute_map = {
-            'id': 'id',
-            'username': 'username',
-            'first_name': 'firstName',
-            'last_name': 'lastName',
-            'email': 'email',
-            'password': 'password',
-            'phone': 'phone',
-            'user_status': 'userStatus'
-        }
-        
-        
-        self.id = None  # int
-        
-        
-        self.username = None  # str
-        
-        
-        self.first_name = None  # str
-        
-        
-        self.last_name = None  # str
-        
-        
-        self.email = None  # str
-        
-        
-        self.password = None  # str
-        
-        
-        self.phone = None  # str
-        
-        # User Status
-        self.user_status = None  # int
-        
-
-    def __repr__(self):
-        properties = []
-        for p in self.__dict__:
-            if p != 'swaggerTypes' and p != 'attributeMap':
-                properties.append('{prop}={val!r}'.format(prop=p, val=self.__dict__[p]))
-
-        return '<{name} {props}>'.format(name=__name__, props=' '.join(properties))
-
-
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/rest.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/rest.py
deleted file mode 100644
index 508f3d6693a..00000000000
--- a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/rest.py
+++ /dev/null
@@ -1,253 +0,0 @@
-# coding: utf-8
-
-"""
-Credit: this file (rest.py) is modified based on rest.py in Dropbox Python SDK:
-https://www.dropbox.com/developers/core/sdks/python
-"""
-
-import sys
-import io
-import json
-import ssl
-import certifi
-
-# python 2 and python 3 compatibility library
-from six import iteritems
-
-try:
-    import urllib3
-except ImportError:
-    raise ImportError('Swagger python client requires urllib3.')
-
-try:
-    # for python3
-    from urllib.parse import urlencode
-except ImportError:
-    # for python2
-    from urllib import urlencode
-
-
-class RESTResponse(io.IOBase):
-
-    def __init__(self, resp):
-        self.urllib3_response = resp
-        self.status = resp.status
-        self.reason = resp.reason
-        self.data = resp.data
-
-    def getheaders(self):
-        """
-        Returns a dictionary of the response headers.
-        """
-        return self.urllib3_response.getheaders()
-
-    def getheader(self, name, default=None):
-        """
-        Returns a given response header.
-        """
-        return self.urllib3_response.getheader(name, default)
-
-class RESTClientObject(object):
-
-    def __init__(self, pools_size=4):
-        # http pool manager
-        self.pool_manager = urllib3.PoolManager(
-            num_pools=pools_size
-        )
-
-        # https pool manager
-        # certificates validated using Mozilla’s root certificates
-        self.ssl_pool_manager = urllib3.PoolManager(
-            num_pools=pools_size,
-            cert_reqs=ssl.CERT_REQUIRED,
-            ca_certs=certifi.where()
-        )
-
-    def agent(self, url):
-        """
-        Return proper pool manager for the http\https schemes.
-        """
-        url = urllib3.util.url.parse_url(url)
-        scheme = url.scheme
-        if scheme == 'https':
-            return self.ssl_pool_manager
-        else:
-            return self.pool_manager
-
-    def request(self, method, url, query_params=None, headers=None,
-                body=None, post_params=None):
-        """
-        :param method: http request method
-        :param url: http request url
-        :param query_params: query parameters in the url
-        :param headers: http request headers
-        :param body: request json body, for `application/json`
-        :param post_params: request post parameters, `application/x-www-form-urlencode`
-                            and `multipart/form-data`
-        """
-        method = method.upper()
-        assert method in ['GET', 'HEAD', 'DELETE', 'POST', 'PUT', 'PATCH']
-
-        if post_params and body:
-            raise ValueError("body parameter cannot be used with post_params parameter.")
-
-        post_params = post_params or {}
-        headers = headers or {}
-
-        if 'Content-Type' not in headers:
-            headers['Content-Type'] = 'application/json'
-
-        # For `POST`, `PUT`, `PATCH`
-        if method in ['POST', 'PUT', 'PATCH']:
-            if query_params:
-                url += '?' + urlencode(query_params)
-            if headers['Content-Type'] == 'application/json':
-                r = self.agent(url).request(method, url,
-                                            body=json.dumps(body),
-                                            headers=headers)
-            if headers['Content-Type'] == 'application/x-www-form-urlencoded':
-                r = self.agent(url).request(method, url,
-                                            fields=post_params,
-                                            encode_multipart=False,
-                                            headers=headers)
-            if headers['Content-Type'] == 'multipart/form-data':
-                # must del headers['Content-Type'], or the correct Content-Type
-                # which generated by urllib3 will be overwritten.
-                del headers['Content-Type']
-                r = self.agent(url).request(method, url,
-                                            fields=post_params,
-                                            encode_multipart=True,
-                                            headers=headers)
-        # For `GET`, `HEAD`, `DELETE`
-        else:
-            r = self.agent(url).request(method, url,
-                                        fields=query_params,
-                                        headers=headers)
-        r = RESTResponse(r)
-
-        if r.status not in range(200, 206):
-            raise ApiException(r)
-
-        return self.process_response(r)
-
-    def process_response(self, response):
-        # In the python 3, the response.data is bytes.
-        # we need to decode it to string.
-        if sys.version_info > (3,):
-            data = response.data.decode('utf8')
-        else:
-            data = response.data
-        try:
-            resp = json.loads(data)
-        except ValueError:
-            resp = data
-
-        return resp
-
-    def GET(self, url, headers=None, query_params=None):
-        return self.request("GET", url, headers=headers, query_params=query_params)
-
-    def HEAD(self, url, headers=None, query_params=None):
-        return self.request("HEAD", url, headers=headers, query_params=query_params)
-
-    def DELETE(self, url, headers=None, query_params=None):
-        return self.request("DELETE", url, headers=headers, query_params=query_params)
-
-    def POST(self, url, headers=None, post_params=None, body=None):
-        return self.request("POST", url, headers=headers, post_params=post_params, body=body)
-
-    def PUT(self, url, headers=None, post_params=None, body=None):
-        return self.request("PUT", url, headers=headers, post_params=post_params, body=body)
-
-    def PATCH(self, url, headers=None, post_params=None, body=None):
-        return self.request("PATCH", url, headers=headers, post_params=post_params, body=body)
-
-
-class ApiException(Exception):
-    """
-    Non-2xx HTTP response
-    """
-
-    def __init__(self, http_resp):
-        self.status = http_resp.status
-        self.reason = http_resp.reason
-        self.body = http_resp.data
-        self.headers = http_resp.getheaders()
-
-        # In the python 3, the self.body is bytes.
-        # we need to decode it to string.
-        if sys.version_info > (3,):
-            data = self.body.decode('utf8')
-        else:
-            data = self.body
-            
-        try:
-            self.body = json.loads(data)
-        except ValueError:
-            self.body = data
-
-    def __str__(self):
-        """
-        Custom error response messages
-        """
-        return "({0})\n"\
-            "Reason: {1}\n"\
-            "HTTP response headers: {2}\n"\
-            "HTTP response body: {3}\n".\
-            format(self.status, self.reason, self.headers, self.body)
-
-class RESTClient(object):
-    """
-    A class with all class methods to perform JSON requests.
-    """
-
-    IMPL = RESTClientObject()
-
-    @classmethod
-    def request(cls, *n, **kw):
-        """
-        Perform a REST request and parse the response.
-        """
-        return cls.IMPL.request(*n, **kw)
-
-    @classmethod
-    def GET(cls, *n, **kw):
-        """
-        Perform a GET request using `RESTClient.request()`.
-        """
-        return cls.IMPL.GET(*n, **kw)
-
-    @classmethod
-    def HEAD(cls, *n, **kw):
-        """
-        Perform a HEAD request using `RESTClient.request()`.
-        """
-        return cls.IMPL.GET(*n, **kw)
-
-    @classmethod
-    def POST(cls, *n, **kw):
-        """
-        Perform a POST request using `RESTClient.request()`
-        """
-        return cls.IMPL.POST(*n, **kw)
-
-    @classmethod
-    def PUT(cls, *n, **kw):
-        """
-        Perform a PUT request using `RESTClient.request()`
-        """
-        return cls.IMPL.PUT(*n, **kw)
-
-    @classmethod
-    def PATCH(cls, *n, **kw):
-        """
-        Perform a PATCH request using `RESTClient.request()`
-        """
-        return cls.IMPL.PATCH(*n, **kw)
-
-    @classmethod
-    def DELETE(cls, *n, **kw):
-        """
-        Perform a DELETE request using `RESTClient.request()`
-        """
-        return cls.IMPL.DELETE(*n, **kw)
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/tests/test_api_client.py b/samples/client/petstore/python/SwaggerPetstore-python/tests/test_api_client.py
deleted file mode 100644
index 0ef4314d0f4..00000000000
--- a/samples/client/petstore/python/SwaggerPetstore-python/tests/test_api_client.py
+++ /dev/null
@@ -1,90 +0,0 @@
-# coding: utf-8
-
-"""
-Run the tests.
-$ pip install nose (optional)
-$ cd SwaggerPetstore-python
-$ nosetests -v
-"""
-
-import os
-import time
-import unittest
-
-import SwaggerPetstore
-import SwaggerPetstore.configuration
-
-HOST = 'http://petstore.swagger.io/v2'
-
-
-class ApiClientTests(unittest.TestCase):
-
-    def setUp(self):
-        self.api_client = SwaggerPetstore.ApiClient(HOST)
-
-    def test_configuration(self):
-        SwaggerPetstore.configuration.api_key['api_key'] = '123456'
-        SwaggerPetstore.configuration.api_key_prefix['api_key'] = 'PREFIX'
-        SwaggerPetstore.configuration.username = 'test_username'
-        SwaggerPetstore.configuration.password = 'test_password'
-
-        header_params = {'test1': 'value1'}
-        query_params = {'test2': 'value2'}
-        auth_settings = ['api_key', 'unknown']
-
-        # test prefix
-        self.assertEqual('PREFIX', SwaggerPetstore.configuration.api_key_prefix['api_key'])
-
-        # update parameters based on auth setting
-        self.api_client.update_params_for_auth(header_params, query_params, auth_settings)
-
-        # test api key auth
-        self.assertEqual(header_params['test1'], 'value1')
-        self.assertEqual(header_params['api_key'], 'PREFIX 123456')
-        self.assertEqual(query_params['test2'], 'value2')
-
-        # test basic auth
-        self.assertEqual('test_username', SwaggerPetstore.configuration.username)
-        self.assertEqual('test_password', SwaggerPetstore.configuration.password)
-
-    def test_select_header_accept(self):
-        accepts = ['APPLICATION/JSON', 'APPLICATION/XML']
-        accept = self.api_client.select_header_accept(accepts)
-        self.assertEqual(accept, 'application/json')
-        
-        accepts = ['application/json', 'application/xml']
-        accept = self.api_client.select_header_accept(accepts)
-        self.assertEqual(accept, 'application/json')
-
-        accepts = ['application/xml', 'application/json']
-        accept = self.api_client.select_header_accept(accepts)
-        self.assertEqual(accept, 'application/json')
-
-        accepts = ['text/plain', 'application/xml']
-        accept = self.api_client.select_header_accept(accepts)
-        self.assertEqual(accept, 'text/plain, application/xml')
-
-        accepts = []
-        accept = self.api_client.select_header_accept(accepts)
-        self.assertEqual(accept, None)
-
-    def test_select_header_content_type(self):
-        content_types = ['APPLICATION/JSON', 'APPLICATION/XML']
-        content_type = self.api_client.select_header_content_type(content_types)
-        self.assertEqual(content_type, 'application/json')
-        
-        content_types = ['application/json', 'application/xml']
-        content_type = self.api_client.select_header_content_type(content_types)
-        self.assertEqual(content_type, 'application/json')
-        
-        content_types = ['application/xml', 'application/json']
-        content_type = self.api_client.select_header_content_type(content_types)
-        self.assertEqual(content_type, 'application/json')
-        
-        content_types = ['text/plain', 'application/xml']
-        content_type = self.api_client.select_header_content_type(content_types)
-        self.assertEqual(content_type, 'text/plain')
-        
-        content_types = []
-        content_type = self.api_client.select_header_content_type(content_types)
-        self.assertEqual(content_type, 'application/json')
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/dev-requirements.txt b/samples/client/petstore/python/dev-requirements.txt
similarity index 100%
rename from samples/client/petstore/python/SwaggerPetstore-python/dev-requirements.txt
rename to samples/client/petstore/python/dev-requirements.txt
diff --git a/samples/client/petstore/python/dev-requirements.txt.log b/samples/client/petstore/python/dev-requirements.txt.log
new file mode 100644
index 00000000000..9394a724030
--- /dev/null
+++ b/samples/client/petstore/python/dev-requirements.txt.log
@@ -0,0 +1,15 @@
+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
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/pom.xml b/samples/client/petstore/python/pom.xml
similarity index 99%
rename from samples/client/petstore/python/SwaggerPetstore-python/pom.xml
rename to samples/client/petstore/python/pom.xml
index 9efbfb0a35d..147938617d2 100644
--- a/samples/client/petstore/python/SwaggerPetstore-python/pom.xml
+++ b/samples/client/petstore/python/pom.xml
@@ -44,14 +44,3 @@
         </plugins>
     </build>
 </project>
-
-
-
-
-
-
-
-
-
-
-
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/setup.cfg b/samples/client/petstore/python/setup.cfg
similarity index 82%
rename from samples/client/petstore/python/SwaggerPetstore-python/setup.cfg
rename to samples/client/petstore/python/setup.cfg
index e62af080034..c9eef8726d6 100644
--- a/samples/client/petstore/python/SwaggerPetstore-python/setup.cfg
+++ b/samples/client/petstore/python/setup.cfg
@@ -4,7 +4,7 @@ verbosity=2
 randomize=true
 exe=true
 with-coverage=true
-cover-package=SwaggerPetstore
+cover-package=swagger_client
 cover-erase=true
 
 [flake8]
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/setup.py b/samples/client/petstore/python/setup.py
similarity index 70%
rename from samples/client/petstore/python/SwaggerPetstore-python/setup.py
rename to samples/client/petstore/python/setup.py
index fbd738be680..8564466b0dd 100644
--- a/samples/client/petstore/python/SwaggerPetstore-python/setup.py
+++ b/samples/client/petstore/python/setup.py
@@ -1,22 +1,25 @@
+# coding: utf-8
+
 import sys
 from setuptools import setup, find_packages
 
+NAME = "swagger_client"
+VERSION = "1.0.0"
+
 
 
-# To install the library, open a Terminal shell, then run this
-# file by typing:
+# To install the library, run the following
 #
 # python setup.py install
 #
-# You need to have the setuptools module installed.
-# Try reading the setuptools documentation:
+# prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 
-REQUIRES = ["urllib3 >= 1.10", "six >= 1.9", "certifi"]
+REQUIRES = ["urllib3 >= 1.10", "six >= 1.9", "certifi", "python-dateutil"]
 
 setup(
-    name="SwaggerPetstore",
-    version="1.0.0",
+    name=NAME,
+    version=VERSION,
     description="Swagger Petstore",
     author_email="apiteam@swagger.io",
     url="",
@@ -30,11 +33,3 @@
 )
 
 
-
-
-
-
-
-
-
-
diff --git a/samples/client/petstore/python/swagger_client.egg-info/PKG-INFO b/samples/client/petstore/python/swagger_client.egg-info/PKG-INFO
new file mode 100644
index 00000000000..d4fe6f978b3
--- /dev/null
+++ b/samples/client/petstore/python/swagger_client.egg-info/PKG-INFO
@@ -0,0 +1,12 @@
+Metadata-Version: 1.0
+Name: swagger-client
+Version: 1.0.0
+Summary: Swagger Petstore
+Home-page: UNKNOWN
+Author: UNKNOWN
+Author-email: apiteam@swagger.io
+License: UNKNOWN
+Description:     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
+            
+Keywords: Swagger,Swagger Petstore
+Platform: UNKNOWN
diff --git a/samples/client/petstore/python/swagger_client.egg-info/SOURCES.txt b/samples/client/petstore/python/swagger_client.egg-info/SOURCES.txt
new file mode 100644
index 00000000000..a7d91c0b8ce
--- /dev/null
+++ b/samples/client/petstore/python/swagger_client.egg-info/SOURCES.txt
@@ -0,0 +1,29 @@
+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.egg-info/dependency_links.txt b/samples/client/petstore/python/swagger_client.egg-info/dependency_links.txt
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/samples/client/petstore/python/swagger_client.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/samples/client/petstore/python/swagger_client.egg-info/requires.txt b/samples/client/petstore/python/swagger_client.egg-info/requires.txt
new file mode 100644
index 00000000000..367a059209f
--- /dev/null
+++ b/samples/client/petstore/python/swagger_client.egg-info/requires.txt
@@ -0,0 +1,4 @@
+urllib3 >= 1.10
+six >= 1.9
+certifi
+python-dateutil
diff --git a/samples/client/petstore/python/swagger_client.egg-info/top_level.txt b/samples/client/petstore/python/swagger_client.egg-info/top_level.txt
new file mode 100644
index 00000000000..9a02a75c058
--- /dev/null
+++ b/samples/client/petstore/python/swagger_client.egg-info/top_level.txt
@@ -0,0 +1,2 @@
+swagger_client
+tests
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/__init__.py b/samples/client/petstore/python/swagger_client/__init__.py
similarity index 84%
rename from samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/__init__.py
rename to samples/client/petstore/python/swagger_client/__init__.py
index 30e93608274..f61c5d55262 100644
--- a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/__init__.py
+++ b/samples/client/petstore/python/swagger_client/__init__.py
@@ -9,8 +9,12 @@
 
 # import apis into sdk package
 from .apis.user_api import UserApi
-from .apis.store_api import StoreApi
 from .apis.pet_api import PetApi
+from .apis.store_api import StoreApi
 
 # import ApiClient
 from .api_client import ApiClient
+
+from .configuration import Configuration
+
+configuration = Configuration()
diff --git a/samples/client/petstore/python/swagger_client/api_client.py b/samples/client/petstore/python/swagger_client/api_client.py
new file mode 100644
index 00000000000..1030bf9a838
--- /dev/null
+++ b/samples/client/petstore/python/swagger_client/api_client.py
@@ -0,0 +1,563 @@
+# coding: utf-8
+
+"""
+Copyright 2015 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 __future__ import absolute_import
+from . import models
+from .rest import RESTClientObject
+from .rest import ApiException
+
+import os
+import re
+import urllib
+import json
+import mimetypes
+import random
+import tempfile
+import threading
+
+from datetime import datetime
+from datetime import date
+
+# python 2 and python 3 compatibility library
+from six import iteritems
+
+try:
+    # for python3
+    from urllib.parse import quote
+except ImportError:
+    # for python2
+    from urllib import quote
+
+from .configuration import Configuration
+
+
+class ApiClient(object):
+    """
+    Generic API client for Swagger client library builds.
+
+    Swagger generic API client. This client handles the client-
+    server communication, and is invariant across implementations. Specifics of
+    the methods and models for each application are generated from the Swagger
+    templates.
+
+    NOTE: This class is auto generated by the swagger code generator program.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    Do not edit the class manually.
+
+    :param host: The base path for the server to call.
+    :param header_name: a header to pass when making calls to the API.
+    :param header_value: a header value to pass when making calls to the API.
+    """
+    def __init__(self, host=Configuration().host,
+                 header_name=None, header_value=None, cookie=None):
+
+        """
+        Constructor of the class.
+        """
+        self.rest_client = RESTClientObject()
+        self.default_headers = {}
+        if header_name is not None:
+            self.default_headers[header_name] = header_value
+        self.host = host
+        self.cookie = cookie
+        # Set default User-Agent.
+        self.user_agent = 'Python-Swagger/1.0.0'
+
+    @property
+    def user_agent(self):
+        """
+        Gets user agent.
+        """
+        return self.default_headers['User-Agent']
+
+    @user_agent.setter
+    def user_agent(self, value):
+        """
+        Sets user agent.
+        """
+        self.default_headers['User-Agent'] = value
+
+    def set_default_header(self, header_name, header_value):
+        self.default_headers[header_name] = header_value
+
+    def __call_api(self, resource_path, method,
+                   path_params=None, query_params=None, header_params=None,
+                   body=None, post_params=None, files=None,
+                   response_type=None, auth_settings=None, callback=None):
+
+        # headers parameters
+        header_params = header_params or {}
+        header_params.update(self.default_headers)
+        if self.cookie:
+            header_params['Cookie'] = self.cookie
+        if header_params:
+            header_params = self.sanitize_for_serialization(header_params)
+
+        # path parameters
+        if path_params:
+            path_params = self.sanitize_for_serialization(path_params)
+            for k, v in iteritems(path_params):
+                replacement = quote(str(self.to_path_value(v)))
+                resource_path = resource_path.\
+                    replace('{' + k + '}', replacement)
+
+        # query parameters
+        if query_params:
+            query_params = self.sanitize_for_serialization(query_params)
+            query_params = {k: self.to_path_value(v)
+                            for k, v in iteritems(query_params)}
+
+        # post parameters
+        if post_params:
+            post_params = self.prepare_post_parameters(post_params, files)
+            post_params = self.sanitize_for_serialization(post_params)
+
+        # auth setting
+        self.update_params_for_auth(header_params, query_params, auth_settings)
+
+        # body
+        if body:
+            body = self.sanitize_for_serialization(body)
+
+        # request url
+        url = self.host + resource_path
+
+        # perform request and return response
+        response_data = self.request(method, url,
+                                     query_params=query_params,
+                                     headers=header_params,
+                                     post_params=post_params, body=body)
+
+        self.last_response = response_data
+
+        # deserialize response data
+        if response_type:
+            deserialized_data = self.deserialize(response_data, response_type)
+        else:
+            deserialized_data = None
+
+        if callback:
+            callback(deserialized_data)
+        else:
+            return deserialized_data
+
+    def to_path_value(self, obj):
+        """
+        Takes value and turn it into a string suitable for inclusion in
+        the path, by url-encoding.
+
+        :param obj: object or string value.
+
+        :return string: quoted value.
+        """
+        if type(obj) == list:
+            return ','.join(obj)
+        else:
+            return str(obj)
+
+    def sanitize_for_serialization(self, obj):
+        """
+        Builds a JSON POST object.
+
+        If obj is None, return None.
+        If obj is str, int, float, bool, return directly.
+        If obj is datetime.datetime, datetime.date
+            convert to string in iso8601 format.
+        If obj is list, santize each element in the list.
+        If obj is dict, return the dict.
+        If obj is swagger model, return the properties dict.
+
+        :param obj: The data to serialize.
+        :return: The serialized form of data.
+        """
+        if isinstance(obj, type(None)):
+            return None
+        elif isinstance(obj, (str, int, float, bool, tuple)):
+            return obj
+        elif isinstance(obj, list):
+            return [self.sanitize_for_serialization(sub_obj)
+                    for sub_obj in obj]
+        elif isinstance(obj, (datetime, date)):
+            return obj.isoformat()
+        else:
+            if isinstance(obj, dict):
+                obj_dict = obj
+            else:
+                # Convert model obj to dict except
+                # attributes `swagger_types`, `attribute_map`
+                # and attributes which value is not None.
+                # Convert attribute name to json key in
+                # model definition for request.
+                obj_dict = {obj.attribute_map[attr]: getattr(obj, attr)
+                            for attr, _ in iteritems(obj.swagger_types)
+                            if getattr(obj, attr) is not None}
+
+            return {key: self.sanitize_for_serialization(val)
+                    for key, val in iteritems(obj_dict)}
+
+    def deserialize(self, response, response_type):
+        """
+        Deserializes response into an object.
+
+        :param response: RESTResponse object to be deserialized.
+        :param response_type: class literal for
+            deserialzied object, or string of class name.
+
+        :return: deserialized object.
+        """
+        # handle file downloading
+        # save response body into a tmp file and return the instance
+        if "file" == response_type:
+            return self.__deserialize_file(response)
+
+        # fetch data from response object
+        try:
+            data = json.loads(response.data)
+        except ValueError:
+            data = response.data
+
+        return self.__deserialize(data, response_type)
+
+    def __deserialize(self, data, klass):
+        """
+        Deserializes dict, list, str into an object.
+
+        :param data: dict, list or str.
+        :param klass: class literal, or string of class name.
+
+        :return: object.
+        """
+        if data is None:
+            return None
+
+        if type(klass) == str:
+            if klass.startswith('list['):
+                sub_kls = re.match('list\[(.*)\]', klass).group(1)
+                return [self.__deserialize(sub_data, sub_kls)
+                        for sub_data in data]
+
+            if klass.startswith('dict('):
+                sub_kls = re.match('dict\(([^,]*), (.*)\)', klass).group(2)
+                return {k: self.__deserialize(v, sub_kls)
+                        for k, v in iteritems(data)}
+
+            # convert str to class
+            # for native types
+            if klass in ['int', 'float', 'str', 'bool',
+                         "date", 'datetime', "object"]:
+                klass = eval(klass)
+            # for model types
+            else:
+                klass = eval('models.' + klass)
+
+        if klass in [int, float, str, bool]:
+            return self.__deserialize_primitive(data, klass)
+        elif klass == object:
+            return self.__deserialize_object()
+        elif klass == date:
+            return self.__deserialize_date(data)
+        elif klass == datetime:
+            return self.__deserialize_datatime(data)
+        else:
+            return self.__deserialize_model(data, klass)
+
+    def call_api(self, resource_path, method,
+                 path_params=None, query_params=None, header_params=None,
+                 body=None, post_params=None, files=None,
+                 response_type=None, auth_settings=None, callback=None):
+        """
+        Makes the HTTP request (synchronous) and return the deserialized data.
+        To make an async request, define a function for callback.
+
+        :param resource_path: Path to method endpoint.
+        :param method: Method to call.
+        :param path_params: Path parameters in the url.
+        :param query_params: Query parameters in the url.
+        :param header_params: Header parameters to be
+            placed in the request header.
+        :param body: Request body.
+        :param post_params dict: Request post form parameters,
+            for `application/x-www-form-urlencoded`, `multipart/form-data`.
+        :param auth_settings list: Auth Settings names for the request.
+        :param response: Response data type.
+        :param files dict: key -> filename, value -> filepath,
+            for `multipart/form-data`.
+        :param callback function: Callback function for asynchronous request.
+            If provide this parameter,
+            the request will be called asynchronously.
+        :return:
+            If provide parameter callback,
+            the request will be called asynchronously.
+            The method will return the request thread.
+            If parameter callback is None,
+            then the method will return the response directly.
+        """
+        if callback is None:
+            return self.__call_api(resource_path, method,
+                                   path_params, query_params, header_params,
+                                   body, post_params, files,
+                                   response_type, auth_settings, callback)
+        else:
+            thread = threading.Thread(target=self.__call_api,
+                                      args=(resource_path, method,
+                                            path_params, query_params,
+                                            header_params, body,
+                                            post_params, files,
+                                            response_type, auth_settings,
+                                            callback))
+        thread.start()
+        return thread
+
+    def request(self, method, url, query_params=None, headers=None,
+                post_params=None, body=None):
+        """
+        Makes the HTTP request using RESTClient.
+        """
+        if method == "GET":
+            return self.rest_client.GET(url,
+                                        query_params=query_params,
+                                        headers=headers)
+        elif method == "HEAD":
+            return self.rest_client.HEAD(url,
+                                         query_params=query_params,
+                                         headers=headers)
+        elif method == "POST":
+            return self.rest_client.POST(url,
+                                         query_params=query_params,
+                                         headers=headers,
+                                         post_params=post_params,
+                                         body=body)
+        elif method == "PUT":
+            return self.rest_client.PUT(url,
+                                        query_params=query_params,
+                                        headers=headers,
+                                        post_params=post_params,
+                                        body=body)
+        elif method == "PATCH":
+            return self.rest_client.PATCH(url,
+                                          query_params=query_params,
+                                          headers=headers,
+                                          post_params=post_params,
+                                          body=body)
+        elif method == "DELETE":
+            return self.rest_client.DELETE(url,
+                                           query_params=query_params,
+                                           headers=headers)
+        else:
+            raise ValueError(
+                "http method must be `GET`, `HEAD`,"
+                " `POST`, `PATCH`, `PUT` or `DELETE`."
+            )
+
+    def prepare_post_parameters(self, post_params=None, files=None):
+        """
+        Builds form parameters.
+
+        :param post_params: Normal form parameters.
+        :param files: File parameters.
+        :return: Form parameters with files.
+        """
+        params = {}
+
+        if post_params:
+            params.update(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])
+
+        return params
+
+    def select_header_accept(self, accepts):
+        """
+        Returns `Accept` based on an array of accepts provided.
+
+        :param accepts: List of headers.
+        :return: Accept (e.g. application/json).
+        """
+        if not accepts:
+            return
+
+        accepts = list(map(lambda x: x.lower(), accepts))
+
+        if 'application/json' in accepts:
+            return 'application/json'
+        else:
+            return ', '.join(accepts)
+
+    def select_header_content_type(self, content_types):
+        """
+        Returns `Content-Type` based on an array of content_types provided.
+
+        :param content_types: List of content-types.
+        :return: Content-Type (e.g. application/json).
+        """
+        if not content_types:
+            return 'application/json'
+
+        content_types = list(map(lambda x: x.lower(), content_types))
+
+        if 'application/json' in content_types:
+            return 'application/json'
+        else:
+            return content_types[0]
+
+    def update_params_for_auth(self, headers, querys, auth_settings):
+        """
+        Updates header and query params based on authentication setting.
+
+        :param headers: Header parameters dict to be updated.
+        :param querys: Query parameters dict to be updated.
+        :param auth_settings: Authentication setting identifiers list.
+        """
+        config = Configuration()
+
+        if not auth_settings:
+            return
+
+        for auth in auth_settings:
+            auth_setting = config.auth_settings().get(auth)
+            if auth_setting:
+                if auth_setting['in'] == 'header':
+                    headers[auth_setting['key']] = auth_setting['value']
+                elif auth_setting['in'] == 'query':
+                    querys[auth_setting['key']] = auth_setting['value']
+                else:
+                    raise ValueError(
+                        'Authentication token must be in `query` or `header`'
+                    )
+
+    def __deserialize_file(self, response):
+        """
+        Saves response body into a file in a temporary folder,
+        using the filename from the `Content-Disposition` header if provided.
+
+        :param response:  RESTResponse.
+        :return: file path.
+        """
+        config = Configuration()
+
+        fd, path = tempfile.mkstemp(dir=config.temp_folder_path)
+        os.close(fd)
+        os.remove(path)
+
+        content_disposition = response.getheader("Content-Disposition")
+        if content_disposition:
+            filename = re.\
+                search(r'filename=[\'"]?([^\'"\s]+)[\'"]?', content_disposition).\
+                group(1)
+            path = os.path.join(os.path.dirname(path), filename)
+
+        with open(path, "w") as f:
+            f.write(response.data)
+
+        return path
+
+    def __deserialize_primitive(self, data, klass):
+        """
+        Deserializes string to primitive type.
+
+        :param data: str.
+        :param klass: class literal.
+
+        :return: int, float, str, bool.
+        """
+        try:
+            value = klass(data)
+        except UnicodeEncodeError:
+            value = unicode(data)
+        except TypeError:
+            value = data
+        return value
+
+    def __deserialize_object(self):
+        """
+        Deserializes empty object.
+
+        :return: object.
+        """
+        return object()
+
+    def __deserialize_date(self, string):
+        """
+        Deserializes string to date.
+
+        :param string: str.
+        :return: date.
+        """
+        try:
+            from dateutil.parser import parse
+            return parse(string).date()
+        except ImportError:
+            return string
+        except ValueError:
+            raise ApiException(
+                status=0,
+                reason="Failed to parse `{0}` into a date object"
+                .format(string)
+            )
+
+    def __deserialize_datatime(self, string):
+        """
+        Deserializes string to datetime.
+
+        The string should be in iso8601 datetime format.
+
+        :param string: str.
+        :return: datetime.
+        """
+        try:
+            from dateutil.parser import parse
+            return parse(string)
+        except ImportError:
+            return string
+        except ValueError:
+            raise ApiException(
+                status=0,
+                reason="Failed to parse `{0}` into a datetime object".
+                format(string)
+            )
+
+    def __deserialize_model(self, data, klass):
+        """
+        Deserializes list or dict to model.
+
+        :param data: dict, list.
+        :param klass: class literal.
+        :return: model object.
+        """
+        instance = klass()
+
+        for attr, attr_type in iteritems(instance.swagger_types):
+            if data is not None \
+               and instance.attribute_map[attr] in data\
+               and isinstance(data, (list, dict)):
+                value = data[instance.attribute_map[attr]]
+                setattr(instance, attr, self.__deserialize(value, attr_type))
+
+        return instance
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/apis/__init__.py b/samples/client/petstore/python/swagger_client/apis/__init__.py
similarity index 99%
rename from samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/apis/__init__.py
rename to samples/client/petstore/python/swagger_client/apis/__init__.py
index 67ab226c734..592a56e282d 100644
--- a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/apis/__init__.py
+++ b/samples/client/petstore/python/swagger_client/apis/__init__.py
@@ -2,6 +2,5 @@
 
 # import apis into api package
 from .user_api import UserApi
-from .store_api import StoreApi
 from .pet_api import PetApi
-
+from .store_api import StoreApi
diff --git a/samples/client/petstore/python/swagger_client/apis/pet_api.py b/samples/client/petstore/python/swagger_client/apis/pet_api.py
new file mode 100644
index 00000000000..ad053a7d72d
--- /dev/null
+++ b/samples/client/petstore/python/swagger_client/apis/pet_api.py
@@ -0,0 +1,673 @@
+# coding: utf-8
+
+"""
+PetApi.py
+Copyright 2015 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.
+"""
+
+from __future__ import absolute_import
+
+import sys
+import os
+
+# python 2 and python 3 compatibility library
+from six import iteritems
+
+from ..configuration import Configuration
+from ..api_client import ApiClient
+
+
+class PetApi(object):
+    """
+    NOTE: This class is auto generated by the swagger code generator program.
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        config = Configuration()
+        if api_client:
+            self.api_client = api_client
+        else:
+            if not config.api_client:
+                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
+        
+
+        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.add_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 add_pet" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        resource_path = '/pet'.replace('{format}', 'json')
+        method = 'POST'
+
+        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 find_pets_by_status(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.
+        """
+        # verify the required parameter 'pet_id' is set
+        if pet_id is None:
+            raise ValueError("Missing the required parameter `pet_id` when calling `get_pet_by_id`")
+
+        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']
+
+        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', '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='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
+        
+
+        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.
+        """
+        # verify the required parameter 'pet_id' is set
+        if pet_id is None:
+            raise ValueError("Missing the required parameter `pet_id` when calling `update_pet_with_form`")
+
+        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']
+
+        resource_path = '/pet/{petId}'.replace('{format}', 'json')
+        method = 'POST'
+
+        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']
+
+        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, 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 delete_pet(self, pet_id, **kwargs):
+        """
+        Deletes a 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.delete_pet(pet_id, callback=callback_function)
+
+        :param callback function: The callback function
+            for asynchronous request. (optional)
+        :param int pet_id: Pet id to delete (required)
+        :param str api_key: 
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        # verify the required parameter 'pet_id' is set
+        if pet_id is None:
+            raise ValueError("Missing the required parameter `pet_id` when calling `delete_pet`")
+
+        all_params = ['pet_id', 'api_key']
+        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_pet" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        resource_path = '/pet/{petId}'.replace('{format}', 'json')
+        method = 'DELETE'
+
+        path_params = {}
+        if 'pet_id' in params:
+            path_params['petId'] = params['pet_id']
+
+        query_params = {}
+
+        header_params = {}
+        if 'api_key' in params:
+            header_params['api_key'] = params['api_key']
+
+        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=None,
+                                            auth_settings=auth_settings,
+                                            callback=params.get('callback'))
+        return response
+
+    def upload_file(self, pet_id, **kwargs):
+        """
+        uploads an image
+        
+
+        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.upload_file(pet_id, callback=callback_function)
+
+        :param callback function: The callback function
+            for asynchronous request. (optional)
+        :param int pet_id: ID of pet to update (required)
+        :param str additional_metadata: Additional data to pass to server
+        :param file file: file to upload
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        # verify the required parameter 'pet_id' is set
+        if pet_id is None:
+            raise ValueError("Missing the required parameter `pet_id` when calling `upload_file`")
+
+        all_params = ['pet_id', 'additional_metadata', 'file']
+        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 upload_file" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        resource_path = '/pet/{petId}/uploadImage'.replace('{format}', 'json')
+        method = 'POST'
+
+        path_params = {}
+        if 'pet_id' in params:
+            path_params['petId'] = params['pet_id']
+
+        query_params = {}
+
+        header_params = {}
+
+        form_params = {}
+        files = {}
+        if 'additional_metadata' in params:
+            form_params['additionalMetadata'] = params['additional_metadata']
+        if 'file' in params:
+            files['file'] = params['file']
+
+        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(['multipart/form-data'])
+
+        # 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
diff --git a/samples/client/petstore/python/swagger_client/apis/store_api.py b/samples/client/petstore/python/swagger_client/apis/store_api.py
new file mode 100644
index 00000000000..9e08a0b2f47
--- /dev/null
+++ b/samples/client/petstore/python/swagger_client/apis/store_api.py
@@ -0,0 +1,349 @@
+# coding: utf-8
+
+"""
+StoreApi.py
+Copyright 2015 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.
+"""
+
+from __future__ import absolute_import
+
+import sys
+import os
+
+# python 2 and python 3 compatibility library
+from six import iteritems
+
+from ..configuration import Configuration
+from ..api_client import ApiClient
+
+
+class StoreApi(object):
+    """
+    NOTE: This class is auto generated by the swagger code generator program.
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        config = Configuration()
+        if api_client:
+            self.api_client = api_client
+        else:
+            if not config.api_client:
+                config.api_client = ApiClient()
+            self.api_client = config.api_client
+
+    def get_inventory(self, **kwargs):
+        """
+        Returns pet inventories by status
+        Returns 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
+        to be invoked when receiving the response.
+        >>> def callback_function(response):
+        >>>     pprint(response)
+        >>>
+        >>> thread = api.get_inventory(callback=callback_function)
+
+        :param callback function: The callback function
+            for asynchronous request. (optional)
+        :return: dict(str, int)
+                 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 get_inventory" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        resource_path = '/store/inventory'.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 = ['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='dict(str, int)',
+                                            auth_settings=auth_settings,
+                                            callback=params.get('callback'))
+        return response
+
+    def place_order(self, **kwargs):
+        """
+        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
+        to be invoked when receiving the response.
+        >>> def callback_function(response):
+        >>>     pprint(response)
+        >>>
+        >>> thread = api.place_order(callback=callback_function)
+
+        :param callback function: The callback function
+            for asynchronous request. (optional)
+        :param Order body: order placed for purchasing the pet
+        :return: Order
+                 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 place_order" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        resource_path = '/store/order'.replace('{format}', 'json')
+        method = 'POST'
+
+        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([])
+
+        # 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='Order',
+                                            auth_settings=auth_settings,
+                                            callback=params.get('callback'))
+        return response
+
+    def get_order_by_id(self, order_id, **kwargs):
+        """
+        Find purchase order by ID
+        For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+
+        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_order_by_id(order_id, callback=callback_function)
+
+        :param callback function: The callback function
+            for asynchronous request. (optional)
+        :param str order_id: ID of pet that needs to be fetched (required)
+        :return: Order
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        # verify the required parameter 'order_id' is set
+        if order_id is None:
+            raise ValueError("Missing the required parameter `order_id` when calling `get_order_by_id`")
+
+        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 get_order_by_id" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        resource_path = '/store/order/{orderId}'.replace('{format}', 'json')
+        method = 'GET'
+
+        path_params = {}
+        if 'order_id' in params:
+            path_params['orderId'] = params['order_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 = []
+
+        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='Order',
+                                            auth_settings=auth_settings,
+                                            callback=params.get('callback'))
+        return response
+
+    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.
+        """
+        # verify the required parameter 'order_id' is set
+        if order_id is None:
+            raise ValueError("Missing the required parameter `order_id` when calling `delete_order`")
+
+        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']
+
+        resource_path = '/store/order/{orderId}'.replace('{format}', 'json')
+        method = 'DELETE'
+
+        path_params = {}
+        if 'order_id' in params:
+            path_params['orderId'] = params['order_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 = []
+
+        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
diff --git a/samples/client/petstore/python/swagger_client/apis/user_api.py b/samples/client/petstore/python/swagger_client/apis/user_api.py
new file mode 100644
index 00000000000..1c96e1e923e
--- /dev/null
+++ b/samples/client/petstore/python/swagger_client/apis/user_api.py
@@ -0,0 +1,658 @@
+# coding: utf-8
+
+"""
+UserApi.py
+Copyright 2015 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.
+"""
+
+from __future__ import absolute_import
+
+import sys
+import os
+
+# python 2 and python 3 compatibility library
+from six import iteritems
+
+from ..configuration import Configuration
+from ..api_client import ApiClient
+
+
+class UserApi(object):
+    """
+    NOTE: This class is auto generated by the swagger code generator program.
+    Do not edit the class manually.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    """
+
+    def __init__(self, api_client=None):
+        config = Configuration()
+        if api_client:
+            self.api_client = api_client
+        else:
+            if not config.api_client:
+                config.api_client = ApiClient()
+            self.api_client = config.api_client
+
+    def create_user(self, **kwargs):
+        """
+        Create 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.create_user(callback=callback_function)
+
+        :param callback function: The callback function
+            for asynchronous request. (optional)
+        :param User body: Created user object
+        :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 create_user" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        resource_path = '/user'.replace('{format}', 'json')
+        method = 'POST'
+
+        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([])
+
+        # 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 create_users_with_array_input(self, **kwargs):
+        """
+        Creates list of users with given input array
+        
+
+        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.create_users_with_array_input(callback=callback_function)
+
+        :param callback function: The callback function
+            for asynchronous request. (optional)
+        :param list[User] body: List of user object
+        :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 create_users_with_array_input" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        resource_path = '/user/createWithArray'.replace('{format}', 'json')
+        method = 'POST'
+
+        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([])
+
+        # 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 create_users_with_list_input(self, **kwargs):
+        """
+        Creates list of users with given input array
+        
+
+        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.create_users_with_list_input(callback=callback_function)
+
+        :param callback function: The callback function
+            for asynchronous request. (optional)
+        :param list[User] body: List of user object
+        :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 create_users_with_list_input" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        resource_path = '/user/createWithList'.replace('{format}', 'json')
+        method = 'POST'
+
+        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([])
+
+        # 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 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.
+        """
+        # verify the required parameter 'username' is set
+        if username is None:
+            raise ValueError("Missing the required parameter `username` when calling `get_user_by_name`")
+
+        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']
+
+        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.
+        """
+        # verify the required parameter 'username' is set
+        if username is None:
+            raise ValueError("Missing the required parameter `username` when calling `update_user`")
+
+        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']
+
+        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,
+                                            response_type=None,
+                                            auth_settings=auth_settings,
+                                            callback=params.get('callback'))
+        return response
+
+    def delete_user(self, username, **kwargs):
+        """
+        Delete 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.delete_user(username, callback=callback_function)
+
+        :param callback function: The callback function
+            for asynchronous request. (optional)
+        :param str username: The name that needs to be deleted (required)
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        # verify the required parameter 'username' is set
+        if username is None:
+            raise ValueError("Missing the required parameter `username` when calling `delete_user`")
+
+        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 delete_user" % key
+                )
+            params[key] = val
+        del params['kwargs']
+
+        resource_path = '/user/{username}'.replace('{format}', 'json')
+        method = 'DELETE'
+
+        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=None,
+                                            auth_settings=auth_settings,
+                                            callback=params.get('callback'))
+        return response
diff --git a/samples/client/petstore/python/swagger_client/configuration.py b/samples/client/petstore/python/swagger_client/configuration.py
new file mode 100644
index 00000000000..4ca9342c057
--- /dev/null
+++ b/samples/client/petstore/python/swagger_client/configuration.py
@@ -0,0 +1,184 @@
+# coding: utf-8
+
+"""
+Copyright 2015 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 __future__ import absolute_import
+import base64
+import urllib3
+
+try:
+    import httplib
+except ImportError:
+    # for python3
+    import http.client as httplib
+    
+import sys
+import logging
+
+
+def singleton(cls, *args, **kw):
+    instances = {}
+
+    def _singleton():
+        if cls not in instances:
+            instances[cls] = cls(*args, **kw)
+        return instances[cls]
+    return _singleton
+
+
+@singleton
+class Configuration(object):
+    """
+    NOTE: This class is auto generated by the swagger code generator program.
+    Ref: https://github.com/swagger-api/swagger-codegen
+    Do not edit the class manually.
+    """
+
+    def __init__(self):
+        """
+        Constructor
+        """
+        # Default Base url
+        self.host = "http://petstore.swagger.io/v2"
+        # Default api client
+        self.api_client = None
+        # Temp file folder for downloading files
+        self.temp_folder_path = None
+
+        # Authentication Settings
+        # dict to store API key(s)
+        self.api_key = {}
+        # dict to store API prefix (e.g. Bearer)
+        self.api_key_prefix = {}
+        # Username for HTTP basic authentication
+        self.username = ""
+        # Password for HTTP basic authentication
+        self.password = ""
+
+        # Logging Settings
+        self.logging_format = '%(asctime)s %(levelname)s %(message)s'
+        # Debug file location
+        self.__logging_file = None
+        # Debug switch
+        self.__debug = False
+        self.init_logger()
+
+        # SSL/TLS verification
+        # Set this to false to skip verifying SSL certificate when calling API from https server.
+        self.verify_ssl = True
+        # Set this to customize the certificate file to verify the peer.
+        self.ssl_ca_cert = None
+        
+    def init_logger(self):
+        """
+        Initializes logger settings.
+        """
+        self.logger = logging.getLogger()
+        formatter = logging.Formatter(self.logging_format)
+        stream_handler = logging.StreamHandler()
+        stream_handler.setFormatter(formatter)
+        self.logger.addHandler(stream_handler)
+        if self.__debug:
+            self.logger.setLevel(logging.DEBUG)
+        else:
+            self.logger.setLevel(logging.WARNING)
+        if self.__logging_file:
+            file_handler = logging.FileHandler(self.__logging_file)
+            file_handler.setFormatter(formatter)
+            self.logger.addFilter(file_handler)
+
+    @property
+    def logging_file(self):
+        return self.__logging_file
+
+    @logging_file.setter
+    def logging_file(self, value):
+        self.__logging_file = value
+        if self.__logging_file:
+            formater = logging.Formatter(self.logging_format)
+            file_handler = logging.FileHandler(self.__logging_file)
+            file_handler.setFormatter(formater)
+            self.logger.addHandler(file_handler)
+
+    @property
+    def debug(self):
+        return self.__debug
+
+    @debug.setter
+    def debug(self, value):
+        self.__debug = value
+        if self.__debug:
+            # if debug status is True, turn on debug logging
+            self.logger.setLevel(logging.DEBUG)
+            # turn on httplib debug
+            httplib.HTTPConnection.debuglevel = 1
+        else:
+            # if debug status is False, turn off debug logging,
+            # setting log level to default `logging.WARNING`
+            self.logger.setLevel(logging.WARNING)
+
+    def get_api_key_with_prefix(self, identifier):
+        """
+        Gets API key (with prefix if set).
+
+        :param identifier: The identifier of apiKey.
+        :return: The token for api key authentication.
+        """
+        if self.api_key.get(identifier) and self.api_key_prefix.get(identifier):
+            return self.api_key_prefix[identifier] + ' ' + self.api_key[identifier]
+        elif self.api_key.get(identifier):
+            return self.api_key[identifier]
+
+    def get_basic_auth_token(self):
+        """
+        Gets HTTP basic authentication header (string).
+
+        :return: The token for basic HTTP authentication.
+        """
+        return urllib3.util.make_headers(basic_auth=self.username + ':' + self.password)\
+                           .get('authorization')
+
+    def auth_settings(self):
+        """
+        Gets Auth Settings dict for api client.
+
+        :return: The Auth Settings information dict.
+        """
+        return {
+            'api_key':
+                {
+                    'type': 'api_key',
+                    'in': 'header',
+                    'key': 'api_key',
+                    'value': self.get_api_key_with_prefix('api_key')
+                },
+        }
+
+    def to_debug_report(self):
+        """
+        Gets the essential information for debugging.
+
+        :return: The report for debugging.
+        """
+        return "Python SDK Debug Report:\n"\
+               "OS: {env}\n"\
+               "Python Version: {pyversion}\n"\
+               "Version of the API: 1.0.0\n"\
+               "SDK Package Version: 1.0.0".\
+               format(env=sys.platform, pyversion=sys.version)
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/__init__.py b/samples/client/petstore/python/swagger_client/models/__init__.py
similarity index 99%
rename from samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/__init__.py
rename to samples/client/petstore/python/swagger_client/models/__init__.py
index de307a26503..236f10e934a 100644
--- a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/__init__.py
+++ b/samples/client/petstore/python/swagger_client/models/__init__.py
@@ -6,4 +6,3 @@
 from .pet import Pet
 from .tag import Tag
 from .order import Order
-
diff --git a/samples/client/petstore/python/swagger_client/models/category.py b/samples/client/petstore/python/swagger_client/models/category.py
new file mode 100644
index 00000000000..06ad3b8421f
--- /dev/null
+++ b/samples/client/petstore/python/swagger_client/models/category.py
@@ -0,0 +1,126 @@
+# coding: utf-8
+
+"""
+Copyright 2015 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 Category(object):
+    """
+    NOTE: This class is auto generated by the swagger code generator program.
+    Do not edit the class manually.
+    """
+    def __init__(self):
+        """
+        Category - 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 = {
+            'id': 'int',
+            'name': 'str'
+        }
+
+        self.attribute_map = {
+            'id': 'id',
+            'name': 'name'
+        }
+
+        self._id = None
+        self._name = None
+
+    @property
+    def id(self):
+        """
+        Gets the id of this Category.
+
+
+        :return: The id of this Category.
+        :rtype: int
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """
+        Sets the id of this Category.
+
+
+        :param id: The id of this Category.
+        :type: int
+        """
+        self._id = id
+
+    @property
+    def name(self):
+        """
+        Gets the name of this Category.
+
+
+        :return: The name of this Category.
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """
+        Sets the name of this Category.
+
+
+        :param name: The name of this Category.
+        :type: str
+        """
+        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()
+            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()
diff --git a/samples/client/petstore/python/swagger_client/models/order.py b/samples/client/petstore/python/swagger_client/models/order.py
new file mode 100644
index 00000000000..40e4504de87
--- /dev/null
+++ b/samples/client/petstore/python/swagger_client/models/order.py
@@ -0,0 +1,232 @@
+# coding: utf-8
+
+"""
+Copyright 2015 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 Order(object):
+    """
+    NOTE: This class is auto generated by the swagger code generator program.
+    Do not edit the class manually.
+    """
+    def __init__(self):
+        """
+        Order - 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 = {
+            'id': 'int',
+            'pet_id': 'int',
+            'quantity': 'int',
+            'ship_date': 'datetime',
+            'status': 'str',
+            'complete': 'bool'
+        }
+
+        self.attribute_map = {
+            'id': 'id',
+            'pet_id': 'petId',
+            'quantity': 'quantity',
+            'ship_date': 'shipDate',
+            'status': 'status',
+            'complete': 'complete'
+        }
+
+        self._id = None
+        self._pet_id = None
+        self._quantity = None
+        self._ship_date = None
+        self._status = None
+        self._complete = None
+
+    @property
+    def id(self):
+        """
+        Gets the id of this Order.
+
+
+        :return: The id of this Order.
+        :rtype: int
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """
+        Sets the id of this Order.
+
+
+        :param id: The id of this Order.
+        :type: int
+        """
+        self._id = id
+
+    @property
+    def pet_id(self):
+        """
+        Gets the pet_id of this Order.
+
+
+        :return: The pet_id of this Order.
+        :rtype: int
+        """
+        return self._pet_id
+
+    @pet_id.setter
+    def pet_id(self, pet_id):
+        """
+        Sets the pet_id of this Order.
+
+
+        :param pet_id: The pet_id of this Order.
+        :type: int
+        """
+        self._pet_id = pet_id
+
+    @property
+    def quantity(self):
+        """
+        Gets the quantity of this Order.
+
+
+        :return: The quantity of this Order.
+        :rtype: int
+        """
+        return self._quantity
+
+    @quantity.setter
+    def quantity(self, quantity):
+        """
+        Sets the quantity of this Order.
+
+
+        :param quantity: The quantity of this Order.
+        :type: int
+        """
+        self._quantity = quantity
+
+    @property
+    def ship_date(self):
+        """
+        Gets the ship_date of this Order.
+
+
+        :return: The ship_date of this Order.
+        :rtype: datetime
+        """
+        return self._ship_date
+
+    @ship_date.setter
+    def ship_date(self, ship_date):
+        """
+        Sets the ship_date of this Order.
+
+
+        :param ship_date: The ship_date of this Order.
+        :type: datetime
+        """
+        self._ship_date = ship_date
+
+    @property
+    def status(self):
+        """
+        Gets the status of this Order.
+        Order Status
+
+        :return: The status of this Order.
+        :rtype: str
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """
+        Sets the status of this Order.
+        Order Status
+
+        :param status: The status of this Order.
+        :type: str
+        """
+        allowed_values = ["placed", "approved", "delivered"]
+        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 complete(self):
+        """
+        Gets the complete of this Order.
+
+
+        :return: The complete of this Order.
+        :rtype: bool
+        """
+        return self._complete
+
+    @complete.setter
+    def complete(self, complete):
+        """
+        Sets the complete of this Order.
+
+
+        :param complete: The complete of this Order.
+        :type: bool
+        """
+        self._complete = complete
+
+    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()
+            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()
diff --git a/samples/client/petstore/python/swagger_client/models/pet.py b/samples/client/petstore/python/swagger_client/models/pet.py
new file mode 100644
index 00000000000..d8700908eb7
--- /dev/null
+++ b/samples/client/petstore/python/swagger_client/models/pet.py
@@ -0,0 +1,232 @@
+# coding: utf-8
+
+"""
+Copyright 2015 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 Pet(object):
+    """
+    NOTE: This class is auto generated by the swagger code generator program.
+    Do not edit the class manually.
+    """
+    def __init__(self):
+        """
+        Pet - 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 = {
+            'id': 'int',
+            'category': 'Category',
+            'name': 'str',
+            'photo_urls': 'list[str]',
+            'tags': 'list[Tag]',
+            'status': 'str'
+        }
+
+        self.attribute_map = {
+            'id': 'id',
+            'category': 'category',
+            'name': 'name',
+            'photo_urls': 'photoUrls',
+            'tags': 'tags',
+            'status': 'status'
+        }
+
+        self._id = None
+        self._category = None
+        self._name = None
+        self._photo_urls = None
+        self._tags = None
+        self._status = None
+
+    @property
+    def id(self):
+        """
+        Gets the id of this Pet.
+
+
+        :return: The id of this Pet.
+        :rtype: int
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """
+        Sets the id of this Pet.
+
+
+        :param id: The id of this Pet.
+        :type: int
+        """
+        self._id = id
+
+    @property
+    def category(self):
+        """
+        Gets the category of this Pet.
+
+
+        :return: The category of this Pet.
+        :rtype: Category
+        """
+        return self._category
+
+    @category.setter
+    def category(self, category):
+        """
+        Sets the category of this Pet.
+
+
+        :param category: The category of this Pet.
+        :type: Category
+        """
+        self._category = category
+
+    @property
+    def name(self):
+        """
+        Gets the name of this Pet.
+
+
+        :return: The name of this Pet.
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """
+        Sets the name of this Pet.
+
+
+        :param name: The name of this Pet.
+        :type: str
+        """
+        self._name = name
+
+    @property
+    def photo_urls(self):
+        """
+        Gets the photo_urls of this Pet.
+
+
+        :return: The photo_urls of this Pet.
+        :rtype: list[str]
+        """
+        return self._photo_urls
+
+    @photo_urls.setter
+    def photo_urls(self, photo_urls):
+        """
+        Sets the photo_urls of this Pet.
+
+
+        :param photo_urls: The photo_urls of this Pet.
+        :type: list[str]
+        """
+        self._photo_urls = photo_urls
+
+    @property
+    def tags(self):
+        """
+        Gets the tags of this Pet.
+
+
+        :return: The tags of this Pet.
+        :rtype: list[Tag]
+        """
+        return self._tags
+
+    @tags.setter
+    def tags(self, tags):
+        """
+        Sets the tags of this Pet.
+
+
+        :param tags: The tags of this Pet.
+        :type: list[Tag]
+        """
+        self._tags = tags
+
+    @property
+    def status(self):
+        """
+        Gets the status of this Pet.
+        pet status in the store
+
+        :return: The status of this Pet.
+        :rtype: str
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """
+        Sets the status of this Pet.
+        pet status in the store
+
+        :param status: The status of this Pet.
+        :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
+
+    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()
+            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()
diff --git a/samples/client/petstore/python/swagger_client/models/tag.py b/samples/client/petstore/python/swagger_client/models/tag.py
new file mode 100644
index 00000000000..262fc10f338
--- /dev/null
+++ b/samples/client/petstore/python/swagger_client/models/tag.py
@@ -0,0 +1,126 @@
+# coding: utf-8
+
+"""
+Copyright 2015 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 Tag(object):
+    """
+    NOTE: This class is auto generated by the swagger code generator program.
+    Do not edit the class manually.
+    """
+    def __init__(self):
+        """
+        Tag - 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 = {
+            'id': 'int',
+            'name': 'str'
+        }
+
+        self.attribute_map = {
+            'id': 'id',
+            'name': 'name'
+        }
+
+        self._id = None
+        self._name = None
+
+    @property
+    def id(self):
+        """
+        Gets the id of this Tag.
+
+
+        :return: The id of this Tag.
+        :rtype: int
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """
+        Sets the id of this Tag.
+
+
+        :param id: The id of this Tag.
+        :type: int
+        """
+        self._id = id
+
+    @property
+    def name(self):
+        """
+        Gets the name of this Tag.
+
+
+        :return: The name of this Tag.
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        """
+        Sets the name of this Tag.
+
+
+        :param name: The name of this Tag.
+        :type: str
+        """
+        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()
+            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()
diff --git a/samples/client/petstore/python/swagger_client/models/user.py b/samples/client/petstore/python/swagger_client/models/user.py
new file mode 100644
index 00000000000..7f74d20f3d3
--- /dev/null
+++ b/samples/client/petstore/python/swagger_client/models/user.py
@@ -0,0 +1,276 @@
+# coding: utf-8
+
+"""
+Copyright 2015 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 User(object):
+    """
+    NOTE: This class is auto generated by the swagger code generator program.
+    Do not edit the class manually.
+    """
+    def __init__(self):
+        """
+        User - 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 = {
+            'id': 'int',
+            'username': 'str',
+            'first_name': 'str',
+            'last_name': 'str',
+            'email': 'str',
+            'password': 'str',
+            'phone': 'str',
+            'user_status': 'int'
+        }
+
+        self.attribute_map = {
+            'id': 'id',
+            'username': 'username',
+            'first_name': 'firstName',
+            'last_name': 'lastName',
+            'email': 'email',
+            'password': 'password',
+            'phone': 'phone',
+            'user_status': 'userStatus'
+        }
+
+        self._id = None
+        self._username = None
+        self._first_name = None
+        self._last_name = None
+        self._email = None
+        self._password = None
+        self._phone = None
+        self._user_status = None
+
+    @property
+    def id(self):
+        """
+        Gets the id of this User.
+
+
+        :return: The id of this User.
+        :rtype: int
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """
+        Sets the id of this User.
+
+
+        :param id: The id of this User.
+        :type: int
+        """
+        self._id = id
+
+    @property
+    def username(self):
+        """
+        Gets the username of this User.
+
+
+        :return: The username of this User.
+        :rtype: str
+        """
+        return self._username
+
+    @username.setter
+    def username(self, username):
+        """
+        Sets the username of this User.
+
+
+        :param username: The username of this User.
+        :type: str
+        """
+        self._username = username
+
+    @property
+    def first_name(self):
+        """
+        Gets the first_name of this User.
+
+
+        :return: The first_name of this User.
+        :rtype: str
+        """
+        return self._first_name
+
+    @first_name.setter
+    def first_name(self, first_name):
+        """
+        Sets the first_name of this User.
+
+
+        :param first_name: The first_name of this User.
+        :type: str
+        """
+        self._first_name = first_name
+
+    @property
+    def last_name(self):
+        """
+        Gets the last_name of this User.
+
+
+        :return: The last_name of this User.
+        :rtype: str
+        """
+        return self._last_name
+
+    @last_name.setter
+    def last_name(self, last_name):
+        """
+        Sets the last_name of this User.
+
+
+        :param last_name: The last_name of this User.
+        :type: str
+        """
+        self._last_name = last_name
+
+    @property
+    def email(self):
+        """
+        Gets the email of this User.
+
+
+        :return: The email of this User.
+        :rtype: str
+        """
+        return self._email
+
+    @email.setter
+    def email(self, email):
+        """
+        Sets the email of this User.
+
+
+        :param email: The email of this User.
+        :type: str
+        """
+        self._email = email
+
+    @property
+    def password(self):
+        """
+        Gets the password of this User.
+
+
+        :return: The password of this User.
+        :rtype: str
+        """
+        return self._password
+
+    @password.setter
+    def password(self, password):
+        """
+        Sets the password of this User.
+
+
+        :param password: The password of this User.
+        :type: str
+        """
+        self._password = password
+
+    @property
+    def phone(self):
+        """
+        Gets the phone of this User.
+
+
+        :return: The phone of this User.
+        :rtype: str
+        """
+        return self._phone
+
+    @phone.setter
+    def phone(self, phone):
+        """
+        Sets the phone of this User.
+
+
+        :param phone: The phone of this User.
+        :type: str
+        """
+        self._phone = phone
+
+    @property
+    def user_status(self):
+        """
+        Gets the user_status of this User.
+        User Status
+
+        :return: The user_status of this User.
+        :rtype: int
+        """
+        return self._user_status
+
+    @user_status.setter
+    def user_status(self, user_status):
+        """
+        Sets the user_status of this User.
+        User Status
+
+        :param user_status: The user_status of this User.
+        :type: int
+        """
+        self._user_status = user_status
+
+    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()
+            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()
diff --git a/samples/client/petstore/python/swagger_client/rest.py b/samples/client/petstore/python/swagger_client/rest.py
new file mode 100644
index 00000000000..1481cbff3d5
--- /dev/null
+++ b/samples/client/petstore/python/swagger_client/rest.py
@@ -0,0 +1,247 @@
+# coding: utf-8
+
+"""
+Copyright 2015 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.
+
+Credit: this file (rest.py) is modified based on rest.py in Dropbox Python SDK:
+https://www.dropbox.com/developers/core/sdks/python
+"""
+from __future__ import absolute_import
+
+import sys
+import io
+import json
+import ssl
+import certifi
+import logging
+
+# python 2 and python 3 compatibility library
+from six import iteritems
+
+from .configuration import Configuration
+
+try:
+    import urllib3
+except ImportError:
+    raise ImportError('Swagger python client requires urllib3.')
+
+try:
+    # for python3
+    from urllib.parse import urlencode
+except ImportError:
+    # for python2
+    from urllib import urlencode
+
+
+logger = logging.getLogger(__name__)
+
+
+class RESTResponse(io.IOBase):
+
+    def __init__(self, resp):
+        self.urllib3_response = resp
+        self.status = resp.status
+        self.reason = resp.reason
+        self.data = resp.data
+
+    def getheaders(self):
+        """
+        Returns a dictionary of the response headers.
+        """
+        return self.urllib3_response.getheaders()
+
+    def getheader(self, name, default=None):
+        """
+        Returns a given response header.
+        """
+        return self.urllib3_response.getheader(name, default)
+
+
+class RESTClientObject(object):
+
+    def __init__(self, pools_size=4):
+        if Configuration().verify_ssl:
+            cert_reqs = ssl.CERT_REQUIRED
+        else:
+            cert_reqs = ssl.CERT_NONE
+
+        if Configuration().ssl_ca_cert:
+            ca_certs = Configuration().ssl_ca_cert
+        else:
+            # if not set certificate file, use Mozilla's root certificates.
+            ca_certs = certifi.where()
+
+        # https pool manager
+        self.pool_manager = urllib3.PoolManager(
+            num_pools=pools_size,
+            cert_reqs=cert_reqs,
+            ca_certs=ca_certs
+        )
+
+    def request(self, method, url, query_params=None, headers=None,
+                body=None, post_params=None):
+        """
+        :param method: http request method
+        :param url: http request url
+        :param query_params: query parameters in the url
+        :param headers: http request headers
+        :param body: request json body, for `application/json`
+        :param post_params: request post parameters,
+                            `application/x-www-form-urlencode`
+                            and `multipart/form-data`
+        """
+        method = method.upper()
+        assert method in ['GET', 'HEAD', 'DELETE', 'POST', 'PUT', 'PATCH']
+
+        if post_params and body:
+            raise ValueError(
+                "body parameter cannot be used with post_params parameter."
+            )
+
+        post_params = post_params or {}
+        headers = headers or {}
+
+        if 'Content-Type' not in headers:
+            headers['Content-Type'] = 'application/json'
+
+        try:
+            # For `POST`, `PUT`, `PATCH`
+            if method in ['POST', 'PUT', 'PATCH']:
+                if query_params:
+                    url += '?' + urlencode(query_params)
+                if headers['Content-Type'] == 'application/json':
+                    r = self.pool_manager.request(method, url,
+                                                  body=json.dumps(body),
+                                                  headers=headers)
+                if headers['Content-Type'] == 'application/x-www-form-urlencoded':
+                    r = self.pool_manager.request(method, url,
+                                                  fields=post_params,
+                                                  encode_multipart=False,
+                                                  headers=headers)
+                if headers['Content-Type'] == 'multipart/form-data':
+                    # must del headers['Content-Type'], or the correct Content-Type
+                    # which generated by urllib3 will be overwritten.
+                    del headers['Content-Type']
+                    r = self.pool_manager.request(method, url,
+                                                  fields=post_params,
+                                                  encode_multipart=True,
+                                                  headers=headers)
+            # For `GET`, `HEAD`, `DELETE`
+            else:
+                r = self.pool_manager.request(method, url,
+                                              fields=query_params,
+                                              headers=headers)
+        except urllib3.exceptions.SSLError as e:
+            msg = "{0}\n{1}".format(type(e).__name__, str(e))
+            raise ApiException(status=0, reason=msg)
+
+        r = RESTResponse(r)
+
+        # In the python 3, the response.data is bytes.
+        # we need to decode it to string.
+        if sys.version_info > (3,):
+            r.data = r.data.decode('utf8')
+
+        # log response body
+        logger.debug("response body: %s" % r.data)
+
+        if r.status not in range(200, 206):
+            raise ApiException(http_resp=r)
+
+        return r
+
+    def GET(self, url, headers=None, query_params=None):
+        return self.request("GET", url,
+                            headers=headers,
+                            query_params=query_params)
+
+    def HEAD(self, url, headers=None, query_params=None):
+        return self.request("HEAD", url,
+                            headers=headers,
+                            query_params=query_params)
+
+    def DELETE(self, url, headers=None, query_params=None):
+        return self.request("DELETE", url,
+                            headers=headers,
+                            query_params=query_params)
+
+    def POST(self, url, headers=None, query_params=None, post_params=None, body=None):
+        return self.request("POST", url,
+                            headers=headers,
+                            query_params=query_params,
+                            post_params=post_params,
+                            body=body)
+
+    def PUT(self, url, headers=None, query_params=None, post_params=None, body=None):
+        return self.request("PUT", url,
+                            headers=headers,
+                            query_params=query_params,
+                            post_params=post_params,
+                            body=body)
+
+    def PATCH(self, url, headers=None, query_params=None, post_params=None, body=None):
+        return self.request("PATCH", url,
+                            headers=headers,
+                            query_params=query_params,
+                            post_params=post_params,
+                            body=body)
+
+
+class ApiException(Exception):
+
+    def __init__(self, status=None, reason=None, http_resp=None):
+        if http_resp:
+            self.status = http_resp.status
+            self.reason = http_resp.reason
+            self.body = http_resp.data
+            self.headers = http_resp.getheaders()
+        else:
+            self.status = status
+            self.reason = reason
+            self.body = None
+            self.headers = None
+
+    def __str__(self):
+        """
+        Custom error messages for exception
+        """
+        error_message = "({0})\n"\
+                        "Reason: {1}\n".format(self.status, self.reason)
+        if self.headers:
+            error_message += "HTTP response headers: {0}\n".format(self.headers)
+
+        if self.body:
+            error_message += "HTTP response body: {0}\n".format(self.body)
+
+        return error_message
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/client/petstore/python/test-all.sh b/samples/client/petstore/python/test-all.sh
new file mode 100755
index 00000000000..03c16abd4ae
--- /dev/null
+++ b/samples/client/petstore/python/test-all.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+REQUIREMENTS_FILE=dev-requirements.txt
+REQUIREMENTS_OUT=dev-requirements.txt.log
+SETUP_OUT=*.egg-info
+VENV=.venv
+DEACTIVE=false
+
+### set virtualenv
+if [ -z "$VIRTUAL_ENV" ]; then
+		virtualenv $VENV --no-site-packages --always-copy
+		source $VENV/bin/activate
+    DEACTIVE=true
+fi
+
+### install dependencies
+pip install -r $REQUIREMENTS_FILE | tee -a $REQUIREMENTS_OUT
+python setup.py develop
+
+### run tests
+tox
+
+### deactivate virtualenv
+if [ $DEACTIVE == true ]; then
+    deactivate
+fi
diff --git a/samples/client/petstore/python/test.sh b/samples/client/petstore/python/test.sh
new file mode 100755
index 00000000000..c6889895950
--- /dev/null
+++ b/samples/client/petstore/python/test.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+REQUIREMENTS_FILE=dev-requirements.txt
+REQUIREMENTS_OUT=dev-requirements.txt.log
+SETUP_OUT=*.egg-info
+VENV=.venv
+DEACTIVE=false
+
+### set virtualenv
+if [ -z "$VIRTUAL_ENV" ]; then
+		virtualenv $VENV --no-site-packages --always-copy
+		source $VENV/bin/activate
+    DEACTIVE=true
+fi
+
+### install dependencies
+pip install -r $REQUIREMENTS_FILE | tee -a $REQUIREMENTS_OUT
+python setup.py develop
+
+### run tests
+nosetests
+
+### deactivate virtualenv
+if [ $DEACTIVE == true ]; then
+    deactivate
+fi
+
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/testfiles/foo.png b/samples/client/petstore/python/testfiles/foo.png
similarity index 100%
rename from samples/client/petstore/python/SwaggerPetstore-python/testfiles/foo.png
rename to samples/client/petstore/python/testfiles/foo.png
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/tests/__init__.py b/samples/client/petstore/python/tests/__init__.py
similarity index 100%
rename from samples/client/petstore/python/SwaggerPetstore-python/tests/__init__.py
rename to samples/client/petstore/python/tests/__init__.py
diff --git a/samples/client/petstore/python/tests/test_api_client.py b/samples/client/petstore/python/tests/test_api_client.py
new file mode 100644
index 00000000000..61c57cb7e46
--- /dev/null
+++ b/samples/client/petstore/python/tests/test_api_client.py
@@ -0,0 +1,167 @@
+# coding: utf-8
+
+"""
+Run the tests.
+$ pip install nose (optional)
+$ cd SwaggerPetstore-python
+$ nosetests -v
+"""
+
+import os
+import time
+import unittest
+from dateutil.parser import parse
+
+import swagger_client
+import swagger_client.configuration
+
+HOST = 'http://petstore.swagger.io/v2'
+
+
+class ApiClientTests(unittest.TestCase):
+
+    def setUp(self):
+        self.api_client = swagger_client.ApiClient(HOST)
+
+    def test_configuration(self):
+        swagger_client.configuration.api_key['api_key'] = '123456'
+        swagger_client.configuration.api_key_prefix['api_key'] = 'PREFIX'
+        swagger_client.configuration.username = 'test_username'
+        swagger_client.configuration.password = 'test_password'
+
+        header_params = {'test1': 'value1'}
+        query_params = {'test2': 'value2'}
+        auth_settings = ['api_key', 'unknown']
+
+        # test prefix
+        self.assertEqual('PREFIX', swagger_client.configuration.api_key_prefix['api_key'])
+
+        # update parameters based on auth setting
+        self.api_client.update_params_for_auth(header_params, query_params, auth_settings)
+
+        # test api key auth
+        self.assertEqual(header_params['test1'], 'value1')
+        self.assertEqual(header_params['api_key'], 'PREFIX 123456')
+        self.assertEqual(query_params['test2'], 'value2')
+
+        # test basic auth
+        self.assertEqual('test_username', swagger_client.configuration.username)
+        self.assertEqual('test_password', swagger_client.configuration.password)
+
+    def test_select_header_accept(self):
+        accepts = ['APPLICATION/JSON', 'APPLICATION/XML']
+        accept = self.api_client.select_header_accept(accepts)
+        self.assertEqual(accept, 'application/json')
+
+        accepts = ['application/json', 'application/xml']
+        accept = self.api_client.select_header_accept(accepts)
+        self.assertEqual(accept, 'application/json')
+
+        accepts = ['application/xml', 'application/json']
+        accept = self.api_client.select_header_accept(accepts)
+        self.assertEqual(accept, 'application/json')
+
+        accepts = ['text/plain', 'application/xml']
+        accept = self.api_client.select_header_accept(accepts)
+        self.assertEqual(accept, 'text/plain, application/xml')
+
+        accepts = []
+        accept = self.api_client.select_header_accept(accepts)
+        self.assertEqual(accept, None)
+
+    def test_select_header_content_type(self):
+        content_types = ['APPLICATION/JSON', 'APPLICATION/XML']
+        content_type = self.api_client.select_header_content_type(content_types)
+        self.assertEqual(content_type, 'application/json')
+
+        content_types = ['application/json', 'application/xml']
+        content_type = self.api_client.select_header_content_type(content_types)
+        self.assertEqual(content_type, 'application/json')
+
+        content_types = ['application/xml', 'application/json']
+        content_type = self.api_client.select_header_content_type(content_types)
+        self.assertEqual(content_type, 'application/json')
+
+        content_types = ['text/plain', 'application/xml']
+        content_type = self.api_client.select_header_content_type(content_types)
+        self.assertEqual(content_type, 'text/plain')
+
+        content_types = []
+        content_type = self.api_client.select_header_content_type(content_types)
+        self.assertEqual(content_type, 'application/json')
+
+    def test_sanitize_for_serialization(self):
+        # None
+        data = None
+        result = self.api_client.sanitize_for_serialization(None)
+        self.assertEqual(result, data)
+
+        # str
+        data = "test string"
+        result = self.api_client.sanitize_for_serialization(data)
+        self.assertEqual(result, data)
+
+        # int
+        data = 1
+        result = self.api_client.sanitize_for_serialization(data)
+        self.assertEqual(result, data)
+
+        # bool
+        data = True
+        result = self.api_client.sanitize_for_serialization(data)
+        self.assertEqual(result, data)
+
+        # date
+        data = parse("1997-07-16").date()    # date
+        result = self.api_client.sanitize_for_serialization(data)
+        self.assertEqual(result, "1997-07-16")
+
+        # datetime
+        data = parse("1997-07-16T19:20:30.45+01:00")    # datetime
+        result = self.api_client.sanitize_for_serialization(data)
+        self.assertEqual(result, "1997-07-16T19:20:30.450000+01:00")
+
+        # list
+        data = [1]
+        result = self.api_client.sanitize_for_serialization(data)
+        self.assertEqual(result, data)
+
+        # dict
+        data = {"test key": "test value"}
+        result = self.api_client.sanitize_for_serialization(data)
+        self.assertEqual(result, data)
+
+        # model
+        pet_dict = {"id": 1, "name": "monkey",
+                    "category": {"id": 1, "name": "test category"},
+                    "tags": [{"id": 1, "name": "test tag1"},
+                             {"id": 2, "name": "test tag2"}],
+                    "status": "available",
+                    "photoUrls": ["http://foo.bar.com/3",
+                                  "http://foo.bar.com/4"]}
+        pet = swagger_client.Pet()
+        pet.id = pet_dict["id"]
+        pet.name = pet_dict["name"]
+        cate = swagger_client.Category()
+        cate.id = pet_dict["category"]["id"]
+        cate.name = pet_dict["category"]["name"]
+        pet.category = cate
+        tag1 = swagger_client.Tag()
+        tag1.id = pet_dict["tags"][0]["id"]
+        tag1.name = pet_dict["tags"][0]["name"]
+        tag2 = swagger_client.Tag()
+        tag2.id = pet_dict["tags"][1]["id"]
+        tag2.name = pet_dict["tags"][1]["name"]
+        pet.tags = [tag1, tag2]
+        pet.status = pet_dict["status"]
+        pet.photo_urls = pet_dict["photoUrls"]
+
+        data = pet
+        result = self.api_client.sanitize_for_serialization(data)
+        self.assertEqual(result, pet_dict)
+
+        # list of models
+        list_of_pet_dict = [pet_dict]
+        data = [pet]
+        result = self.api_client.sanitize_for_serialization(data)
+        self.assertEqual(result, list_of_pet_dict)
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/tests/test_api_exception.py b/samples/client/petstore/python/tests/test_api_exception.py
similarity index 80%
rename from samples/client/petstore/python/SwaggerPetstore-python/tests/test_api_exception.py
rename to samples/client/petstore/python/tests/test_api_exception.py
index d1b786241e8..a60594b3edd 100644
--- a/samples/client/petstore/python/SwaggerPetstore-python/tests/test_api_exception.py
+++ b/samples/client/petstore/python/tests/test_api_exception.py
@@ -3,7 +3,7 @@
 """
 Run the tests.
 $ pip install nose (optional)
-$ cd SwaggerPetstore-python
+$ cd swagger_client-python
 $ nosetests -v
 """
 
@@ -11,25 +11,25 @@
 import time
 import unittest
 
-import SwaggerPetstore
-from SwaggerPetstore.rest import ApiException
+import swagger_client
+from swagger_client.rest import ApiException
 
 
 class ApiExceptionTests(unittest.TestCase):
 
     def setUp(self):
-        self.api_client = SwaggerPetstore.ApiClient()
-        self.pet_api = SwaggerPetstore.PetApi(self.api_client)
+        self.api_client = swagger_client.ApiClient()
+        self.pet_api = swagger_client.PetApi(self.api_client)
         self.setUpModels()
 
     def setUpModels(self):
-        self.category = SwaggerPetstore.Category()
+        self.category = swagger_client.Category()
         self.category.id = int(time.time())
         self.category.name = "dog"
-        self.tag = SwaggerPetstore.Tag()
+        self.tag = swagger_client.Tag()
         self.tag.id = int(time.time())
         self.tag.name = "blank"
-        self.pet = SwaggerPetstore.Pet()
+        self.pet = swagger_client.Pet()
         self.pet.id = int(time.time())
         self.pet.name = "hello kity"
         self.pet.photo_urls = ["http://foo.bar.com/1", "http://foo.bar.com/2"]
@@ -52,7 +52,7 @@ def test_404_error(self):
         except ApiException as e:
             self.assertEqual(e.status, 404)
             self.assertEqual(e.reason, "Not Found")
-            self.assertDictEqual(e.body, {'message': 'Pet not found', 'code': 1, 'type': 'error'})
+            self.assertRegexpMatches(e.body, "Pet not found")
 
     def test_500_error(self):
         self.pet_api.add_pet(body=self.pet)
diff --git a/samples/client/petstore/python/tests/test_deserialization.py b/samples/client/petstore/python/tests/test_deserialization.py
new file mode 100644
index 00000000000..1eae045ff76
--- /dev/null
+++ b/samples/client/petstore/python/tests/test_deserialization.py
@@ -0,0 +1,178 @@
+# coding: utf-8
+
+"""
+Run the tests.
+$ pip install nose (optional)
+$ cd SwaggerPetstore-python
+$ nosetests -v
+"""
+import os
+import time
+import unittest
+import datetime
+
+import swagger_client
+
+
+class DeserializationTests(unittest.TestCase):
+
+    def setUp(self):
+        self.api_client = swagger_client.ApiClient()
+        self.deserialize = self.api_client._ApiClient__deserialize
+
+    def test_deserialize_dict_str_pet(self):
+        """ deserialize dict(str, Pet) """
+        data = {
+            'pet': {
+                "id": 0,
+                "category": {
+                    "id": 0,
+                    "name": "string"
+                },
+                "name": "doggie",
+                "photoUrls": [
+                    "string"
+                ],
+                "tags": [
+                    {
+                        "id": 0,
+                        "name": "string"
+                    }
+                ],
+                "status": "available"
+            }
+        }
+
+        deserialized = self.deserialize(data, 'dict(str, Pet)')
+        self.assertTrue(isinstance(deserialized, dict))
+        self.assertTrue(isinstance(deserialized['pet'], swagger_client.Pet))
+
+    def test_deserialize_dict_str_int(self):
+        """ deserialize dict(str, int) """
+        data = {
+            'integer': 1
+        }
+
+        deserialized = self.deserialize(data, 'dict(str, int)')
+        self.assertTrue(isinstance(deserialized, dict))
+        self.assertTrue(isinstance(deserialized['integer'], int))
+
+    def test_deserialize_str(self):
+        """ deserialize str """
+        data = "test str"
+        deserialized = self.deserialize(data, "str")
+        self.assertTrue(isinstance(deserialized, str))
+
+    def test_deserialize_date(self):
+        """ deserialize date """
+        data = "1997-07-16"
+        deserialized = self.deserialize(data, "date")
+        self.assertTrue(isinstance(deserialized, datetime.date))
+
+    def test_deserialize_datetime(self):
+        """ deserialize datetime """
+        data = "1997-07-16T19:20:30.45+01:00"
+        deserialized = self.deserialize(data, "datetime")
+        self.assertTrue(isinstance(deserialized, datetime.datetime))
+
+    def test_deserialize_pet(self):
+        """ deserialize pet """
+        data = {
+                "id": 0,
+                "category": {
+                    "id": 0,
+                    "name": "string"
+                },
+                "name": "doggie",
+                "photoUrls": [
+                    "string"
+                ],
+                "tags": [
+                    {
+                        "id": 0,
+                        "name": "string"
+                    }
+                ],
+                "status": "available"
+            }
+        deserialized = self.deserialize(data, "Pet")
+        self.assertTrue(isinstance(deserialized, swagger_client.Pet))
+        self.assertEqual(deserialized.id, 0)
+        self.assertEqual(deserialized.name, "doggie")
+        self.assertTrue(isinstance(deserialized.category, swagger_client.Category))
+        self.assertEqual(deserialized.category.name, "string")
+        self.assertTrue(isinstance(deserialized.tags, list))
+        self.assertEqual(deserialized.tags[0].name, "string")
+
+    def test_deserialize_list_of_pet(self):
+        """ deserialize list[Pet] """
+        data = [{
+            "id": 0,
+            "category": {
+                "id": 0,
+                "name": "string"
+            },
+            "name": "doggie0",
+            "photoUrls": [
+                "string"
+            ],
+            "tags": [
+                {
+                    "id": 0,
+                    "name": "string"
+                }
+            ],
+            "status": "available"
+        },
+        {
+            "id": 1,
+            "category": {
+                "id": 0,
+                "name": "string"
+            },
+            "name": "doggie1",
+            "photoUrls": [
+                "string"
+            ],
+            "tags": [
+                {
+                    "id": 0,
+                    "name": "string"
+                }
+            ],
+            "status": "available"
+        }]
+        deserialized = self.deserialize(data, "list[Pet]")
+        self.assertTrue(isinstance(deserialized, list))
+        self.assertTrue(isinstance(deserialized[0], swagger_client.Pet))
+        self.assertEqual(deserialized[0].id, 0)
+        self.assertEqual(deserialized[1].id, 1)
+        self.assertEqual(deserialized[0].name, "doggie0")
+        self.assertEqual(deserialized[1].name, "doggie1")
+
+    def test_deserialize_nested_dict(self):
+        """ deserialize dict(str, dict(str, int)) """
+        data = {
+            "foo": {
+                "bar": 1
+            }
+        }
+
+        deserialized = self.deserialize(data, "dict(str, dict(str, int))")
+        self.assertTrue(isinstance(deserialized, dict))
+        self.assertTrue(isinstance(deserialized["foo"], dict))
+        self.assertTrue(isinstance(deserialized["foo"]["bar"], int))
+
+    def test_deserialize_nested_list(self):
+        """ deserialize list[list[str]] """
+        data = [["foo"]]
+
+        deserialized = self.deserialize(data, "list[list[str]]")
+        self.assertTrue(isinstance(deserialized, list))
+        self.assertTrue(isinstance(deserialized[0], list))
+        self.assertTrue(isinstance(deserialized[0][0], str))
+
+    def test_deserialize_none(self):
+        """ deserialize None """
+        deserialized = self.deserialize(None, "datetime")
+        self.assertIsNone(deserialized)
diff --git a/samples/client/petstore/python/tests/test_order_model.py b/samples/client/petstore/python/tests/test_order_model.py
new file mode 100644
index 00000000000..e411ca0103d
--- /dev/null
+++ b/samples/client/petstore/python/tests/test_order_model.py
@@ -0,0 +1,25 @@
+# coding: utf-8
+
+"""
+Run the tests.
+$ pip install nose (optional)
+$ cd swagger_client-python
+$ nosetests -v
+"""
+
+import os
+import time
+import unittest
+
+import swagger_client
+
+
+class OrderModelTests(unittest.TestCase):
+
+    def test_status(self):
+        order = swagger_client.Order()
+        order.status = "placed"
+        self.assertEqual("placed", order.status)
+
+        with self.assertRaises(ValueError):
+            order.status = "invalid"
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/tests/test_pet_api.py b/samples/client/petstore/python/tests/test_pet_api.py
similarity index 71%
rename from samples/client/petstore/python/SwaggerPetstore-python/tests/test_pet_api.py
rename to samples/client/petstore/python/tests/test_pet_api.py
index 3bf18607729..6994ddbd649 100644
--- a/samples/client/petstore/python/SwaggerPetstore-python/tests/test_pet_api.py
+++ b/samples/client/petstore/python/tests/test_pet_api.py
@@ -3,7 +3,7 @@
 """
 Run the tests.
 $ pip install nose (optional)
-$ cd SwaggerPetstore-python
+$ cd swagger_client-python
 $ nosetests -v
 """
 
@@ -11,8 +11,8 @@
 import time
 import unittest
 
-import SwaggerPetstore
-from SwaggerPetstore.rest import ApiException
+import swagger_client
+from swagger_client.rest import ApiException
 
 HOST = 'http://petstore.swagger.io/v2'
 
@@ -20,8 +20,8 @@
 class PetApiTests(unittest.TestCase):
 
     def setUp(self):
-        self.api_client = SwaggerPetstore.ApiClient(HOST)
-        self.pet_api = SwaggerPetstore.PetApi(self.api_client)
+        self.api_client = swagger_client.ApiClient(HOST)
+        self.pet_api = swagger_client.PetApi(self.api_client)
         self.setUpModels()
         self.setUpFiles()
 
@@ -30,13 +30,13 @@ def tearDown(self):
         time.sleep(1)
 
     def setUpModels(self):
-        self.category = SwaggerPetstore.Category()
+        self.category = swagger_client.Category()
         self.category.id = int(time.time())
         self.category.name = "dog"
-        self.tag = SwaggerPetstore.Tag()
+        self.tag = swagger_client.Tag()
         self.tag.id = int(time.time())
-        self.tag.name = "blank"
-        self.pet = SwaggerPetstore.Pet()
+        self.tag.name = "swagger-codegen-python-pet-tag"
+        self.pet = swagger_client.Pet()
         self.pet.id = int(time.time())
         self.pet.name = "hello kity"
         self.pet.photo_urls = ["http://foo.bar.com/1", "http://foo.bar.com/2"]
@@ -50,24 +50,43 @@ def setUpFiles(self):
         self.foo = os.path.join(self.test_file_dir, "foo.png")
 
     def test_create_api_instance(self):
-        pet_api = SwaggerPetstore.PetApi()
-        pet_api2 = SwaggerPetstore.PetApi()
-        api_client3 = SwaggerPetstore.ApiClient()
+        pet_api = swagger_client.PetApi()
+        pet_api2 = swagger_client.PetApi()
+        api_client3 = swagger_client.ApiClient()
         api_client3.user_agent = 'api client 3'
-        api_client4 = SwaggerPetstore.ApiClient()
+        api_client4 = swagger_client.ApiClient()
         api_client4.user_agent = 'api client 4'
-        pet_api3 = SwaggerPetstore.PetApi(api_client3)
+        pet_api3 = swagger_client.PetApi(api_client3)
 
         # same default api client
         self.assertEqual(pet_api.api_client, pet_api2.api_client)
         # confirm using the default api client in the config module
-        self.assertEqual(pet_api.api_client, SwaggerPetstore.configuration.api_client)
+        self.assertEqual(pet_api.api_client, swagger_client.configuration.api_client)
         # 2 different api clients are not the same
         self.assertNotEqual(api_client3, api_client4)
         # customized pet api not using the default api client
-        self.assertNotEqual(pet_api3.api_client, SwaggerPetstore.configuration.api_client)
+        self.assertNotEqual(pet_api3.api_client, swagger_client.configuration.api_client)
         # customized pet api not using the old pet api's api client
         self.assertNotEqual(pet_api3.api_client, pet_api2.api_client)
+        
+    def test_async_request(self):
+        self.pet_api.add_pet(body=self.pet)
+
+        def callback_function(data):
+            self.assertIsNotNone(data)
+            self.assertEqual(data.id, self.pet.id)
+            self.assertEqual(data.name, self.pet.name)
+            self.assertIsNotNone(data.category)
+            self.assertEqual(data.category.id, self.pet.category.id)
+            self.assertEqual(data.category.name, self.pet.category.name)
+            self.assertTrue(isinstance(data.tags, list))
+            self.assertEqual(data.tags[0].id, self.pet.tags[0].id)
+            self.assertEqual(data.tags[0].name, self.pet.tags[0].name)
+
+        thread = self.pet_api.get_pet_by_id(pet_id=self.pet.id, callback=callback_function)
+        thread.join(10)
+        if thread.isAlive():
+            self.fail("Request timeout")
 
     def test_add_pet_and_get_pet_by_id(self):
         self.pet_api.add_pet(body=self.pet)
diff --git a/samples/client/petstore/python/tests/test_pet_model.py b/samples/client/petstore/python/tests/test_pet_model.py
new file mode 100644
index 00000000000..0b0df18a8d0
--- /dev/null
+++ b/samples/client/petstore/python/tests/test_pet_model.py
@@ -0,0 +1,40 @@
+# coding: utf-8
+
+"""
+Run the tests.
+$ pip install nose (optional)
+$ cd swagger_client-python
+$ nosetests -v
+"""
+
+import os
+import time
+import unittest
+
+import swagger_client
+
+
+class PetModelTests(unittest.TestCase):
+
+    def setUp(self):
+        self.pet = swagger_client.Pet()
+        self.pet.name = "test name"
+        self.pet.id = 1
+        self.pet.photo_urls = ["string"]
+        self.pet.status = "available"
+        cate = swagger_client.Category()
+        cate.id = 1
+        cate.name = "dog"
+        self.pet.category = cate
+        tag = swagger_client.Tag()
+        tag.id = 1
+        self.pet.tags = [tag]
+
+    def test_to_str(self):
+        data = ("{'category': {'id': 1, 'name': 'dog'},\n"
+                " 'id': 1,\n"
+                " 'name': 'test name',\n"
+                " 'photo_urls': ['string'],\n"
+                " 'status': 'available',\n"
+                " 'tags': [{'id': 1, 'name': None}]}")
+        self.assertEqual(data, self.pet.to_str())
diff --git a/samples/client/petstore/python/tests/test_store_api.py b/samples/client/petstore/python/tests/test_store_api.py
new file mode 100644
index 00000000000..42b92d0879c
--- /dev/null
+++ b/samples/client/petstore/python/tests/test_store_api.py
@@ -0,0 +1,30 @@
+# coding: utf-8
+
+"""
+Run the tests.
+$ pip install nose (optional)
+$ cd SwaggerPetstore-python
+$ nosetests -v
+"""
+
+import os
+import time
+import unittest
+
+import swagger_client
+from swagger_client.rest import ApiException
+
+
+class StoreApiTests(unittest.TestCase):
+
+    def setUp(self):
+        self.store_api = swagger_client.StoreApi()
+
+    def tearDown(self):
+        # sleep 1 sec between two every 2 tests
+        time.sleep(1)
+
+    def test_get_inventory(self):
+        data = self.store_api.get_inventory()
+        self.assertIsNotNone(data)
+        self.assertTrue(isinstance(data, dict))
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/tox.ini b/samples/client/petstore/python/tox.ini
similarity index 100%
rename from samples/client/petstore/python/SwaggerPetstore-python/tox.ini
rename to samples/client/petstore/python/tox.ini
diff --git a/samples/client/petstore/python3/client/pet_api.py b/samples/client/petstore/python3/client/pet_api.py
index 9293a89d2b0..cebab131778 100644
--- a/samples/client/petstore/python3/client/pet_api.py
+++ b/samples/client/petstore/python3/client/pet_api.py
@@ -35,7 +35,7 @@ def update_pet(self, **kwargs):
         
 
         Args:
-            body, Pet: Pet object that needs to be added to the store (required)
+            body, Pet: Pet object that needs to be added to the store (optional)
             
 
         Returns: 
@@ -77,7 +77,7 @@ def add_pet(self, **kwargs):
         
 
         Args:
-            body, Pet: Pet object that needs to be added to the store (required)
+            body, Pet: Pet object that needs to be added to the store (optional)
             
 
         Returns: 
@@ -119,7 +119,7 @@ def find_pets_by_status(self, **kwargs):
         Multiple status values can be provided with comma seperated strings
 
         Args:
-            status, list[str]: Status values that need to be considered for filter (required)
+            status, list[str]: Status values that need to be considered for filter (optional)
             
 
         Returns: list[Pet]
@@ -170,7 +170,7 @@ def find_pets_by_tags(self, **kwargs):
         Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
 
         Args:
-            tags, list[str]: Tags to filter by (required)
+            tags, list[str]: Tags to filter by (optional)
             
 
         Returns: list[Pet]
@@ -275,8 +275,8 @@ def update_pet_with_form(self, **kwargs):
 
         Args:
             pet_id, str: ID of pet that needs to be updated (required)
-            name, str: Updated name of the pet (required)
-            status, str: Updated status of the pet (required)
+            name, str: Updated name of the pet (optional)
+            status, str: Updated status of the pet (optional)
             
 
         Returns: 
@@ -323,7 +323,7 @@ def delete_pet(self, **kwargs):
         
 
         Args:
-            api_key, str:  (required)
+            api_key, str:  (optional)
             pet_id, int: Pet id to delete (required)
             
 
@@ -375,8 +375,8 @@ def upload_file(self, **kwargs):
 
         Args:
             pet_id, int: ID of pet to update (required)
-            additional_metadata, str: Additional data to pass to server (required)
-            file, file: file to upload (required)
+            additional_metadata, str: Additional data to pass to server (optional)
+            file, file: file to upload (optional)
             
 
         Returns: 
diff --git a/samples/client/petstore/python3/client/store_api.py b/samples/client/petstore/python3/client/store_api.py
index 8002b473f8a..802e116f1ff 100644
--- a/samples/client/petstore/python3/client/store_api.py
+++ b/samples/client/petstore/python3/client/store_api.py
@@ -82,7 +82,7 @@ def place_order(self, **kwargs):
         
 
         Args:
-            body, Order: order placed for purchasing the pet (required)
+            body, Order: order placed for purchasing the pet (optional)
             
 
         Returns: Order
diff --git a/samples/client/petstore/python3/client/user_api.py b/samples/client/petstore/python3/client/user_api.py
index c4c3c2ede52..54813ca2ddd 100644
--- a/samples/client/petstore/python3/client/user_api.py
+++ b/samples/client/petstore/python3/client/user_api.py
@@ -35,7 +35,7 @@ def create_user(self, **kwargs):
         This can only be done by the logged in user.
 
         Args:
-            body, User: Created user object (required)
+            body, User: Created user object (optional)
             
 
         Returns: 
@@ -77,7 +77,7 @@ def create_users_with_array_input(self, **kwargs):
         
 
         Args:
-            body, list[User]: List of user object (required)
+            body, list[User]: List of user object (optional)
             
 
         Returns: 
@@ -119,7 +119,7 @@ def create_users_with_list_input(self, **kwargs):
         
 
         Args:
-            body, list[User]: List of user object (required)
+            body, list[User]: List of user object (optional)
             
 
         Returns: 
@@ -161,8 +161,8 @@ def login_user(self, **kwargs):
         
 
         Args:
-            username, str: The user name for login (required)
-            password, str: The password for login in clear text (required)
+            username, str: The user name for login (optional)
+            password, str: The password for login in clear text (optional)
             
 
         Returns: str
@@ -311,7 +311,7 @@ def update_user(self, **kwargs):
 
         Args:
             username, str: name that need to be deleted (required)
-            body, User: Updated user object (required)
+            body, User: Updated user object (optional)
             
 
         Returns: 
diff --git a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/ServiceGenerator.java b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/ServiceGenerator.java
index e443c984fd0..1ffb0c58b0c 100644
--- a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/ServiceGenerator.java
+++ b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/ServiceGenerator.java
@@ -2,8 +2,20 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonParseException;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.IOException;
+import java.lang.reflect.Type;
+
 import retrofit.RestAdapter;
+import retrofit.converter.ConversionException;
+import retrofit.converter.Converter;
 import retrofit.converter.GsonConverter;
+import retrofit.mime.TypedByteArray;
+import retrofit.mime.TypedInput;
+import retrofit.mime.TypedOutput;
 
 public class ServiceGenerator {
   // No need to instantiate this class.
@@ -15,9 +27,63 @@ public static <S> S createService(Class<S> serviceClass) {
         .create();
     RestAdapter adapter = new RestAdapter.Builder()
         .setEndpoint("http://petstore.swagger.io/v2")
-        .setConverter(new GsonConverter(gson))
+        .setConverter(new GsonConverterWrapper(gson))
         .build();
 
     return adapter.create(serviceClass);
   }
 }
+
+/**
+ * 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 GsonConverterWrapper implements Converter {
+    private GsonConverter converter;
+
+    public GsonConverterWrapper(Gson gson) {
+        converter = new GsonConverter(gson);
+    }
+
+    @Override public Object fromBody(TypedInput body, Type type) throws ConversionException {
+        byte[] bodyBytes = readInBytes(body);
+        TypedByteArray newBody = new TypedByteArray(body.mimeType(), bodyBytes);
+        try {
+            return converter.fromBody(newBody, type);
+        } catch (ConversionException e) {
+            if (e.getCause() instanceof JsonParseException && type.equals(String.class)) {
+                return new String(bodyBytes);
+            } else {
+                throw e;
+            }
+        }
+    }
+
+    @Override public TypedOutput toBody(Object object) {
+        return converter.toBody(object);
+    }
+
+    private byte[] readInBytes(TypedInput body) throws ConversionException {
+        InputStream in = null;
+        try {
+            in = body.in();
+            ByteArrayOutputStream os = new ByteArrayOutputStream();
+            byte[] buffer = new byte[0xFFFF];
+            for (int len; (len = in.read(buffer)) != -1;)
+                os.write(buffer, 0, len);
+            os.flush();
+            return os.toByteArray();
+        } catch (IOException e) {
+            throw new ConversionException(e);
+        } finally {
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException ignored) {
+                }
+            }
+        }
+
+    }
+}
diff --git a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/PetApi.java
index 3d1b0893b61..cca8370a181 100644
--- a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/PetApi.java
@@ -10,108 +10,108 @@
 import java.io.File;
 
 public interface PetApi {
-  
+
   /**
    * Update an existing pet
-   * 
+   *
    * @param body Pet object that needs to be added to the store
    * @return Void
    */
-  
-  @PUT("/pet")  
+
+  @PUT("/pet")
   Void updatePet(
     @Body Pet body
-  );  
-  
+  );
+
   /**
    * Add a new pet to the store
-   * 
+   *
    * @param body Pet object that needs to be added to the store
    * @return Void
    */
-  
-  @POST("/pet")  
+
+  @POST("/pet")
   Void addPet(
     @Body Pet body
-  );  
-  
+  );
+
   /**
    * 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>
    */
-  
-  @GET("/pet/findByStatus")  
+
+  @GET("/pet/findByStatus")
   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
    * @return List<Pet>
    */
-  
-  @GET("/pet/findByTags")  
+
+  @GET("/pet/findByTags")
   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
    * @return Pet
    */
-  
-  @GET("/pet/{petId}")  
+
+  @GET("/pet/{petId}")
   Pet getPetById(
     @Path("petId") Long petId
-  );  
-  
+  );
+
   /**
    * 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
    */
-  
+
   @FormUrlEncoded
-  @POST("/pet/{petId}")  
+  @POST("/pet/{petId}")
   Void updatePetWithForm(
-    @Path("petId") String petId,@Field("name") String name,@Field("status") String status
-  );  
-  
+    @Path("petId") String petId, @Field("name") String name, @Field("status") String status
+  );
+
   /**
    * Deletes a pet
-   * 
-   * @param apiKey 
+   *
    * @param petId Pet id to delete
+   * @param apiKey
    * @return Void
    */
-  
-  @DELETE("/pet/{petId}")  
+
+  @DELETE("/pet/{petId}")
   Void deletePet(
-    @Header("api_key") String apiKey,@Path("petId") Long petId
-  );  
-  
+    @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
    * @return Void
    */
-  
+
   @Multipart
-  @POST("/pet/{petId}/uploadImage")  
+  @POST("/pet/{petId}/uploadImage")
   Void uploadFile(
-    @Path("petId") Long petId,@Part("additionalMetadata") String additionalMetadata,@Part("file") TypedFile file
-  );  
-  
+    @Path("petId") Long petId, @Part("additionalMetadata") String additionalMetadata, @Part("file") TypedFile file
+  );
+
 }
diff --git a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/UserApi.java
index 4aa39c52e2c..b80f9e5fa20 100644
--- a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/UserApi.java
+++ b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/UserApi.java
@@ -57,7 +57,7 @@ Void createUsersWithListInput(
   
   @GET("/user/login")  
   String loginUser(
-    @Query("username") String username,@Query("password") String password
+    @Query("username") String username, @Query("password") String password
   );  
   
   /**
@@ -92,7 +92,7 @@ User getUserByName(
   
   @PUT("/user/{username}")  
   Void updateUser(
-    @Path("username") String username,@Body User body
+    @Path("username") String username, @Body User body
   );  
   
   /**
diff --git a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Pet.java
index af9ba8880e0..7d1368a74e0 100644
--- a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Pet.java
@@ -1,8 +1,8 @@
 package io.swagger.client.model;
 
 import io.swagger.client.model.Category;
-import java.util.*;
 import io.swagger.client.model.Tag;
+import java.util.*;
 
 import io.swagger.annotations.*;
 import com.google.gson.annotations.SerializedName;
@@ -34,13 +34,13 @@ public class Pet  {
      **/
     @ApiModelProperty(required = true, value = "")  
     @SerializedName("photoUrls")
-    private List<String> photoUrls = new ArrayList<String>() ;
+    private List<String> photoUrls = null;
 
     /**
      **/
     @ApiModelProperty(value = "")  
     @SerializedName("tags")
-    private List<Tag> tags = new ArrayList<Tag>() ;
+    private List<Tag> tags = null;
     public enum StatusEnum {
          available,  pending,  sold, 
     };
diff --git a/samples/client/petstore/retrofit/src/test/java/io/swagger/petstore/test/PetApiTest.java b/samples/client/petstore/retrofit/src/test/java/io/swagger/petstore/test/PetApiTest.java
index 5151c941cd4..e7613f189a3 100644
--- a/samples/client/petstore/retrofit/src/test/java/io/swagger/petstore/test/PetApiTest.java
+++ b/samples/client/petstore/retrofit/src/test/java/io/swagger/petstore/test/PetApiTest.java
@@ -120,7 +120,7 @@ public void testDeletePet() throws Exception {
         api.addPet(pet);
 
         Pet fetched = api.getPetById(pet.getId());
-        api.deletePet(null, fetched.getId());
+        api.deletePet(fetched.getId(), null);
 
         try {
             fetched = api.getPetById(fetched.getId());
diff --git a/samples/client/petstore/ruby/Gemfile.lock b/samples/client/petstore/ruby/Gemfile.lock
index e9e03f10b77..05a6aa23790 100644
--- a/samples/client/petstore/ruby/Gemfile.lock
+++ b/samples/client/petstore/ruby/Gemfile.lock
@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    swagger_client (1.0.0)
-      addressable (~> 2.2, >= 2.2.4)
+    petstore (1.0.0)
       json (~> 1.4, >= 1.4.6)
       typhoeus (~> 0.2, >= 0.2.1)
 
@@ -55,7 +54,7 @@ DEPENDENCIES
   autotest-fsevent (~> 0.2, >= 0.2.10)
   autotest-growl (~> 0.2, >= 0.2.16)
   autotest-rails-pure (~> 4.1, >= 4.1.2)
+  petstore!
   rspec (~> 3.2, >= 3.2.0)
-  swagger_client!
   vcr (~> 2.9, >= 2.9.3)
   webmock (~> 1.6, >= 1.6.2)
diff --git a/samples/client/petstore/ruby/README.md b/samples/client/petstore/ruby/README.md
index 2a15c1661cc..c98d79e5a89 100644
--- a/samples/client/petstore/ruby/README.md
+++ b/samples/client/petstore/ruby/README.md
@@ -5,20 +5,20 @@
 You can build the generated client into a gem:
 
 ```shell
-gem build swagger_client.gemspec
+gem build petstore.gemspec
 ```
 
 Then you can either install the gem:
 
 ```shell
-gem install ./swagger_client-1.0.0.gem
+gem install ./petstore-1.0.0.gem
 ```
 
 or publish the gem to a gem server like [RubyGems](https://rubygems.org/).
 
 Finally add this to your Gemfile:
 
-    gem 'swagger_client', '~> 1.0.0'
+    gem 'petstore', '~> 1.0.0'
 
 ### Host as a git repository
 
@@ -27,7 +27,7 @@ https://github.com/xhh/swagger-petstore-ruby
 
 Then you can reference it in Gemfile:
 
-    gem 'swagger_client', :git => 'https://github.com/xhh/swagger-petstore-ruby.git'
+    gem 'petstore', :git => 'https://github.com/xhh/swagger-petstore-ruby.git'
 
 ### Use without installation
 
@@ -40,18 +40,20 @@ ruby -Ilib script.rb
 ## Configuration
 
 ```ruby
-require 'swagger_client'
+require 'petstore'
 
-SwaggerClient::Swagger.configure do |config|
-  config.api_key = 'special-key'
+Petstore::Swagger.configure do |config|
+  config.api_key['api_key'] = 'special-key'
   config.host = 'petstore.swagger.io'
   config.base_path = '/v2'
+  # enable debugging (default is false)
+  config.debug = true
 end
 ```
 
 ## Getting Started
 
 ```ruby
-pet = SwaggerClient::PetApi.get_pet_by_id(5)
+pet = Petstore::PetApi.get_pet_by_id(5)
 puts pet.to_body
 ```
diff --git a/samples/client/petstore/ruby/lib/petstore.rb b/samples/client/petstore/ruby/lib/petstore.rb
new file mode 100644
index 00000000000..a3f555c1765
--- /dev/null
+++ b/samples/client/petstore/ruby/lib/petstore.rb
@@ -0,0 +1,26 @@
+# Swagger common files
+require 'petstore/swagger'
+require 'petstore/swagger/configuration'
+require 'petstore/swagger/api_error'
+require 'petstore/swagger/request'
+require 'petstore/swagger/response'
+require 'petstore/swagger/version'
+
+# Models
+require 'petstore/models/base_object'
+require 'petstore/models/user'
+require 'petstore/models/category'
+require 'petstore/models/pet'
+require 'petstore/models/tag'
+require 'petstore/models/order'
+
+# APIs
+require 'petstore/api/user_api'
+require 'petstore/api/pet_api'
+require 'petstore/api/store_api'
+
+module Petstore
+  # Initialize the default configuration
+  Swagger.configuration = Swagger::Configuration.new
+  Swagger.configure { |config| }
+end
diff --git a/samples/client/petstore/ruby/lib/swagger_client/api/pet_api.rb b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb
similarity index 72%
rename from samples/client/petstore/ruby/lib/swagger_client/api/pet_api.rb
rename to samples/client/petstore/ruby/lib/petstore/api/pet_api.rb
index 2ce4fb04ecd..51c3cec7fde 100644
--- a/samples/client/petstore/ruby/lib/swagger_client/api/pet_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb
@@ -1,9 +1,7 @@
 require "uri"
 
-module SwaggerClient
+module Petstore
   class PetApi
-    basePath = "http://petstore.swagger.io/v2"
-    # apiInvoker = APIInvoker
 
     # Update an existing pet
     # 
@@ -11,8 +9,10 @@ class PetApi
     # @option opts [Pet] :body Pet object that needs to be added to the store
     # @return [nil]
     def self.update_pet(opts = {})
+      if Swagger.configuration.debug
+        Swagger.logger.debug "Calling API: PetApi#update_pet ..."
+      end
       
-
       # resource path
       path = "/pet".sub('{format}','json')
 
@@ -38,7 +38,10 @@ def self.update_pet(opts = {})
       
 
       auth_names = ['petstore_auth']
-      Swagger::Request.new(:PUT, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      Swagger::Request.new(:PUT, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      if Swagger.configuration.debug
+        Swagger.logger.debug "API called: PetApi#update_pet"
+      end
       nil
     end
 
@@ -48,8 +51,10 @@ def self.update_pet(opts = {})
     # @option opts [Pet] :body Pet object that needs to be added to the store
     # @return [nil]
     def self.add_pet(opts = {})
+      if Swagger.configuration.debug
+        Swagger.logger.debug "Calling API: PetApi#add_pet ..."
+      end
       
-
       # resource path
       path = "/pet".sub('{format}','json')
 
@@ -75,18 +80,23 @@ def self.add_pet(opts = {})
       
 
       auth_names = ['petstore_auth']
-      Swagger::Request.new(:POST, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      Swagger::Request.new(:POST, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      if Swagger.configuration.debug
+        Swagger.logger.debug "API called: PetApi#add_pet"
+      end
       nil
     end
 
     # Finds Pets by status
     # Multiple status values can be provided with comma seperated strings
     # @param [Hash] opts the optional parameters
-    # @option opts [array[string]] :status Status values that need to be considered for filter
-    # @return [array[Pet]]
+    # @option opts [Array<String>] :status Status values that need to be considered for filter
+    # @return [Array<Pet>]
     def self.find_pets_by_status(opts = {})
+      if Swagger.configuration.debug
+        Swagger.logger.debug "Calling API: PetApi#find_pets_by_status ..."
+      end
       
-
       # resource path
       path = "/pet/findByStatus".sub('{format}','json')
 
@@ -113,18 +123,24 @@ def self.find_pets_by_status(opts = {})
       
 
       auth_names = ['petstore_auth']
-      response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make.body
-      response.map {|response| obj = Pet.new() and obj.build_from_hash(response) }
+      response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      result = response.deserialize('Array<Pet>')
+      if Swagger.configuration.debug
+        Swagger.logger.debug "API called: PetApi#find_pets_by_status. Result: #{result.inspect}"
+      end
+      result
     end
 
     # 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]]
+    # @option opts [Array<String>] :tags Tags to filter by
+    # @return [Array<Pet>]
     def self.find_pets_by_tags(opts = {})
+      if Swagger.configuration.debug
+        Swagger.logger.debug "Calling API: PetApi#find_pets_by_tags ..."
+      end
       
-
       # resource path
       path = "/pet/findByTags".sub('{format}','json')
 
@@ -151,8 +167,12 @@ def self.find_pets_by_tags(opts = {})
       
 
       auth_names = ['petstore_auth']
-      response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make.body
-      response.map {|response| obj = Pet.new() and obj.build_from_hash(response) }
+      response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      result = response.deserialize('Array<Pet>')
+      if Swagger.configuration.debug
+        Swagger.logger.debug "API called: PetApi#find_pets_by_tags. Result: #{result.inspect}"
+      end
+      result
     end
 
     # Find pet by ID
@@ -161,11 +181,13 @@ def self.find_pets_by_tags(opts = {})
     # @param [Hash] opts the optional parameters
     # @return [Pet]
     def self.get_pet_by_id(pet_id, opts = {})
+      if Swagger.configuration.debug
+        Swagger.logger.debug "Calling API: PetApi#get_pet_by_id ..."
+      end
       
       # verify the required parameter 'pet_id' is set
-      raise "Missing the required parameter 'pet_id' when calling get_pet_by_id" if pet_id.nil?
+      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)
 
@@ -190,24 +212,30 @@ def self.get_pet_by_id(pet_id, opts = {})
       post_body = nil
       
 
-      auth_names = ['petstore_auth', 'api_key']
-      response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make.body
-      obj = Pet.new() and obj.build_from_hash(response)
+      auth_names = ['api_key', 'petstore_auth']
+      response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      result = response.deserialize('Pet')
+      if Swagger.configuration.debug
+        Swagger.logger.debug "API called: PetApi#get_pet_by_id. Result: #{result.inspect}"
+      end
+      result
     end
 
     # 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
+    # @option opts [String] :name Updated name of the pet
+    # @option opts [String] :status Updated status of the pet
     # @return [nil]
     def self.update_pet_with_form(pet_id, opts = {})
+      if Swagger.configuration.debug
+        Swagger.logger.debug "Calling API: PetApi#update_pet_with_form ..."
+      end
       
       # verify the required parameter 'pet_id' is set
-      raise "Missing the required parameter 'pet_id' when calling update_pet_with_form" if pet_id.nil?
+      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)
 
@@ -235,7 +263,10 @@ def self.update_pet_with_form(pet_id, opts = {})
       
 
       auth_names = ['petstore_auth']
-      Swagger::Request.new(:POST, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      Swagger::Request.new(:POST, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      if Swagger.configuration.debug
+        Swagger.logger.debug "API called: PetApi#update_pet_with_form"
+      end
       nil
     end
 
@@ -243,14 +274,16 @@ def self.update_pet_with_form(pet_id, opts = {})
     # 
     # @param pet_id Pet id to delete
     # @param [Hash] opts the optional parameters
-    # @option opts [string] :api_key 
+    # @option opts [String] :api_key 
     # @return [nil]
     def self.delete_pet(pet_id, opts = {})
+      if Swagger.configuration.debug
+        Swagger.logger.debug "Calling API: PetApi#delete_pet ..."
+      end
       
       # verify the required parameter 'pet_id' is set
-      raise "Missing the required parameter 'pet_id' when calling delete_pet" if pet_id.nil?
+      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)
 
@@ -277,7 +310,10 @@ def self.delete_pet(pet_id, opts = {})
       
 
       auth_names = ['petstore_auth']
-      Swagger::Request.new(:DELETE, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      Swagger::Request.new(:DELETE, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      if Swagger.configuration.debug
+        Swagger.logger.debug "API called: PetApi#delete_pet"
+      end
       nil
     end
 
@@ -285,15 +321,17 @@ def self.delete_pet(pet_id, opts = {})
     # 
     # @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
+    # @option opts [String] :additional_metadata Additional data to pass to server
+    # @option opts [File] :file file to upload
     # @return [nil]
     def self.upload_file(pet_id, opts = {})
+      if Swagger.configuration.debug
+        Swagger.logger.debug "Calling API: PetApi#upload_file ..."
+      end
       
       # verify the required parameter 'pet_id' is set
-      raise "Missing the required parameter 'pet_id' when calling upload_file" if pet_id.nil?
+      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)
 
@@ -321,7 +359,10 @@ def self.upload_file(pet_id, opts = {})
       
 
       auth_names = ['petstore_auth']
-      Swagger::Request.new(:POST, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      Swagger::Request.new(:POST, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      if Swagger.configuration.debug
+        Swagger.logger.debug "API called: PetApi#upload_file"
+      end
       nil
     end
   end
diff --git a/samples/client/petstore/ruby/lib/swagger_client/api/store_api.rb b/samples/client/petstore/ruby/lib/petstore/api/store_api.rb
similarity index 73%
rename from samples/client/petstore/ruby/lib/swagger_client/api/store_api.rb
rename to samples/client/petstore/ruby/lib/petstore/api/store_api.rb
index 010d170945b..78328f4b832 100644
--- a/samples/client/petstore/ruby/lib/swagger_client/api/store_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/store_api.rb
@@ -1,17 +1,17 @@
 require "uri"
 
-module SwaggerClient
+module Petstore
   class StoreApi
-    basePath = "http://petstore.swagger.io/v2"
-    # apiInvoker = APIInvoker
 
     # Returns pet inventories by status
     # Returns a map of status codes to quantities
     # @param [Hash] opts the optional parameters
-    # @return [map[string,int]]
+    # @return [Hash<String, Integer>]
     def self.get_inventory(opts = {})
+      if Swagger.configuration.debug
+        Swagger.logger.debug "Calling API: StoreApi#get_inventory ..."
+      end
       
-
       # resource path
       path = "/store/inventory".sub('{format}','json')
 
@@ -37,8 +37,12 @@ def self.get_inventory(opts = {})
       
 
       auth_names = ['api_key']
-      response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make.body
-      response.map {|response| obj = map.new() and obj.build_from_hash(response) }
+      response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      result = response.deserialize('Hash<String, Integer>')
+      if Swagger.configuration.debug
+        Swagger.logger.debug "API called: StoreApi#get_inventory. Result: #{result.inspect}"
+      end
+      result
     end
 
     # Place an order for a pet
@@ -47,8 +51,10 @@ def self.get_inventory(opts = {})
     # @option opts [Order] :body order placed for purchasing the pet
     # @return [Order]
     def self.place_order(opts = {})
+      if Swagger.configuration.debug
+        Swagger.logger.debug "Calling API: StoreApi#place_order ..."
+      end
       
-
       # resource path
       path = "/store/order".sub('{format}','json')
 
@@ -74,8 +80,12 @@ def self.place_order(opts = {})
       
 
       auth_names = []
-      response = Swagger::Request.new(:POST, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make.body
-      obj = Order.new() and obj.build_from_hash(response)
+      response = Swagger::Request.new(:POST, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      result = response.deserialize('Order')
+      if Swagger.configuration.debug
+        Swagger.logger.debug "API called: StoreApi#place_order. Result: #{result.inspect}"
+      end
+      result
     end
 
     # Find purchase order by ID
@@ -84,11 +94,13 @@ def self.place_order(opts = {})
     # @param [Hash] opts the optional parameters
     # @return [Order]
     def self.get_order_by_id(order_id, opts = {})
+      if Swagger.configuration.debug
+        Swagger.logger.debug "Calling API: StoreApi#get_order_by_id ..."
+      end
       
       # verify the required parameter 'order_id' is set
-      raise "Missing the required parameter 'order_id' when calling get_order_by_id" if order_id.nil?
+      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)
 
@@ -114,8 +126,12 @@ def self.get_order_by_id(order_id, opts = {})
       
 
       auth_names = []
-      response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make.body
-      obj = Order.new() and obj.build_from_hash(response)
+      response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      result = response.deserialize('Order')
+      if Swagger.configuration.debug
+        Swagger.logger.debug "API called: StoreApi#get_order_by_id. Result: #{result.inspect}"
+      end
+      result
     end
 
     # Delete purchase order by ID
@@ -124,11 +140,13 @@ def self.get_order_by_id(order_id, opts = {})
     # @param [Hash] opts the optional parameters
     # @return [nil]
     def self.delete_order(order_id, opts = {})
+      if Swagger.configuration.debug
+        Swagger.logger.debug "Calling API: StoreApi#delete_order ..."
+      end
       
       # verify the required parameter 'order_id' is set
-      raise "Missing the required parameter 'order_id' when calling delete_order" if order_id.nil?
+      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)
 
@@ -154,7 +172,10 @@ def self.delete_order(order_id, opts = {})
       
 
       auth_names = []
-      Swagger::Request.new(:DELETE, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      Swagger::Request.new(:DELETE, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      if Swagger.configuration.debug
+        Swagger.logger.debug "API called: StoreApi#delete_order"
+      end
       nil
     end
   end
diff --git a/samples/client/petstore/ruby/lib/swagger_client/api/user_api.rb b/samples/client/petstore/ruby/lib/petstore/api/user_api.rb
similarity index 73%
rename from samples/client/petstore/ruby/lib/swagger_client/api/user_api.rb
rename to samples/client/petstore/ruby/lib/petstore/api/user_api.rb
index a3a57503b01..532a9ffa5bf 100644
--- a/samples/client/petstore/ruby/lib/swagger_client/api/user_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/user_api.rb
@@ -1,9 +1,7 @@
 require "uri"
 
-module SwaggerClient
+module Petstore
   class UserApi
-    basePath = "http://petstore.swagger.io/v2"
-    # apiInvoker = APIInvoker
 
     # Create user
     # This can only be done by the logged in user.
@@ -11,8 +9,10 @@ class UserApi
     # @option opts [User] :body Created user object
     # @return [nil]
     def self.create_user(opts = {})
+      if Swagger.configuration.debug
+        Swagger.logger.debug "Calling API: UserApi#create_user ..."
+      end
       
-
       # resource path
       path = "/user".sub('{format}','json')
 
@@ -38,18 +38,23 @@ def self.create_user(opts = {})
       
 
       auth_names = []
-      Swagger::Request.new(:POST, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      Swagger::Request.new(:POST, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      if Swagger.configuration.debug
+        Swagger.logger.debug "API called: UserApi#create_user"
+      end
       nil
     end
 
     # Creates list of users with given input array
     # 
     # @param [Hash] opts the optional parameters
-    # @option opts [array[User]] :body List of user object
+    # @option opts [Array<User>] :body List of user object
     # @return [nil]
     def self.create_users_with_array_input(opts = {})
+      if Swagger.configuration.debug
+        Swagger.logger.debug "Calling API: UserApi#create_users_with_array_input ..."
+      end
       
-
       # resource path
       path = "/user/createWithArray".sub('{format}','json')
 
@@ -75,18 +80,23 @@ def self.create_users_with_array_input(opts = {})
       
 
       auth_names = []
-      Swagger::Request.new(:POST, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      Swagger::Request.new(:POST, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      if Swagger.configuration.debug
+        Swagger.logger.debug "API called: UserApi#create_users_with_array_input"
+      end
       nil
     end
 
     # Creates list of users with given input array
     # 
     # @param [Hash] opts the optional parameters
-    # @option opts [array[User]] :body List of user object
+    # @option opts [Array<User>] :body List of user object
     # @return [nil]
     def self.create_users_with_list_input(opts = {})
+      if Swagger.configuration.debug
+        Swagger.logger.debug "Calling API: UserApi#create_users_with_list_input ..."
+      end
       
-
       # resource path
       path = "/user/createWithList".sub('{format}','json')
 
@@ -112,19 +122,24 @@ def self.create_users_with_list_input(opts = {})
       
 
       auth_names = []
-      Swagger::Request.new(:POST, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      Swagger::Request.new(:POST, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      if Swagger.configuration.debug
+        Swagger.logger.debug "API called: UserApi#create_users_with_list_input"
+      end
       nil
     end
 
     # 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]
+    # @option opts [String] :username The user name for login
+    # @option opts [String] :password The password for login in clear text
+    # @return [String]
     def self.login_user(opts = {})
+      if Swagger.configuration.debug
+        Swagger.logger.debug "Calling API: UserApi#login_user ..."
+      end
       
-
       # resource path
       path = "/user/login".sub('{format}','json')
 
@@ -152,8 +167,12 @@ def self.login_user(opts = {})
       
 
       auth_names = []
-      response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make.body
-      obj = string.new() and obj.build_from_hash(response)
+      response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      result = response.deserialize('String')
+      if Swagger.configuration.debug
+        Swagger.logger.debug "API called: UserApi#login_user. Result: #{result.inspect}"
+      end
+      result
     end
 
     # Logs out current logged in user session
@@ -161,8 +180,10 @@ def self.login_user(opts = {})
     # @param [Hash] opts the optional parameters
     # @return [nil]
     def self.logout_user(opts = {})
+      if Swagger.configuration.debug
+        Swagger.logger.debug "Calling API: UserApi#logout_user ..."
+      end
       
-
       # resource path
       path = "/user/logout".sub('{format}','json')
 
@@ -188,7 +209,10 @@ def self.logout_user(opts = {})
       
 
       auth_names = []
-      Swagger::Request.new(:GET, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      if Swagger.configuration.debug
+        Swagger.logger.debug "API called: UserApi#logout_user"
+      end
       nil
     end
 
@@ -198,11 +222,13 @@ def self.logout_user(opts = {})
     # @param [Hash] opts the optional parameters
     # @return [User]
     def self.get_user_by_name(username, opts = {})
+      if Swagger.configuration.debug
+        Swagger.logger.debug "Calling API: UserApi#get_user_by_name ..."
+      end
       
       # verify the required parameter 'username' is set
-      raise "Missing the required parameter 'username' when calling get_user_by_name" if username.nil?
+      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)
 
@@ -228,8 +254,12 @@ def self.get_user_by_name(username, opts = {})
       
 
       auth_names = []
-      response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make.body
-      obj = User.new() and obj.build_from_hash(response)
+      response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      result = response.deserialize('User')
+      if Swagger.configuration.debug
+        Swagger.logger.debug "API called: UserApi#get_user_by_name. Result: #{result.inspect}"
+      end
+      result
     end
 
     # Updated user
@@ -239,11 +269,13 @@ def self.get_user_by_name(username, opts = {})
     # @option opts [User] :body Updated user object
     # @return [nil]
     def self.update_user(username, opts = {})
+      if Swagger.configuration.debug
+        Swagger.logger.debug "Calling API: UserApi#update_user ..."
+      end
       
       # verify the required parameter 'username' is set
-      raise "Missing the required parameter 'username' when calling update_user" if username.nil?
+      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)
 
@@ -269,7 +301,10 @@ def self.update_user(username, opts = {})
       
 
       auth_names = []
-      Swagger::Request.new(:PUT, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      Swagger::Request.new(:PUT, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      if Swagger.configuration.debug
+        Swagger.logger.debug "API called: UserApi#update_user"
+      end
       nil
     end
 
@@ -279,11 +314,13 @@ def self.update_user(username, opts = {})
     # @param [Hash] opts the optional parameters
     # @return [nil]
     def self.delete_user(username, opts = {})
+      if Swagger.configuration.debug
+        Swagger.logger.debug "Calling API: UserApi#delete_user ..."
+      end
       
       # verify the required parameter 'username' is set
-      raise "Missing the required parameter 'username' when calling delete_user" if username.nil?
+      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)
 
@@ -309,7 +346,10 @@ def self.delete_user(username, opts = {})
       
 
       auth_names = []
-      Swagger::Request.new(:DELETE, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      Swagger::Request.new(:DELETE, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body, :auth_names => auth_names}).make
+      if Swagger.configuration.debug
+        Swagger.logger.debug "API called: UserApi#delete_user"
+      end
       nil
     end
   end
diff --git a/samples/client/petstore/ruby/lib/swagger_client/models/base_object.rb b/samples/client/petstore/ruby/lib/petstore/models/base_object.rb
similarity index 82%
rename from samples/client/petstore/ruby/lib/swagger_client/models/base_object.rb
rename to samples/client/petstore/ruby/lib/petstore/models/base_object.rb
index 642e4769e55..f17eef349e2 100644
--- a/samples/client/petstore/ruby/lib/swagger_client/models/base_object.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/base_object.rb
@@ -1,21 +1,14 @@
-module SwaggerClient
+require 'date'
+
+module Petstore
   # base class containing fundamental method such as to_hash, build_from_hash and more
   class BaseObject
 
-    # return the object in the form of hash
-    def to_body
-      body = {}
-      self.class.attribute_map.each_pair do |key, value|
-        body[value] = self.send(key) unless self.send(key).nil?
-      end
-      body
-    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 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
@@ -35,25 +28,36 @@ def _deserialize(type, value)
       case type.to_sym
       when :DateTime
         DateTime.parse(value)
-      when :string
+      when :Date
+        Date.parse(value)
+      when :String
         value.to_s
-      when :int
+      when :Integer
         value.to_i
-      when :double
+      when :Float
         value.to_f
-      when :boolean
+      when :BOOLEAN
         if value =~ /^(true|t|yes|y|1)$/i
           true
         else
           false
         end
       else # model
-        _model = SwaggerClient.const_get(type).new
+        _model = Petstore.const_get(type).new
         _model.build_from_hash(value)
       end
     end
 
-    # to_body is an alias to to_body (backward compatibility)
+    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 |key, value|
diff --git a/samples/client/petstore/ruby/lib/swagger_client/models/category.rb b/samples/client/petstore/ruby/lib/petstore/models/category.rb
similarity index 82%
rename from samples/client/petstore/ruby/lib/swagger_client/models/category.rb
rename to samples/client/petstore/ruby/lib/petstore/models/category.rb
index fe195c7ac87..1e36eac4147 100644
--- a/samples/client/petstore/ruby/lib/swagger_client/models/category.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/category.rb
@@ -1,4 +1,4 @@
-module SwaggerClient
+module Petstore
   # 
   class Category < BaseObject
     attr_accessor :id, :name
@@ -18,8 +18,8 @@ def self.attribute_map
     # attribute type
     def self.swagger_types
       {
-        :'id' => :'int',
-        :'name' => :'string'
+        :'id' => :'Integer',
+        :'name' => :'String'
         
       }
     end
@@ -32,13 +32,14 @@ def initialize(attributes = {})
 
       
       if attributes[:'id']
-        @id = attributes[:'id']
+        self.id = attributes[:'id']
       end
       
       if attributes[:'name']
-        @name = attributes[:'name']
+        self.name = attributes[:'name']
       end
       
     end
+
   end
 end
diff --git a/samples/client/petstore/ruby/lib/swagger_client/models/order.rb b/samples/client/petstore/ruby/lib/petstore/models/order.rb
similarity index 63%
rename from samples/client/petstore/ruby/lib/swagger_client/models/order.rb
rename to samples/client/petstore/ruby/lib/petstore/models/order.rb
index 3fe0282ed9b..ab6f8f00189 100644
--- a/samples/client/petstore/ruby/lib/swagger_client/models/order.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/order.rb
@@ -1,4 +1,4 @@
-module SwaggerClient
+module Petstore
   # 
   class Order < BaseObject
     attr_accessor :id, :pet_id, :quantity, :ship_date, :status, :complete
@@ -30,12 +30,12 @@ def self.attribute_map
     # attribute type
     def self.swagger_types
       {
-        :'id' => :'int',
-        :'pet_id' => :'int',
-        :'quantity' => :'int',
+        :'id' => :'Integer',
+        :'pet_id' => :'Integer',
+        :'quantity' => :'Integer',
         :'ship_date' => :'DateTime',
-        :'status' => :'string',
-        :'complete' => :'boolean'
+        :'status' => :'String',
+        :'complete' => :'BOOLEAN'
         
       }
     end
@@ -48,29 +48,38 @@ def initialize(attributes = {})
 
       
       if attributes[:'id']
-        @id = attributes[:'id']
+        self.id = attributes[:'id']
       end
       
       if attributes[:'petId']
-        @pet_id = attributes[:'petId']
+        self.pet_id = attributes[:'petId']
       end
       
       if attributes[:'quantity']
-        @quantity = attributes[:'quantity']
+        self.quantity = attributes[:'quantity']
       end
       
       if attributes[:'shipDate']
-        @ship_date = attributes[:'shipDate']
+        self.ship_date = attributes[:'shipDate']
       end
       
       if attributes[:'status']
-        @status = attributes[:'status']
+        self.status = attributes[:'status']
       end
       
       if attributes[:'complete']
-        @complete = attributes[:'complete']
+        self.complete = attributes[:'complete']
       end
       
     end
+
+    def status=(status)
+      allowed_values = ["placed", "approved", "delivered"]
+      if status && !allowed_values.include?(status)
+        fail "invalid value for 'status', must be one of #{allowed_values}"
+      end
+      @status = status
+    end
+
   end
 end
diff --git a/samples/client/petstore/ruby/lib/swagger_client/models/pet.rb b/samples/client/petstore/ruby/lib/petstore/models/pet.rb
similarity index 66%
rename from samples/client/petstore/ruby/lib/swagger_client/models/pet.rb
rename to samples/client/petstore/ruby/lib/petstore/models/pet.rb
index 32f95646c72..a208cf3f87c 100644
--- a/samples/client/petstore/ruby/lib/swagger_client/models/pet.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/pet.rb
@@ -1,4 +1,4 @@
-module SwaggerClient
+module Petstore
   # 
   class Pet < BaseObject
     attr_accessor :id, :category, :name, :photo_urls, :tags, :status
@@ -30,12 +30,12 @@ def self.attribute_map
     # attribute type
     def self.swagger_types
       {
-        :'id' => :'int',
+        :'id' => :'Integer',
         :'category' => :'Category',
-        :'name' => :'string',
-        :'photo_urls' => :'array[string]',
-        :'tags' => :'array[Tag]',
-        :'status' => :'string'
+        :'name' => :'String',
+        :'photo_urls' => :'Array<String>',
+        :'tags' => :'Array<Tag>',
+        :'status' => :'String'
         
       }
     end
@@ -48,33 +48,42 @@ def initialize(attributes = {})
 
       
       if attributes[:'id']
-        @id = attributes[:'id']
+        self.id = attributes[:'id']
       end
       
       if attributes[:'category']
-        @category = attributes[:'category']
+        self.category = attributes[:'category']
       end
       
       if attributes[:'name']
-        @name = attributes[:'name']
+        self.name = attributes[:'name']
       end
       
       if attributes[:'photoUrls']
         if (value = attributes[:'photoUrls']).is_a?(Array)
-          @photo_urls = value
+          self.photo_urls = value
         end
       end
       
       if attributes[:'tags']
         if (value = attributes[:'tags']).is_a?(Array)
-          @tags = value
+          self.tags = value
         end
       end
       
       if attributes[:'status']
-        @status = attributes[:'status']
+        self.status = attributes[:'status']
       end
       
     end
+
+    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
+
   end
 end
diff --git a/samples/client/petstore/ruby/lib/swagger_client/models/tag.rb b/samples/client/petstore/ruby/lib/petstore/models/tag.rb
similarity index 82%
rename from samples/client/petstore/ruby/lib/swagger_client/models/tag.rb
rename to samples/client/petstore/ruby/lib/petstore/models/tag.rb
index 9c5cdde1af6..3fb5e1f969c 100644
--- a/samples/client/petstore/ruby/lib/swagger_client/models/tag.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/tag.rb
@@ -1,4 +1,4 @@
-module SwaggerClient
+module Petstore
   # 
   class Tag < BaseObject
     attr_accessor :id, :name
@@ -18,8 +18,8 @@ def self.attribute_map
     # attribute type
     def self.swagger_types
       {
-        :'id' => :'int',
-        :'name' => :'string'
+        :'id' => :'Integer',
+        :'name' => :'String'
         
       }
     end
@@ -32,13 +32,14 @@ def initialize(attributes = {})
 
       
       if attributes[:'id']
-        @id = attributes[:'id']
+        self.id = attributes[:'id']
       end
       
       if attributes[:'name']
-        @name = attributes[:'name']
+        self.name = attributes[:'name']
       end
       
     end
+
   end
 end
diff --git a/samples/client/petstore/ruby/lib/swagger_client/models/user.rb b/samples/client/petstore/ruby/lib/petstore/models/user.rb
similarity index 68%
rename from samples/client/petstore/ruby/lib/swagger_client/models/user.rb
rename to samples/client/petstore/ruby/lib/petstore/models/user.rb
index 2d723da54c4..3a6d5f354e0 100644
--- a/samples/client/petstore/ruby/lib/swagger_client/models/user.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/user.rb
@@ -1,4 +1,4 @@
-module SwaggerClient
+module Petstore
   # 
   class User < BaseObject
     attr_accessor :id, :username, :first_name, :last_name, :email, :password, :phone, :user_status
@@ -36,14 +36,14 @@ def self.attribute_map
     # attribute type
     def self.swagger_types
       {
-        :'id' => :'int',
-        :'username' => :'string',
-        :'first_name' => :'string',
-        :'last_name' => :'string',
-        :'email' => :'string',
-        :'password' => :'string',
-        :'phone' => :'string',
-        :'user_status' => :'int'
+        :'id' => :'Integer',
+        :'username' => :'String',
+        :'first_name' => :'String',
+        :'last_name' => :'String',
+        :'email' => :'String',
+        :'password' => :'String',
+        :'phone' => :'String',
+        :'user_status' => :'Integer'
         
       }
     end
@@ -56,37 +56,38 @@ def initialize(attributes = {})
 
       
       if attributes[:'id']
-        @id = attributes[:'id']
+        self.id = attributes[:'id']
       end
       
       if attributes[:'username']
-        @username = attributes[:'username']
+        self.username = attributes[:'username']
       end
       
       if attributes[:'firstName']
-        @first_name = attributes[:'firstName']
+        self.first_name = attributes[:'firstName']
       end
       
       if attributes[:'lastName']
-        @last_name = attributes[:'lastName']
+        self.last_name = attributes[:'lastName']
       end
       
       if attributes[:'email']
-        @email = attributes[:'email']
+        self.email = attributes[:'email']
       end
       
       if attributes[:'password']
-        @password = attributes[:'password']
+        self.password = attributes[:'password']
       end
       
       if attributes[:'phone']
-        @phone = attributes[:'phone']
+        self.phone = attributes[:'phone']
       end
       
       if attributes[:'userStatus']
-        @user_status = attributes[:'userStatus']
+        self.user_status = attributes[:'userStatus']
       end
       
     end
+
   end
 end
diff --git a/samples/client/petstore/ruby/lib/swagger_client/swagger.rb b/samples/client/petstore/ruby/lib/petstore/swagger.rb
similarity index 78%
rename from samples/client/petstore/ruby/lib/swagger_client/swagger.rb
rename to samples/client/petstore/ruby/lib/petstore/swagger.rb
index 2e2632c169d..4f1433d3286 100644
--- a/samples/client/petstore/ruby/lib/swagger_client/swagger.rb
+++ b/samples/client/petstore/ruby/lib/petstore/swagger.rb
@@ -1,7 +1,4 @@
-require 'logger'
-require 'json'
-
-module SwaggerClient
+module Petstore
   module Swagger
     class << self
       attr_accessor :logger
@@ -25,8 +22,7 @@ class << self
       def configure
         yield(configuration) if block_given?
 
-        # Configure logger.  Default to use Rails
-        self.logger ||= configuration.logger || (defined?(Rails) ? Rails.logger : Logger.new(STDOUT))
+        self.logger = configuration.logger
 
         # remove :// from scheme
         configuration.scheme.sub!(/:\/\//, '')
@@ -41,7 +37,7 @@ def configure
       end
 
       def authenticated?
-        Swagger.configuration.auth_token.present?
+        !Swagger.configuration.auth_token.nil?
       end
 
       def de_authenticate
@@ -51,8 +47,8 @@ def de_authenticate
       def authenticate
         return if Swagger.authenticated?
 
-        if Swagger.configuration.username.blank? || Swagger.configuration.password.blank?
-          raise ClientError, "Username and password are required to authenticate."
+        if Swagger.configuration.username.nil? || Swagger.configuration.password.nil?
+          raise ApiError, "Username and password are required to authenticate."
         end
 
         request = Swagger::Request.new(
@@ -67,12 +63,14 @@ def authenticate
         response_body = request.response.body
         Swagger.configuration.auth_token = response_body['token']
       end
-    end
-  end
 
-  class ServerError < StandardError
-  end
+      def last_response
+        Thread.current[:swagger_last_response]
+      end
 
-  class ClientError < StandardError
+      def last_response=(response)
+        Thread.current[:swagger_last_response] = response
+      end
+    end
   end
 end
diff --git a/samples/client/petstore/ruby/lib/petstore/swagger/api_error.rb b/samples/client/petstore/ruby/lib/petstore/swagger/api_error.rb
new file mode 100644
index 00000000000..9eab46b6eec
--- /dev/null
+++ b/samples/client/petstore/ruby/lib/petstore/swagger/api_error.rb
@@ -0,0 +1,26 @@
+module Petstore
+  module Swagger
+    class ApiError < StandardError
+      attr_reader :code, :response_headers, :response_body
+
+      # Usage examples:
+      #   ApiError.new
+      #   ApiError.new("message")
+      #   ApiError.new(:code => 500, :response_headers => {}, :response_body => "")
+      #   ApiError.new(:code => 404, :message => "Not Found")
+      def initialize(arg = nil)
+        if arg.is_a? Hash
+          arg.each do |k, v|
+            if k.to_s == 'message'
+              super v
+            else
+              instance_variable_set "@#{k}", v
+            end
+          end
+        else
+          super arg
+        end
+      end
+    end
+  end
+end
diff --git a/samples/client/petstore/ruby/lib/petstore/swagger/configuration.rb b/samples/client/petstore/ruby/lib/petstore/swagger/configuration.rb
new file mode 100644
index 00000000000..d7cc3d734e0
--- /dev/null
+++ b/samples/client/petstore/ruby/lib/petstore/swagger/configuration.rb
@@ -0,0 +1,101 @@
+require 'logger'
+
+module Petstore
+  module Swagger
+    class Configuration
+      attr_accessor :scheme, :host, :base_path, :user_agent, :format, :auth_token, :inject_format, :force_ending_format
+
+      # Defines the username used with HTTP basic authentication.
+      #
+      # @return [String]
+      attr_accessor :username
+
+      # Defines the password used with HTTP basic authentication.
+      #
+      # @return [String]
+      attr_accessor :password
+
+      # Defines API keys used with API Key authentications.
+      #
+      # @return [Hash] key: parameter name, value: parameter value (API key)
+      #
+      # @example parameter name is "api_key", API key is "xxx" (e.g. "api_key=xxx" in query string)
+      #   config.api_key['api_key'] = 'xxx'
+      attr_accessor :api_key
+
+      # Defines API key prefixes used with API Key authentications.
+      #
+      # @return [Hash] key: parameter name, value: API key prefix
+      #
+      # @example parameter name is "Authorization", API key prefix is "Token" (e.g. "Authorization: Token xxx" in headers)
+      #   config.api_key_prefix['api_key'] = 'Token'
+      attr_accessor :api_key_prefix
+
+      # Set this to false to skip verifying SSL certificate when calling API from https server.
+      # Default to true.
+      #
+      # @note Do NOT set it to false in production code, otherwise you would face multiple types of cryptographic attacks.
+      #
+      # @return [true, false]
+      attr_accessor :verify_ssl
+
+      # Set this to customize the certificate file to verify the peer.
+      #
+      # @return [String] the path to the certificate file
+      #
+      # @see The `cainfo` option of Typhoeus, `--cert` option of libcurl. Related source code:
+      # https://github.com/typhoeus/typhoeus/blob/master/lib/typhoeus/easy_factory.rb#L145
+      attr_accessor :ssl_ca_cert
+
+      # Set this to enable/disable debugging. When enabled (set to true), HTTP request/response
+      # details will be logged with `logger.debug` (see the `logger` attribute).
+      # Default to false.
+      #
+      # @return [true, false]
+      attr_accessor :debug
+
+      # Defines the logger used for debugging.
+      # Default to `Rails.logger` (when in Rails) or logging to STDOUT.
+      #
+      # @return [#debug]
+      attr_accessor :logger
+
+      # Defines the temporary folder to store downloaded files
+      # (for API endpoints that have file response).
+      # Default to use `Tempfile`.
+      #
+      # @return [String]
+      attr_accessor :temp_folder_path
+
+      # Defines the headers to be used in HTTP requests of all API calls by default.
+      #
+      # @return [Hash]
+      attr_accessor :default_headers
+
+      # Defaults go in here..
+      def initialize
+        @format = 'json'
+        @scheme = 'http'
+        @host = 'petstore.swagger.io'
+        @base_path = '/v2'
+        @user_agent = "ruby-swagger-#{Swagger::VERSION}"
+        @inject_format = false
+        @force_ending_format = false
+
+        @default_headers = {
+          'Content-Type' => "application/#{@format.downcase}",
+          'User-Agent' => @user_agent
+        }
+
+        # keys for API key authentication (param-name => api-key)
+        @api_key = {}
+        @api_key_prefix = {}
+
+        @verify_ssl = true
+
+        @debug = false
+        @logger = defined?(Rails) ? Rails.logger : Logger.new(STDOUT)
+      end
+    end
+  end
+end
diff --git a/samples/client/petstore/ruby/lib/swagger_client/swagger/request.rb b/samples/client/petstore/ruby/lib/petstore/swagger/request.rb
similarity index 57%
rename from samples/client/petstore/ruby/lib/swagger_client/swagger/request.rb
rename to samples/client/petstore/ruby/lib/petstore/swagger/request.rb
index 4cd5d84b0b9..ecb8cff5643 100644
--- a/samples/client/petstore/ruby/lib/swagger_client/swagger/request.rb
+++ b/samples/client/petstore/ruby/lib/petstore/swagger/request.rb
@@ -1,41 +1,35 @@
-module SwaggerClient
+require 'uri'
+require 'typhoeus'
+
+module Petstore
   module Swagger
     class Request
-      require 'uri'
-      require 'addressable/uri'
-      require 'typhoeus'
-
-      attr_accessor :host, :path, :format, :params, :body, :http_method, :headers, :form_params, :auth_names
+      attr_accessor :host, :path, :format, :params, :body, :http_method, :headers, :form_params, :auth_names, :response
 
       # All requests must have an HTTP method and a path
       # Optionals parameters are :params, :headers, :body, :format, :host
-      def initialize(http_method, path, attributes={})
-        attributes[:format] ||= Swagger.configuration.format
-        attributes[:params] ||= {}
+      def initialize(http_method, path, attributes = {})
+        @http_method = http_method.to_sym.downcase
+        @path = path
 
-        # Set default headers
-        default_headers = {
-          'Content-Type' => "application/#{attributes[:format].downcase}",
-          'User-Agent' => Swagger.configuration.user_agent
-        }
+        attributes.each { |name, value| send "#{name}=", value }
 
-        # Merge argument headers into defaults
-        attributes[:headers] = default_headers.merge(attributes[:headers] || {})
+        @format ||= Swagger.configuration.format
+        @params ||= {}
+
+        # Apply default headers
+        @headers = Swagger.configuration.default_headers.merge(@headers || {})
 
         # Stick in the auth token if there is one
         if Swagger.authenticated?
-          attributes[:headers].merge!({:auth_token => Swagger.configuration.auth_token})
-        end
-
-        self.http_method = http_method.to_sym
-        self.path = path
-        attributes.each do |name, value|
-          send("#{name.to_s.underscore.to_sym}=", value)
+          @headers.merge!({:auth_token => Swagger.configuration.auth_token})
         end
-
+        
         update_params_for_auth!
+        
       end
 
+      
       # Update hearder and query params based on authentication settings.
       def update_params_for_auth!
         (@auth_names || []).each do |auth_name|
@@ -49,30 +43,23 @@ def update_params_for_auth!
           end
         end
       end
+      
 
       # Get API key (with prefix if set).
       # @param [String] param_name the parameter name of API key auth
       def get_api_key_with_prefix(param_name)
-        if Swagger.configuration.api_key_prefix[param_name].present?
+        if Swagger.configuration.api_key_prefix[param_name]
           "#{Swagger.configuration.api_key_prefix[param_name]} #{Swagger.configuration.api_key[param_name]}"
         else
           Swagger.configuration.api_key[param_name]
         end
       end
 
-      # Construct a base URL
+      # Construct the request URL.
       def url(options = {})
-        u = Addressable::URI.new(
-          :scheme => Swagger.configuration.scheme,
-          :host => Swagger.configuration.host,
-          :path => self.interpreted_path,
-          :query => self.query_string.sub(/\?/, '')
-        ).to_s
-
-        # Drop trailing question mark, if present
-        u.sub! /\?$/, ''
-
-        u
+        _path = self.interpreted_path
+        _path = "/#{_path}" unless _path.start_with?('/')
+        "#{Swagger.configuration.scheme}://#{Swagger.configuration.host}#{_path}"
       end
 
       # Iterate over the params hash, injecting any path values into the path string
@@ -103,18 +90,6 @@ def interpreted_path
         URI.encode [Swagger.configuration.base_path, p].join("/").gsub(/\/+/, '/')
       end
 
-      # Massage the request body into a state of readiness
-      # If body is a hash, camelize all keys then convert to a json string
-      def body=(value)
-        if value.is_a?(Hash)
-          value = value.inject({}) do |memo, (k,v)|
-            memo[k.to_s.camelize(:lower).to_sym] = v
-            memo
-          end
-        end
-        @body = value
-      end
-
       # If body is an object, JSONify it before making the actual request.
       # For form parameters, remove empty value
       def outgoing_body
@@ -124,93 +99,60 @@ def outgoing_body
           data.each do |key, value|
             data[key] = value.to_s if value && !value.is_a?(File) # remove emtpy form parameter
           end
-          data
         elsif @body # http body is JSON
-          @body.is_a?(String) ? @body : @body.to_json
+          data = @body.is_a?(String) ? @body : @body.to_json
         else
-          nil
+          data = nil
         end
-      end
 
-      # Construct a query string from the query-string-type params
-      def query_string
-        # Iterate over all params,
-        # .. removing the ones that are part of the path itself.
-        # .. stringifying values so Addressable doesn't blow up.
-        query_values = {}
-        self.params.each_pair do |key, value|
-          next if self.path.include? "{#{key}}"                                   # skip path params
-          next if value.blank? && value.class != FalseClass                       # skip empties
-          if Swagger.configuration.camelize_params
-            key = key.to_s.camelize(:lower).to_sym
-          end
-          query_values[key] = value.to_s
+        if Swagger.configuration.debug
+          Swagger.logger.debug "HTTP request body param ~BEGIN~\n#{data}\n~END~\n"
         end
 
-        # We don't want to end up with '?' as our query string
-        # if there aren't really any params
-        return "" if query_values.blank?
-
-        # Addressable requires query_values to be set after initialization..
-        qs = Addressable::URI.new
-        qs.query_values = query_values
-        qs.to_s
+        data
       end
 
       def make
-        #TODO use configuration setting to determine if debugging
-        #logger = Logger.new STDOUT
-        #logger.debug self.url
-
         request_options = {
+          :method => self.http_method,
+          :headers => self.headers,
+          :params => self.params,
           :ssl_verifypeer => Swagger.configuration.verify_ssl,
-          :headers => self.headers.stringify_keys
+          :cainfo => Swagger.configuration.ssl_ca_cert,
+          :verbose => Swagger.configuration.debug
         }
-        response = case self.http_method.to_sym
-        when :get,:GET
-          Typhoeus::Request.get(
-            self.url,
-            request_options
-          )
 
-        when :post,:POST
-          Typhoeus::Request.post(
-            self.url,
-            request_options.merge(:body => self.outgoing_body)
-          )
+        if [:post, :patch, :put, :delete].include?(self.http_method)
+          request_options.update :body => self.outgoing_body
+        end
 
-        when :patch,:PATCH
-          Typhoeus::Request.patch(
-            self.url,
-            request_options.merge(:body => self.outgoing_body)
-          )
+        raw = Typhoeus::Request.new(self.url, request_options).run
+        @response = Response.new(raw)
 
-        when :put,:PUT
-          Typhoeus::Request.put(
-            self.url,
-            request_options.merge(:body => self.outgoing_body)
-          )
+        if Swagger.configuration.debug
+          Swagger.logger.debug "HTTP response body ~BEGIN~\n#{@response.body}\n~END~\n"
+        end
 
-        when :delete,:DELETE
-          Typhoeus::Request.delete(
-            self.url,
-            request_options.merge(:body => self.outgoing_body)
-          )
+        # record as last response
+        Swagger.last_response = @response
+
+        unless @response.success?
+          fail ApiError.new(:code => @response.code,
+                            :response_headers => @response.headers,
+                            :response_body => @response.body),
+               @response.status_message
         end
-        Response.new(response)
-      end
 
-      def response
-        self.make
+        @response
       end
 
       def response_code_pretty
-        return unless @response.present?
+        return unless @response
         @response.code.to_s
       end
 
       def response_headers_pretty
-        return unless @response.present?
+        return unless @response
         # JSON.pretty_generate(@response.headers).gsub(/\n/, '<br/>') # <- This was for RestClient
         @response.headers.gsub(/\n/, '<br/>') # <- This is for Typhoeus
       end
diff --git a/samples/client/petstore/ruby/lib/petstore/swagger/response.rb b/samples/client/petstore/ruby/lib/petstore/swagger/response.rb
new file mode 100644
index 00000000000..2ab9be1a5b9
--- /dev/null
+++ b/samples/client/petstore/ruby/lib/petstore/swagger/response.rb
@@ -0,0 +1,156 @@
+module Petstore
+  module Swagger
+    class Response
+      require 'json'
+      require 'date'
+      require 'tempfile'
+
+      attr_accessor :raw
+
+      def initialize(raw)
+        self.raw = raw
+      end
+
+      def code
+        raw.code
+      end
+
+      def status_message
+        raw.status_message
+      end
+
+      def body
+        raw.body
+      end
+
+      def success?
+        raw.success?
+      end
+
+      # Deserialize the raw response body to the given return type.
+      #
+      # @param [String] return_type some examples: "User", "Array[User]", "Hash[String,Integer]"
+      def deserialize(return_type)
+        return nil if body.nil? || body.empty?
+
+        # handle file downloading - save response body into a tmp file and return the File instance
+        return download_file if return_type == 'File'
+
+        # ensuring a default content type
+        content_type = raw.headers['Content-Type'] || 'application/json'
+
+        unless content_type.start_with?('application/json')
+          fail "Content-Type is not supported: #{content_type}"
+        end
+
+        begin
+          data = JSON.parse("[#{body}]", :symbolize_names => true)[0]
+        rescue JSON::ParserError => e
+          if %w(String Date DateTime).include?(return_type)
+            data = body
+          else
+            raise e
+          end
+        end
+
+        convert_to_type data, return_type
+      end
+
+      # Convert data to the given return type.
+      def convert_to_type(data, return_type)
+        return nil if data.nil?
+        case return_type
+        when 'String'
+          data.to_s
+        when 'Integer'
+          data.to_i
+        when 'Float'
+          data.to_f
+        when 'BOOLEAN'
+          data == true
+        when 'DateTime'
+          # parse date time (expecting ISO 8601 format)
+          DateTime.parse data
+        when 'Date'
+          # parse date time (expecting ISO 8601 format)
+          Date.parse data
+        when 'Object'
+          # generic object, return directly
+          data
+        when /\AArray<(.+)>\z/
+          # e.g. Array<Pet>
+          sub_type = $1
+          data.map {|item| convert_to_type(item, sub_type) }
+        when /\AHash\<String, (.+)\>\z/
+          # e.g. Hash<String, Integer>
+          sub_type = $1
+          {}.tap do |hash|
+            data.each {|k, v| hash[k] = convert_to_type(v, sub_type) }
+          end
+        else
+          # models, e.g. Pet
+          Petstore.const_get(return_type).new.tap do |model|
+            model.build_from_hash data
+          end
+        end
+      end
+
+      # Save response body into a file in (the defined) temporary folder, using the filename
+      # from the "Content-Disposition" header if provided, otherwise a random filename.
+      #
+      # @see Configuration#temp_folder_path
+      # @return [File] the file downloaded
+      def download_file
+        tmp_file = Tempfile.new '', Swagger.configuration.temp_folder_path
+        content_disposition = raw.headers['Content-Disposition']
+        if content_disposition
+          filename = content_disposition[/filename=['"]?([^'"\s]+)['"]?/, 1]
+          path = File.join File.dirname(tmp_file), filename
+        else
+          path = tmp_file.path
+        end
+        # close and delete temp file
+        tmp_file.close!
+
+        File.open(path, 'w') { |file| file.write(raw.body) }
+        Swagger.logger.info "File written to #{path}. Please move the file to a proper folder for further processing and delete the temp afterwards"
+        return File.new(path)
+      end
+
+      # `headers_hash` is a Typhoeus-specific extension of Hash,
+      # so simplify it back into a regular old Hash.
+      def headers
+        h = {}
+        raw.headers_hash.each {|k,v| h[k] = v }
+        h
+      end
+
+      # Extract the response format from the header hash
+      # e.g. {'Content-Type' => 'application/json'}
+      def format
+        headers['Content-Type'].split("/").last.downcase
+      end
+
+      def json?
+        format == 'json'
+      end
+
+      def xml?
+        format == 'xml'
+      end
+
+      def pretty_body
+        return unless body
+        if format == 'json'
+          JSON.pretty_generate(JSON.parse(body)).gsub(/\n/, '<br/>')
+        else
+          body
+        end
+      end
+
+      def pretty_headers
+        JSON.pretty_generate(headers).gsub(/\n/, '<br/>')
+      end
+    end
+  end
+end
diff --git a/samples/client/petstore/ruby/lib/swagger_client/swagger/version.rb b/samples/client/petstore/ruby/lib/petstore/swagger/version.rb
similarity index 70%
rename from samples/client/petstore/ruby/lib/swagger_client/swagger/version.rb
rename to samples/client/petstore/ruby/lib/petstore/swagger/version.rb
index c6e8d5aee53..ff3c48bb59e 100644
--- a/samples/client/petstore/ruby/lib/swagger_client/swagger/version.rb
+++ b/samples/client/petstore/ruby/lib/petstore/swagger/version.rb
@@ -1,4 +1,4 @@
-module SwaggerClient
+module Petstore
   module Swagger
     VERSION = "1.0.0"
   end
diff --git a/samples/client/petstore/ruby/lib/swagger_client.rb b/samples/client/petstore/ruby/lib/swagger_client.rb
deleted file mode 100644
index 998658c8b6e..00000000000
--- a/samples/client/petstore/ruby/lib/swagger_client.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# Swagger common files
-require 'swagger_client/monkey'
-require 'swagger_client/swagger'
-require 'swagger_client/swagger/configuration'
-require 'swagger_client/swagger/request'
-require 'swagger_client/swagger/response'
-require 'swagger_client/swagger/version'
-
-# Models
-require 'swagger_client/models/base_object'
-require 'swagger_client/models/user'
-require 'swagger_client/models/category'
-require 'swagger_client/models/pet'
-require 'swagger_client/models/tag'
-require 'swagger_client/models/order'
-
-# APIs
-require 'swagger_client/api/user_api'
-require 'swagger_client/api/store_api'
-require 'swagger_client/api/pet_api'
-
-module SwaggerClient
-  # Initialize the default configuration
-  Swagger.configuration ||= Swagger::Configuration.new
-end
diff --git a/samples/client/petstore/ruby/lib/swagger_client/monkey.rb b/samples/client/petstore/ruby/lib/swagger_client/monkey.rb
deleted file mode 100644
index 28932890af9..00000000000
--- a/samples/client/petstore/ruby/lib/swagger_client/monkey.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-# module Swagger
-  class Object 
-  
-    unless Object.method_defined? :blank?
-      def blank?
-        respond_to?(:empty?) ? empty? : !self
-      end
-    end
-  
-    unless Object.method_defined? :present?
-      def present?
-        !blank?
-      end
-    end
-
-  end
-
-  class String
-
-    unless String.method_defined? :underscore
-      def underscore
-        self.gsub(/::/, '/').
-        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-        gsub(/([a-z\d])([A-Z])/,'\1_\2').
-        tr("-", "_").
-        downcase
-      end
-    end
-  
-    unless String.method_defined? :camelize
-      def camelize(first_letter_in_uppercase = true)
-        if first_letter_in_uppercase != :lower
-          self.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
-        else
-          self.to_s[0].chr.downcase + camelize(self)[1..-1]
-        end
-      end
-    end
-
-  end
-
-  class Hash
-
-    unless Hash.method_defined? :stringify_keys    
-      def stringify_keys
-        inject({}) do |options, (key, value)|
-          options[key.to_s] = value
-          options
-        end
-      end
-    end
-    
-    unless Hash.method_defined? :stringify_keys!
-      def stringify_keys!
-        self.replace(self.stringify_keys)
-      end
-    end
-
-    unless Hash.method_defined? :symbolize_keys
-      def symbolize_keys
-        inject({}) do |options, (key, value)|
-          options[(key.to_sym rescue key) || key] = value
-          options
-        end
-      end
-    end
-  
-    unless Hash.method_defined? :symbolize_keys!
-      def symbolize_keys!
-        self.replace(self.symbolize_keys)
-      end
-    end
-
-    unless Hash.method_defined? :symbolize_and_underscore_keys
-      def symbolize_and_underscore_keys
-        inject({}) do |options, (key, value)|
-          options[(key.to_s.underscore.to_sym rescue key) || key] = value
-          options
-        end
-      end
-    end
-
-    unless Hash.method_defined? :symbolize_and_underscore_keys!
-      def symbolize_and_underscore_keys!
-        self.replace(self.symbolize_and_underscore_keys)
-      end
-    end
-  
-  end
-# end
\ No newline at end of file
diff --git a/samples/client/petstore/ruby/lib/swagger_client/swagger/configuration.rb b/samples/client/petstore/ruby/lib/swagger_client/swagger/configuration.rb
deleted file mode 100644
index a2d4fe0e291..00000000000
--- a/samples/client/petstore/ruby/lib/swagger_client/swagger/configuration.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-module SwaggerClient
-  module Swagger
-    class Configuration
-      attr_accessor :format, :api_key, :api_key_prefix, :username, :password, :auth_token, :scheme, :host, :base_path, :user_agent, :logger, :inject_format, :force_ending_format, :camelize_params, :user_agent, :verify_ssl
-
-      # Defaults go in here..
-      def initialize
-        @format = 'json'
-        @scheme = 'http'
-        @host = 'petstore.swagger.io'
-        @base_path = '/v2'
-        @user_agent = "ruby-swagger-#{Swagger::VERSION}"
-        @inject_format = false
-        @force_ending_format = false
-        @camelize_params = true
-
-        # keys for API key authentication (param-name => api-key)
-        @api_key = {}
-        # api-key prefix for API key authentication, e.g. "Bearer" (param-name => api-key-prefix)
-        @api_key_prefix = {}
-
-        # whether to verify SSL certificate, default to true
-        # Note: do NOT set it to false in production code, otherwise you would
-        #   face multiple types of cryptographic attacks
-        @verify_ssl = true
-      end
-    end
-  end
-end
diff --git a/samples/client/petstore/ruby/lib/swagger_client/swagger/response.rb b/samples/client/petstore/ruby/lib/swagger_client/swagger/response.rb
deleted file mode 100644
index 538821bea69..00000000000
--- a/samples/client/petstore/ruby/lib/swagger_client/swagger/response.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-module SwaggerClient
-  module Swagger
-    class Response
-      require 'json'
-
-      attr_accessor :raw
-
-      def initialize(raw)
-        self.raw = raw
-
-        case self.code
-        when 500..510 then raise(ServerError, self.error_message)
-        when 299..426 then raise(ClientError, self.error_message)
-        end
-      end
-
-      def code
-        raw.code
-      end
-
-      # Account for error messages that take different forms...
-      def error_message
-        body['message']
-      rescue
-        body
-      end
-
-      # If body is JSON, parse it
-      # Otherwise return raw string
-      def body
-        JSON.parse(raw.body, :symbolize_names => true)
-      rescue
-        raw.body
-      end
-
-      # `headers_hash` is a Typhoeus-specific extension of Hash,
-      # so simplify it back into a regular old Hash.
-      def headers
-        h = {}
-        raw.headers_hash.each {|k,v| h[k] = v }
-        h
-      end
-
-      # Extract the response format from the header hash
-      # e.g. {'Content-Type' => 'application/json'}
-      def format
-        headers['Content-Type'].split("/").last.downcase
-      end
-
-      def json?
-        format == 'json'
-      end
-
-      def xml?
-        format == 'xml'
-      end
-
-      def pretty_body
-        return unless body.present?
-        case format
-        when 'json' then JSON.pretty_generate(body).gsub(/\n/, '<br/>')
-        end
-      end
-
-      def pretty_headers
-        JSON.pretty_generate(headers).gsub(/\n/, '<br/>')
-      end
-    end
-  end
-end
diff --git a/samples/client/petstore/ruby/swagger_client.gemspec b/samples/client/petstore/ruby/petstore.gemspec
similarity index 86%
rename from samples/client/petstore/ruby/swagger_client.gemspec
rename to samples/client/petstore/ruby/petstore.gemspec
index c0d507b3c5b..40a169d1741 100644
--- a/samples/client/petstore/ruby/swagger_client.gemspec
+++ b/samples/client/petstore/ruby/petstore.gemspec
@@ -1,10 +1,10 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "swagger_client/swagger/version"
+require "petstore/swagger/version"
 
 Gem::Specification.new do |s|
-  s.name        = "swagger_client"
-  s.version     = SwaggerClient::Swagger::VERSION
+  s.name        = "petstore"
+  s.version     = Petstore::Swagger::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Zeke Sikelianos", "Tony Tam"]
   s.email       = ["zeke@wordnik.com", "fehguy@gmail.com"]
@@ -14,7 +14,6 @@ Gem::Specification.new do |s|
   s.license     = "Apache-2.0"
 
   s.add_runtime_dependency 'typhoeus', '~> 0.2', '>= 0.2.1'
-  s.add_runtime_dependency 'addressable', '~> 2.2', '>= 2.2.4'
   s.add_runtime_dependency 'json', '~> 1.4', '>= 1.4.6'
 
   s.add_development_dependency 'rspec', '~> 3.2', '>= 3.2.0'
diff --git a/samples/client/petstore/ruby/spec/monkey_spec.rb b/samples/client/petstore/ruby/spec/monkey_spec.rb
deleted file mode 100644
index 71c04921f1a..00000000000
--- a/samples/client/petstore/ruby/spec/monkey_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'spec_helper'
-
-describe String do
-
-  it "underscores" do
-    "thisIsATest".underscore.should == "this_is_a_test"
-  end
-  
-  it "camelizes" do
-    "camel_toe".camelize.should == "CamelToe"
-  end
-
-  it "camelizes with leading minisculity" do
-    "dromedary_larry".camelize(:lower).should == "dromedaryLarry"
-  end
-  
-end
-
-describe Hash do
-  
-  it "symbolizes keys" do
-    h = {'a' => 1, :b => 2 }
-    h.symbolize_keys.should be_a Hash
-    h.symbolize_keys.keys.should == [:a, :b]
-  end
-
-  it "symbolizes and underscores keys" do
-    h = {'assHat' => 1, :bargainBasement => 2 }
-    h.symbolize_and_underscore_keys.should be_a Hash
-    h.symbolize_and_underscore_keys.keys.should == [:ass_hat, :bargain_basement]
-  end
-
-end
\ No newline at end of file
diff --git a/samples/client/petstore/ruby/spec/pet_spec.rb b/samples/client/petstore/ruby/spec/pet_spec.rb
index 68858c7b6cd..8c33c3a9cde 100644
--- a/samples/client/petstore/ruby/spec/pet_spec.rb
+++ b/samples/client/petstore/ruby/spec/pet_spec.rb
@@ -9,14 +9,19 @@
 
   describe "pet methods" do
     it "should construct a new pet object" do
-      tag1 = SwaggerClient::Tag.new({'id' => 1, 'name'=> 'tag1'})
-      tag2 = SwaggerClient::Tag.new({'id' => 2, 'name'=> 'tag2'})
-      category1 = SwaggerClient::Category.new({:id => 1, :name => 'category unknown'})
+      tag1 = Petstore::Tag.new({'id' => 1, 'name'=> 'tag1'})
+      tag2 = Petstore::Tag.new({'id' => 2, 'name'=> 'tag2'})
+      category1 = Petstore::Category.new({:id => 1, :name => 'category unknown'})
       # initalize using both string and symbol key
-      pet_hash = {:'id' => 10002, :'name' => "RUBY UNIT TESTING", :'status' => "pending",
-              :'photo_urls' => ["url1", "url2"], :'category' => category1,
-              :'tags' => [tag1, tag2]}
-      pet = SwaggerClient::Pet.new(pet_hash)
+      pet_hash = {
+        :id => 10002,
+        :name => "RUBY UNIT TESTING",
+        :status => "pending",
+        :photo_urls => ["url1", "url2"],
+        :category => category1,
+        :tags => [tag1, tag2]
+      }
+      pet = Petstore::Pet.new(pet_hash)
       # test new
       pet.name.should == "RUBY UNIT TESTING"
       pet.status.should == "pending"
@@ -26,7 +31,7 @@
       pet.category.name.should == 'category unknown'
 
       # test build_from_hash
-      pet2 = SwaggerClient::Pet.new
+      pet2 = Petstore::Pet.new
       pet2.build_from_hash(pet.to_hash)
       pet.to_hash.should == pet2.to_hash
 
@@ -37,49 +42,66 @@
     end
 
     it "should fetch a pet object" do
-      pet = SwaggerClient::PetApi.get_pet_by_id(10002)
-      pet.should be_a(SwaggerClient::Pet)
+      pet = Petstore::PetApi.get_pet_by_id(10002)
+      pet.should be_a(Petstore::Pet)
       pet.id.should == 10002
       pet.name.should == "RUBY UNIT TESTING"
       pet.tags[0].name.should == "tag test"
       pet.category.name.should == "category test"
     end
 
+    it "should not find a pet that does not exist" do
+      begin
+        Petstore::PetApi.get_pet_by_id(-10002)
+        fail 'it should raise error'
+      rescue Petstore::Swagger::ApiError => e
+        e.code.should == 404
+        e.message.should == 'Not Found'
+        e.response_body.should == '{"code":1,"type":"error","message":"Pet not found"}'
+        e.response_headers.should be_a(Hash)
+        e.response_headers['Content-Type'].should == 'application/json'
+      end
+    end
+
     it "should find pets by status" do
-      pets = SwaggerClient::PetApi.find_pets_by_status(:status => 'available')
+      pets = Petstore::PetApi.find_pets_by_status(:status => 'available')
       pets.length.should >= 3
+      pets.each do |pet|
+        pet.should be_a(Petstore::Pet)
+        pet.status.should == 'available'
+      end
     end
 
     it "should not find a pet with invalid status" do
-      pets = SwaggerClient::PetApi.find_pets_by_status(:status => 'invalid-status')
+      pets = Petstore::PetApi.find_pets_by_status(:status => 'invalid-status')
       pets.length.should == 0
     end
 
     it "should find a pet by status" do
-      pets = SwaggerClient::PetApi.find_pets_by_status(:status => "available,sold")
-      pets.map {|pet|
-        if(pet.status != 'available' && pet.status != 'sold')
+      pets = Petstore::PetApi.find_pets_by_status(:status => "available,sold")
+      pets.each do |pet|
+        if pet.status != 'available' && pet.status != 'sold'
           raise "pet status wasn't right"
         end
-      }
+      end
     end
 
     it "should update a pet" do
-      pet = SwaggerClient::Pet.new({'id' => 10002, 'status' => 'sold'})
-      SwaggerClient::PetApi.add_pet(:body => pet)
+      pet = Petstore::Pet.new({'id' => 10002, 'status' => 'sold'})
+      Petstore::PetApi.add_pet(:body => pet)
 
-      fetched = SwaggerClient::PetApi.get_pet_by_id(10002)
+      fetched = Petstore::PetApi.get_pet_by_id(10002)
       fetched.id.should == 10002
       fetched.status.should == 'sold'
     end
 
     it "should create a pet" do
-      pet = SwaggerClient::Pet.new('id' => 10002, 'name' => "RUBY UNIT TESTING")
-      result = SwaggerClient::PetApi.add_pet(:body => pet)
+      pet = Petstore::Pet.new('id' => 10002, 'name' => "RUBY UNIT TESTING")
+      result = Petstore::PetApi.add_pet(:body => pet)
       # nothing is returned
       result.should be_nil
 
-      pet = SwaggerClient::PetApi.get_pet_by_id(10002)
+      pet = Petstore::PetApi.get_pet_by_id(10002)
       pet.id.should == 10002
       pet.name.should == "RUBY UNIT TESTING"
     end
diff --git a/samples/client/petstore/ruby/spec/request_spec.rb b/samples/client/petstore/ruby/spec/request_spec.rb
index 49bbc5cdd1e..8eeac549f93 100644
--- a/samples/client/petstore/ruby/spec/request_spec.rb
+++ b/samples/client/petstore/ruby/spec/request_spec.rb
@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe SwaggerClient::Swagger::Request do
+describe Petstore::Swagger::Request do
 
   before(:each) do
-    SwaggerClient::Swagger.configure do |config|
+    Petstore::Swagger.configure do |config|
       inject_format = true
       config.api_key['api_key'] = 'special-key'
       config.host = 'petstore.swagger.io'
@@ -15,17 +15,22 @@
     @default_params = {
       :params => {:foo => "1", :bar => "2"}
     }
-    @request = SwaggerClient::Swagger::Request.new(@default_http_method, @default_path, @default_params)
+    @request = Petstore::Swagger::Request.new(@default_http_method, @default_path, @default_params)
   end
 
   describe "initialization" do
+
     it "sets default response format to json" do
       @request.format.should == 'json'
     end
 
+    it "sets default headers correctly" do
+      @request.headers.should == {'Content-Type' => 'application/json', 'User-Agent' => 'ruby-swagger-1.0.0'}
+    end
+
     it "allows params to be nil" do
-      @request = SwaggerClient::Swagger::Request.new(@default_http_method, @default_path, :params => nil)
-      @request.query_string.should == ""
+      @request = Petstore::Swagger::Request.new(@default_http_method, @default_path, :params => nil)
+      @request.params.should == {}
     end
 
   end
@@ -46,26 +51,8 @@
 
   describe "url" do
 
-    it "constructs a query string" do
-      @request.query_string.should == "?bar=2&foo=1"
-    end
-
     it "constructs a full url" do
-      @request.url.should == "http://petstore.swagger.io/v2/pet.json/fancy?bar=2&foo=1"
-    end
-
-  end
-
-  describe "body" do
-
-    it "camelCases parameters" do
-      @request = SwaggerClient::Swagger::Request.new(@default_http_method, @default_path, @default_params.merge({
-        :body => {
-          :bad_dog => 'bud',
-          :goodDog => "dud"
-        }
-      }))
-      @request.body.keys.should == [:badDog, :goodDog]
+      @request.url.should == "http://petstore.swagger.io/v2/pet.json/fancy"
     end
 
   end
@@ -73,7 +60,7 @@
   describe "path" do
 
     it "accounts for a total absence of format in the path string" do
-      @request = SwaggerClient::Swagger::Request.new(:get, "/word.{format}/cat/entries", @default_params.merge({
+      @request = Petstore::Swagger::Request.new(:get, "/word.{format}/cat/entries", @default_params.merge({
         :format => "xml",
         :params => {
         }
@@ -82,7 +69,7 @@
     end
 
     it "does string substitution (format) on path params" do
-      @request = SwaggerClient::Swagger::Request.new(:get, "/word.{format}/cat/entries", @default_params.merge({
+      @request = Petstore::Swagger::Request.new(:get, "/word.{format}/cat/entries", @default_params.merge({
         :format => "xml",
         :params => {
         }
@@ -90,38 +77,8 @@
       @request.url.should == "http://petstore.swagger.io/v2/word.xml/cat/entries"
     end
 
-    it "leaves path-bound params out of the query string" do
-      @request = SwaggerClient::Swagger::Request.new(:get, "/word.{format}/{word}/entries", @default_params.merge({
-        :params => {
-          :word => "cat",
-          :limit => 20
-        }
-      }))
-      @request.query_string.should == "?limit=20"
-    end
-
-    it "returns a question-mark free (blank) query string if no query params are present" do
-      @request = SwaggerClient::Swagger::Request.new(:get, "/word.{format}/{word}/entries", @default_params.merge({
-        :params => {
-          :word => "cat",
-        }
-      }))
-      @request.query_string.should == ""
-    end
-
-    it "removes blank params" do
-      @request = SwaggerClient::Swagger::Request.new(:get, "words/fancy", @default_params.merge({
-        :params => {
-          :word => "dog",
-          :limit => "",
-          :foo => "criminy"
-        }
-      }))
-      @request.query_string.should == "?foo=criminy&word=dog"
-    end
-
     it "URI encodes the path" do
-      @request = SwaggerClient::Swagger::Request.new(:get, "word.{format}/bill gates/definitions", @default_params.merge({
+      @request = Petstore::Swagger::Request.new(:get, "word.{format}/bill gates/definitions", @default_params.merge({
         :params => {
           :word => "bill gates"
         }
@@ -129,39 +86,11 @@
       @request.url.should =~ /word.json\/bill\%20gates\/definitions/
     end
 
-    it "converts numeric params to strings" do
-      @request = SwaggerClient::Swagger::Request.new(@default_http_method, @default_path, @default_params.merge({
-        :params => {
-          :limit => 100
-        }
-      }))
-
-      @request.interpreted_path.should_not be_nil
-      @request.query_string.should =~ /\?limit=100/
-      @request.url.should =~ /\?limit=100/
-    end
-
-    it "camelCases parameters" do
-      @request = SwaggerClient::Swagger::Request.new(@default_http_method, @default_path, @default_params.merge({
-        :params => {
-          :bad_dog => 'bud',
-          :goodDog => "dud"
-        }
-      }))
-      @request.query_string.should == "?badDog=bud&goodDog=dud"
-    end
-
-    it "converts boolean values to their string representation" do
-      params = {:stringy => "fish", :truthy => true, :falsey => false}
-      @request = SwaggerClient::Swagger::Request.new(:get, 'fakeMethod', :params => params)
-      @request.query_string.should == "?falsey=false&stringy=fish&truthy=true"
-    end
-
   end
 
   describe "#update_params_for_auth!" do
     it "sets header api-key parameter with prefix" do
-      SwaggerClient::Swagger.configure do |config|
+      Petstore::Swagger.configure do |config|
         inject_format = true
         config.api_key_prefix['api_key'] = 'PREFIX'
       end
@@ -171,7 +100,7 @@
     end
 
     it "sets header api-key parameter without prefix" do
-      SwaggerClient::Swagger.configure do |config|
+      Petstore::Swagger.configure do |config|
         inject_format = true
         config.api_key_prefix['api_key'] = nil
       end
diff --git a/samples/client/petstore/ruby/spec/response_spec.rb b/samples/client/petstore/ruby/spec/response_spec.rb
index 528b67e1fa7..c583b413fca 100644
--- a/samples/client/petstore/ruby/spec/response_spec.rb
+++ b/samples/client/petstore/ruby/spec/response_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe SwaggerClient::Swagger::Response do
+describe Petstore::Swagger::Response do
 
   before do
     configure_swagger
@@ -8,18 +8,19 @@
   end
 
   before(:each) do
-
     VCR.use_cassette('pet_resource', :record => :new_episodes) do
       @raw = Typhoeus::Request.get("http://petstore.swagger.io/v2/pet/10002")
     end
 
-    @response = SwaggerClient::Swagger::Response.new(@raw)
+    @response = Petstore::Swagger::Response.new(@raw)
   end
 
   describe "initialization" do
     it "sets body" do
-      @response.body.class.should == Hash
-      @response.body.has_key?(:'name').should == true
+      @response.body.should be_a(String)
+      data = JSON.parse(@response.body)
+      data.should be_a(Hash)
+      data['id'].should == 10002
     end
 
     it "sets code" do
@@ -30,9 +31,8 @@
       @response.headers.class.should == Hash
     end
   end
-  
-  describe "format" do
 
+  describe "format" do
     it "recognizes json" do
       @response.format.should == 'json'
       @response.json?.should == true
@@ -43,23 +43,40 @@
         @raw = Typhoeus::Request.get("http://petstore.swagger.io/v2/pet/10002",
                                     :headers => {'Accept'=> "application/xml"})
       end
-      @response = SwaggerClient::Swagger::Response.new(@raw)
+      @response = Petstore::Swagger::Response.new(@raw)
       @response.format.should == 'xml'
       @response.xml?.should == true
     end
-
   end
-  
+
   describe "prettiness" do
-    
     it "has a pretty json body" do
       @response.pretty_body.should =~ /\{.*\}/
     end
-        
+
     it "has pretty headers" do
       @response.pretty_headers.should =~ /\{.*\}/
     end
+  end
 
+  describe "deserialize" do
+    it "handles Hash<String, String>" do
+      @response.stub(:body) { '{"message": "Hello"}' }
+      data = @response.deserialize('Hash<String, String>')
+      data.should be_a(Hash)
+      data.should == {:message => 'Hello'}
+    end
+
+    it "handles Hash<String, Pet>" do
+      json = @response.body
+      @response.stub(:body) { "{\"pet\": #{json}}" }
+      data = @response.deserialize('Hash<String, Pet>')
+      data.should be_a(Hash)
+      data.keys.should == [:pet]
+      pet = data[:pet]
+      pet.should be_a(Petstore::Pet)
+      pet.id.should == 10002
+    end
   end
 
 end
diff --git a/samples/client/petstore/ruby/spec/spec_helper.rb b/samples/client/petstore/ruby/spec/spec_helper.rb
index f9081d3fe08..55279384e61 100644
--- a/samples/client/petstore/ruby/spec/spec_helper.rb
+++ b/samples/client/petstore/ruby/spec/spec_helper.rb
@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'bundler/setup'
-require 'swagger_client'
+require 'petstore'
 require 'vcr'
 require 'typhoeus'
 require 'json'
@@ -37,7 +37,7 @@ def help
 #end
 
 def configure_swagger
-  SwaggerClient::Swagger.configure do |config|
+  Petstore::Swagger.configure do |config|
     config.api_key['api_key'] = 'special-key'
     config.host = 'petstore.swagger.io'
     config.base_path = '/v2'
@@ -47,25 +47,25 @@ def configure_swagger
 # always delete and then re-create the pet object with 10002
 def prepare_pet
   # remove the pet
-  SwaggerClient::PetApi.delete_pet(10002)
+  Petstore::PetApi.delete_pet(10002)
   # recreate the pet
-  category = SwaggerClient::Category.new('id' => 20002, 'name' => 'category test')
-  tag = SwaggerClient::Tag.new('id' => 30002, 'name' => 'tag test')
-  pet = SwaggerClient::Pet.new('id' => 10002, 'name' => "RUBY UNIT TESTING", 'photo_urls' => 'photo url',
+  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')
 
-  SwaggerClient::PetApi.add_pet(:'body'=> pet)
+  Petstore::PetApi.add_pet(:'body'=> pet)
 end
 
 # always delete and then re-create the store order
 def prepare_store
-  order = SwaggerClient::Order.new("id" => 10002,
+  order = Petstore::Order.new("id" => 10002,
 		  "petId" => 10002,
 		  "quantity" => 789,
 		  "shipDate" => "2015-04-06T23:42:01.678Z",
 		  "status" => "placed",
 		  "complete" => false)
-  SwaggerClient::StoreApi.place_order(:body => order)
+  Petstore::StoreApi.place_order(:body => order)
 end
 
 configure_swagger
diff --git a/samples/client/petstore/ruby/spec/store_spec.rb b/samples/client/petstore/ruby/spec/store_spec.rb
index 1b37400bc5c..8c59de39fec 100644
--- a/samples/client/petstore/ruby/spec/store_spec.rb
+++ b/samples/client/petstore/ruby/spec/store_spec.rb
@@ -7,7 +7,17 @@
   end
 
   it "should fetch an order" do
-    item = SwaggerClient::StoreApi.get_order_by_id(10002)
+    item = Petstore::StoreApi.get_order_by_id(10002)
     item.id.should == 10002
   end
+
+  it "should featch the inventory" do
+    result = Petstore::StoreApi.get_inventory
+    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/ruby/spec/swagger_spec.rb b/samples/client/petstore/ruby/spec/swagger_spec.rb
index 38b4a850ae9..957da5e20a6 100644
--- a/samples/client/petstore/ruby/spec/swagger_spec.rb
+++ b/samples/client/petstore/ruby/spec/swagger_spec.rb
@@ -1,56 +1,56 @@
 # require 'spec_helper'
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe SwaggerClient::Swagger do
+describe Petstore::Swagger do
 
   before(:each) do
     configure_swagger
   end
-  
+
   after(:each) do
   end
 
   context 'initialization' do
-    
+
     context 'URL stuff' do
 
       context 'host' do
         it 'removes http from host' do
-          SwaggerClient::Swagger.configure {|c| c.host = 'http://example.com' } 
-          SwaggerClient::Swagger.configuration.host.should == 'example.com'
+          Petstore::Swagger.configure {|c| c.host = 'http://example.com' }
+          Petstore::Swagger.configuration.host.should == 'example.com'
         end
 
         it 'removes https from host' do
-          SwaggerClient::Swagger.configure {|c| c.host = 'https://wookiee.com' } 
-          SwaggerClient::Swagger.configuration.host.should == 'wookiee.com'
+          Petstore::Swagger.configure {|c| c.host = 'https://wookiee.com' }
+          Petstore::Swagger.configuration.host.should == 'wookiee.com'
         end
 
         it 'removes trailing path from host' do
-          SwaggerClient::Swagger.configure {|c| c.host = 'hobo.com/v4' } 
-          SwaggerClient::Swagger.configuration.host.should == 'hobo.com'
+          Petstore::Swagger.configure {|c| c.host = 'hobo.com/v4' }
+          Petstore::Swagger.configuration.host.should == 'hobo.com'
         end
       end
-      
+
       context 'base_path' do
         it "prepends a slash to base_path" do
-          SwaggerClient::Swagger.configure {|c| c.base_path = 'v4/dog' } 
-          SwaggerClient::Swagger.configuration.base_path.should == '/v4/dog'
+          Petstore::Swagger.configure {|c| c.base_path = 'v4/dog' }
+          Petstore::Swagger.configuration.base_path.should == '/v4/dog'
         end
-        
+
         it "doesn't prepend a slash if one is already there" do
-          SwaggerClient::Swagger.configure {|c| c.base_path = '/v4/dog' }
-          SwaggerClient::Swagger.configuration.base_path.should == '/v4/dog'
+          Petstore::Swagger.configure {|c| c.base_path = '/v4/dog' }
+          Petstore::Swagger.configuration.base_path.should == '/v4/dog'
         end
-        
+
         it "ends up as a blank string if nil" do
-          SwaggerClient::Swagger.configure {|c| c.base_path = nil }
-          SwaggerClient::Swagger.configuration.base_path.should == ''
+          Petstore::Swagger.configure {|c| c.base_path = nil }
+          Petstore::Swagger.configuration.base_path.should == ''
         end
-        
+
       end
 
     end
-        
+
   end
-    
+
 end
diff --git a/samples/client/petstore/scala/pom.xml b/samples/client/petstore/scala/pom.xml
index 7e56a41c890..9f39f4e45ce 100644
--- a/samples/client/petstore/scala/pom.xml
+++ b/samples/client/petstore/scala/pom.xml
@@ -72,6 +72,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.9.1</version>
         <executions>
           <execution>
             <id>add_sources</id>
@@ -208,7 +209,7 @@
     <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>
+    <jersey-version>1.19</jersey-version>
     <swagger-core-version>1.5.0</swagger-core-version>
     <jersey-async-version>1.0.5</jersey-async-version>
     <maven-plugin.version>1.0.0</maven-plugin.version>
@@ -216,6 +217,8 @@
 
     <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>
+    <scala-test-version>2.2.4</scala-test-version>
+
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/ApiInvoker.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/ApiInvoker.scala
index 91ab98471e9..df067bdab8b 100644
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/ApiInvoker.scala
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/ApiInvoker.scala
@@ -59,7 +59,7 @@ class ApiInvoker(val mapper: ObjectMapper = ScalaJsonUtil.getJsonMapper,
     if (cls == classOf[String]) {
       json match {
         case s: String => {
-          if (s.startsWith("\"") && s.endsWith("\"") && s.length > 1) s.substring(1, s.length - 2)
+          if (s.startsWith("\"") && s.endsWith("\"") && s.length > 1) s.substring(1, s.length - 1)
           else s
         }
         case _ => null
@@ -141,7 +141,7 @@ class ApiInvoker(val mapper: ObjectMapper = ScalaJsonUtil.getJsonMapper,
       }
       case _ => null
     }
-    response.getClientResponseStatus().getStatusCode() match {
+    response.getStatusInfo().getStatusCode() match {
       case 204 => ""
       case code: Int if (Range(200, 299).contains(code)) => {
         response.hasEntity() match {
@@ -155,7 +155,7 @@ class ApiInvoker(val mapper: ObjectMapper = ScalaJsonUtil.getJsonMapper,
           case false => "no data"
         }
         throw new ApiException(
-          response.getClientResponseStatus().getStatusCode(),
+          response.getStatusInfo().getStatusCode(),
           entity)
       }
     }
@@ -172,7 +172,7 @@ class ApiInvoker(val mapper: ObjectMapper = ScalaJsonUtil.getJsonMapper,
       }
     }
   }
-  
+
   def newClient(host: String): Client = asyncHttpClient match {
     case true => {
       import org.sonatype.spice.jersey.client.ahc.config.DefaultAhcConfig
@@ -200,4 +200,3 @@ object ApiInvoker extends ApiInvoker(mapper = ScalaJsonUtil.getJsonMapper,
   authPreemptive = false)
 
 class ApiException(val code: Int, msg: String) extends RuntimeException(msg)
-
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Pet.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Pet.scala
index 430f6a3659c..30dc8750976 100644
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Pet.scala
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Pet.scala
@@ -1,7 +1,5 @@
 package io.swagger.client.model
 
-import io.swagger.client.model.Category
-import io.swagger.client.model.Tag
 
 
 
diff --git a/samples/client/petstore/swift/PetstoreClient/Cartfile b/samples/client/petstore/swift/Cartfile
similarity index 52%
rename from samples/client/petstore/swift/PetstoreClient/Cartfile
rename to samples/client/petstore/swift/Cartfile
index 245a690a74b..af74617bcf2 100644
--- a/samples/client/petstore/swift/PetstoreClient/Cartfile
+++ b/samples/client/petstore/swift/Cartfile
@@ -1,2 +1,2 @@
 github "Alamofire/Alamofire" >= 1.2
-github "mxcl/PromiseKit"
\ No newline at end of file
+github "mxcl/PromiseKit" >=1.5.3
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIHelper.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIHelper.swift
new file mode 100644
index 00000000000..418f1c8512b
--- /dev/null
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIHelper.swift
@@ -0,0 +1,21 @@
+// APIHelper.swift
+//
+// Generated by swagger-codegen
+// https://github.com/swagger-api/swagger-codegen
+//
+
+class APIHelper {
+    static func rejectNil(source: [String:AnyObject?]) -> [String:AnyObject]? {
+        var destination = [String:AnyObject]()
+        for (key, nillableValue) in source {
+            if let value: AnyObject = nillableValue {
+                destination[key] = value
+            }
+        }
+
+        if destination.isEmpty {
+            return nil
+        }
+        return destination
+    }
+}
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs.swift
new file mode 100644
index 00000000000..e473915cf24
--- /dev/null
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs.swift
@@ -0,0 +1,64 @@
+// APIs.swift
+//
+// Generated by swagger-codegen
+// https://github.com/swagger-api/swagger-codegen
+//
+
+import Foundation
+
+class OneteamAPI {
+    static let basePath = "http://ec2-52-68-31-200.ap-northeast-1.compute.amazonaws.com/"
+    static var credential: NSURLCredential?
+    static var requestBuilderFactory: RequestBuilderFactory = AlamofireRequestBuilderFactory()
+}
+
+class APIBase {
+    func toParameters(encodable: JSONEncodable?) -> [String: AnyObject]? {
+        let encoded: AnyObject? = encodable?.encodeToJSON()
+
+        if encoded! is [AnyObject] {
+            var dictionary = [String:AnyObject]()
+            for (index, item) in enumerate(encoded as! [AnyObject]) {
+                dictionary["\(index)"] = item
+            }
+            return dictionary
+        } else {
+            return encoded as? [String:AnyObject]
+        }
+    }
+}
+
+class RequestBuilder<T> {
+    var credential: NSURLCredential?
+    var headers: [String:String] = [:]
+    let parameters: [String:AnyObject]?
+    let isBody: Bool
+    let method: String
+    let URLString: String
+    
+    required init(method: String, URLString: String, parameters: [String:AnyObject]?, isBody: Bool) {
+        self.method = method
+        self.URLString = URLString
+        self.parameters = parameters
+        self.isBody = isBody
+    }
+    
+    func execute(completion: (response: Response<T>?, erorr: NSError?) -> Void) { }
+
+    func addHeader(#name: String, value: String) -> Self {
+        if !value.isEmpty {
+            headers[name] = value
+        }
+        return self
+    }
+    
+    func addCredential() -> Self {
+        self.credential = OneteamAPI.credential
+        return self
+    }
+}
+
+protocol RequestBuilderFactory {
+    func getBuilder<T>() -> RequestBuilder<T>.Type
+}
+
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift
new file mode 100644
index 00000000000..5202240bbc9
--- /dev/null
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift
@@ -0,0 +1,351 @@
+//
+// PetAPI.swift
+//
+// Generated by swagger-codegen
+// https://github.com/swagger-api/swagger-codegen
+//
+
+import Alamofire
+import PromiseKit
+
+extension PetstoreClientAPI {
+    
+    class PetAPI: APIBase {
+    
+        /**
+         
+         Update an existing pet
+         
+         - PUT /pet
+         - 
+         - OAuth:
+           - type: oauth2
+           - name: petstore_auth
+         
+         :param: body (body) Pet object that needs to be added to the store
+
+         :returns: Promise<Response<Void>> 
+         */
+        func updatePet(#body: Pet?) -> RequestBuilder<Void> {
+            let path = "/pet"
+            let url = PetstoreClientAPI.basePath + path
+            
+            let parameters = body?.encodeToJSON() as? [String:AnyObject]
+
+            let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+            return requestBuilder(method: "PUT", URLString: url, parameters: parameters, isBody: true)
+        }
+    
+        /**
+         
+         Add a new pet to the store
+         
+         - POST /pet
+         - 
+         - OAuth:
+           - type: oauth2
+           - name: petstore_auth
+         
+         :param: body (body) Pet object that needs to be added to the store
+
+         :returns: Promise<Response<Void>> 
+         */
+        func addPet(#body: Pet?) -> RequestBuilder<Void> {
+            let path = "/pet"
+            let url = PetstoreClientAPI.basePath + path
+            
+            let parameters = body?.encodeToJSON() as? [String:AnyObject]
+
+            let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+            return requestBuilder(method: "POST", URLString: url, 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>string</photoUrls>
+  <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>string</photoUrls>
+  <status>string</status>
+</Pet>, contentType=application/xml}]
+         
+         :param: status (query) Status values that need to be considered for filter
+
+         :returns: Promise<Response<[Pet]>> 
+         */
+        func findPetsByStatus(#status: [String]?) -> RequestBuilder<[Pet]> {
+            let path = "/pet/findByStatus"
+            let url = PetstoreClientAPI.basePath + path
+            
+            let nillableParameters: [String:AnyObject?] = [
+                "status": status
+            ]
+            let parameters = APIHelper.rejectNil(nillableParameters)
+
+            let requestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+            return requestBuilder(method: "GET", URLString: url, 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>string</photoUrls>
+  <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>string</photoUrls>
+  <status>string</status>
+</Pet>, contentType=application/xml}]
+         
+         :param: tags (query) Tags to filter by
+
+         :returns: Promise<Response<[Pet]>> 
+         */
+        func findPetsByTags(#tags: [String]?) -> RequestBuilder<[Pet]> {
+            let path = "/pet/findByTags"
+            let url = PetstoreClientAPI.basePath + path
+            
+            let nillableParameters: [String:AnyObject?] = [
+                "tags": tags
+            ]
+            let parameters = APIHelper.rejectNil(nillableParameters)
+
+            let requestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+            return requestBuilder(method: "GET", URLString: url, 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
+         - 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>string</photoUrls>
+  <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>string</photoUrls>
+  <status>string</status>
+</Pet>, contentType=application/xml}]
+         
+         :param: petId (path) ID of pet that needs to be fetched
+
+         :returns: Promise<Response<Pet>> 
+         */
+        func getPetById(#petId: Int) -> RequestBuilder<Pet> {
+            var path = "/pet/{petId}"
+            path = path.stringByReplacingOccurrencesOfString("{petId}", withString: "\(petId)", options: .LiteralSearch, range: nil)
+            let url = PetstoreClientAPI.basePath + path
+            
+            let nillableParameters: [String:AnyObject?] = [:]
+            let parameters = APIHelper.rejectNil(nillableParameters)
+
+            let requestBuilder: RequestBuilder<Pet>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+            return requestBuilder(method: "GET", URLString: url, parameters: parameters, isBody: true)
+        }
+    
+        /**
+         
+         Updates a pet in the store with form data
+         
+         - POST /pet/{petId}
+         - 
+         - OAuth:
+           - type: oauth2
+           - name: petstore_auth
+         
+         :param: petId (path) ID of pet that needs to be updated
+         :param: name (form) Updated name of the pet
+         :param: status (form) Updated status of the pet
+
+         :returns: Promise<Response<Void>> 
+         */
+        func updatePetWithForm(#petId: String, name: String?, status: String?) -> RequestBuilder<Void> {
+            var path = "/pet/{petId}"
+            path = path.stringByReplacingOccurrencesOfString("{petId}", withString: "\(petId)", options: .LiteralSearch, range: nil)
+            let url = PetstoreClientAPI.basePath + path
+            
+            let nillableParameters: [String:AnyObject?] = [:]
+            let parameters = APIHelper.rejectNil(nillableParameters)
+
+            let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+            return requestBuilder(method: "POST", URLString: url, parameters: parameters, isBody: true)
+        }
+    
+        /**
+         
+         Deletes a pet
+         
+         - DELETE /pet/{petId}
+         - 
+         - OAuth:
+           - type: oauth2
+           - name: petstore_auth
+         
+         :param: petId (path) Pet id to delete
+
+         :returns: Promise<Response<Void>> 
+         */
+        func deletePet(#petId: Int) -> RequestBuilder<Void> {
+            var path = "/pet/{petId}"
+            path = path.stringByReplacingOccurrencesOfString("{petId}", withString: "\(petId)", options: .LiteralSearch, range: nil)
+            let url = PetstoreClientAPI.basePath + path
+            
+            let nillableParameters: [String:AnyObject?] = [:]
+            let parameters = APIHelper.rejectNil(nillableParameters)
+
+            let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+            return requestBuilder(method: "DELETE", URLString: url, parameters: parameters, isBody: true)
+        }
+    
+        /**
+         
+         uploads an image
+         
+         - POST /pet/{petId}/uploadImage
+         - 
+         - OAuth:
+           - type: oauth2
+           - name: petstore_auth
+         
+         :param: petId (path) ID of pet to update
+         :param: additionalMetadata (form) Additional data to pass to server
+         :param: file (form) file to upload
+
+         :returns: Promise<Response<Void>> 
+         */
+        func uploadFile(#petId: Int, additionalMetadata: String?, file: NSData?) -> RequestBuilder<Void> {
+            var path = "/pet/{petId}/uploadImage"
+            path = path.stringByReplacingOccurrencesOfString("{petId}", withString: "\(petId)", options: .LiteralSearch, range: nil)
+            let url = PetstoreClientAPI.basePath + path
+            
+            let nillableParameters: [String:AnyObject?] = [:]
+            let parameters = APIHelper.rejectNil(nillableParameters)
+
+            let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+            return requestBuilder(method: "POST", URLString: url, parameters: parameters, isBody: true)
+        }
+    
+    }
+}
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
new file mode 100644
index 00000000000..ad122129939
--- /dev/null
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
@@ -0,0 +1,176 @@
+//
+// StoreAPI.swift
+//
+// Generated by swagger-codegen
+// https://github.com/swagger-api/swagger-codegen
+//
+
+import Alamofire
+import PromiseKit
+
+extension PetstoreClientAPI {
+    
+    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@3e, contentType=application/xml}]
+         - examples: [{example={
+  "key" : 123
+}, contentType=application/json}, {example=not implemented io.swagger.models.properties.MapProperty@3e, contentType=application/xml}]
+
+         :returns: Promise<Response<[String:Int]>> 
+         */
+        func getInventory() -> RequestBuilder<[String:Int]> {
+            let path = "/store/inventory"
+            let url = PetstoreClientAPI.basePath + path
+            
+            let nillableParameters: [String:AnyObject?] = [:]
+            let parameters = APIHelper.rejectNil(nillableParameters)
+
+            let requestBuilder: RequestBuilder<[String:Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+            return requestBuilder(method: "GET", URLString: url, parameters: parameters, isBody: true)
+        }
+    
+        /**
+         
+         Place an order for a pet
+         
+         - POST /store/order
+         - 
+         - examples: [{example={
+  "id" : 123456789,
+  "petId" : 123456789,
+  "complete" : true,
+  "status" : "aeiou",
+  "quantity" : 123,
+  "shipDate" : "2015-06-27T13:41:28.102+0000"
+}, contentType=application/json}, {example=<Order>
+  <id>123456</id>
+  <petId>123456</petId>
+  <quantity>0</quantity>
+  <shipDate>2015-06-27T22:41:28.105Z</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-06-27T13:41:28.102+0000"
+}, contentType=application/json}, {example=<Order>
+  <id>123456</id>
+  <petId>123456</petId>
+  <quantity>0</quantity>
+  <shipDate>2015-06-27T22:41:28.105Z</shipDate>
+  <status>string</status>
+  <complete>true</complete>
+</Order>, contentType=application/xml}]
+         
+         :param: body (body) order placed for purchasing the pet
+
+         :returns: Promise<Response<Order>> 
+         */
+        func placeOrder(#body: Order?) -> RequestBuilder<Order> {
+            let path = "/store/order"
+            let url = PetstoreClientAPI.basePath + path
+            
+            let parameters = body?.encodeToJSON() as? [String:AnyObject]
+
+            let requestBuilder: RequestBuilder<Order>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+            return requestBuilder(method: "POST", URLString: url, 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-06-27T13:41:28.106+0000"
+}, contentType=application/json}, {example=<Order>
+  <id>123456</id>
+  <petId>123456</petId>
+  <quantity>0</quantity>
+  <shipDate>2015-06-27T22:41:28.106Z</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-06-27T13:41:28.106+0000"
+}, contentType=application/json}, {example=<Order>
+  <id>123456</id>
+  <petId>123456</petId>
+  <quantity>0</quantity>
+  <shipDate>2015-06-27T22:41:28.106Z</shipDate>
+  <status>string</status>
+  <complete>true</complete>
+</Order>, contentType=application/xml}]
+         
+         :param: orderId (path) ID of pet that needs to be fetched
+
+         :returns: Promise<Response<Order>> 
+         */
+        func getOrderById(#orderId: String) -> RequestBuilder<Order> {
+            var path = "/store/order/{orderId}"
+            path = path.stringByReplacingOccurrencesOfString("{orderId}", withString: "\(orderId)", options: .LiteralSearch, range: nil)
+            let url = PetstoreClientAPI.basePath + path
+            
+            let nillableParameters: [String:AnyObject?] = [:]
+            let parameters = APIHelper.rejectNil(nillableParameters)
+
+            let requestBuilder: RequestBuilder<Order>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+            return requestBuilder(method: "GET", URLString: url, 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
+         
+         :param: orderId (path) ID of the order that needs to be deleted
+
+         :returns: Promise<Response<Void>> 
+         */
+        func deleteOrder(#orderId: String) -> RequestBuilder<Void> {
+            var path = "/store/order/{orderId}"
+            path = path.stringByReplacingOccurrencesOfString("{orderId}", withString: "\(orderId)", options: .LiteralSearch, range: nil)
+            let url = PetstoreClientAPI.basePath + path
+            
+            let nillableParameters: [String:AnyObject?] = [:]
+            let parameters = APIHelper.rejectNil(nillableParameters)
+
+            let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+            return requestBuilder(method: "DELETE", URLString: url, 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
new file mode 100644
index 00000000000..9c283396214
--- /dev/null
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
@@ -0,0 +1,214 @@
+//
+// UserAPI.swift
+//
+// Generated by swagger-codegen
+// https://github.com/swagger-api/swagger-codegen
+//
+
+import Alamofire
+import PromiseKit
+
+extension PetstoreClientAPI {
+    
+    class UserAPI: APIBase {
+    
+        /**
+         
+         Create user
+         
+         - POST /user
+         - This can only be done by the logged in user.
+         
+         :param: body (body) Created user object
+
+         :returns: Promise<Response<Void>> 
+         */
+        func createUser(#body: User?) -> RequestBuilder<Void> {
+            let path = "/user"
+            let url = PetstoreClientAPI.basePath + path
+            
+            let parameters = body?.encodeToJSON() as? [String:AnyObject]
+
+            let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+            return requestBuilder(method: "POST", URLString: url, parameters: parameters, isBody: true)
+        }
+    
+        /**
+         
+         Creates list of users with given input array
+         
+         - POST /user/createWithArray
+         - 
+         
+         :param: body (body) List of user object
+
+         :returns: Promise<Response<Void>> 
+         */
+        func createUsersWithArrayInput(#body: [User]?) -> RequestBuilder<Void> {
+            let path = "/user/createWithArray"
+            let url = PetstoreClientAPI.basePath + path
+            
+            let parameters = body?.encodeToJSON() as? [String:AnyObject]
+
+            let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+            return requestBuilder(method: "POST", URLString: url, parameters: parameters, isBody: true)
+        }
+    
+        /**
+         
+         Creates list of users with given input array
+         
+         - POST /user/createWithList
+         - 
+         
+         :param: body (body) List of user object
+
+         :returns: Promise<Response<Void>> 
+         */
+        func createUsersWithListInput(#body: [User]?) -> RequestBuilder<Void> {
+            let path = "/user/createWithList"
+            let url = PetstoreClientAPI.basePath + path
+            
+            let parameters = body?.encodeToJSON() as? [String:AnyObject]
+
+            let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+            return requestBuilder(method: "POST", URLString: url, parameters: parameters, isBody: true)
+        }
+    
+        /**
+         
+         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}]
+         
+         :param: username (query) The user name for login
+         :param: password (query) The password for login in clear text
+
+         :returns: Promise<Response<String>> 
+         */
+        func loginUser(#username: String?, password: String?) -> RequestBuilder<String> {
+            let path = "/user/login"
+            let url = 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(method: "GET", URLString: url, parameters: parameters, isBody: false)
+        }
+    
+        /**
+         
+         Logs out current logged in user session
+         
+         - GET /user/logout
+         - 
+
+         :returns: Promise<Response<Void>> 
+         */
+        func logoutUser() -> RequestBuilder<Void> {
+            let path = "/user/logout"
+            let url = PetstoreClientAPI.basePath + path
+            
+            let nillableParameters: [String:AnyObject?] = [:]
+            let parameters = APIHelper.rejectNil(nillableParameters)
+
+            let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+            return requestBuilder(method: "GET", URLString: url, parameters: parameters, isBody: true)
+        }
+    
+        /**
+         
+         Get user by user name
+         
+         - GET /user/{username}
+         - 
+         - examples: [{example={
+  "id" : 1,
+  "username" : "johnp",
+  "firstName" : "John",
+  "lastName" : "Public",
+  "email" : "johnp@swagger.io",
+  "password" : "-secret-",
+  "phone" : "0123456789",
+  "userStatus" : 0
+}, contentType=application/json}]
+         
+         :param: username (path) The name that needs to be fetched. Use user1 for testing. 
+
+         :returns: Promise<Response<User>> 
+         */
+        func getUserByName(#username: String) -> RequestBuilder<User> {
+            var path = "/user/{username}"
+            path = path.stringByReplacingOccurrencesOfString("{username}", withString: "\(username)", options: .LiteralSearch, range: nil)
+            let url = PetstoreClientAPI.basePath + path
+            
+            let nillableParameters: [String:AnyObject?] = [:]
+            let parameters = APIHelper.rejectNil(nillableParameters)
+
+            let requestBuilder: RequestBuilder<User>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+            return requestBuilder(method: "GET", URLString: url, parameters: parameters, isBody: true)
+        }
+    
+        /**
+         
+         Updated user
+         
+         - PUT /user/{username}
+         - This can only be done by the logged in user.
+         
+         :param: username (path) name that need to be deleted
+         :param: body (body) Updated user object
+
+         :returns: Promise<Response<Void>> 
+         */
+        func updateUser(#username: String, body: User?) -> RequestBuilder<Void> {
+            var path = "/user/{username}"
+            path = path.stringByReplacingOccurrencesOfString("{username}", withString: "\(username)", options: .LiteralSearch, range: nil)
+            let url = PetstoreClientAPI.basePath + path
+            
+            let parameters = body?.encodeToJSON() as? [String:AnyObject]
+
+            let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+            return requestBuilder(method: "PUT", URLString: url, parameters: parameters, isBody: true)
+        }
+    
+        /**
+         
+         Delete user
+         
+         - DELETE /user/{username}
+         - This can only be done by the logged in user.
+         
+         :param: username (path) The name that needs to be deleted
+
+         :returns: Promise<Response<Void>> 
+         */
+        func deleteUser(#username: String) -> RequestBuilder<Void> {
+            var path = "/user/{username}"
+            path = path.stringByReplacingOccurrencesOfString("{username}", withString: "\(username)", options: .LiteralSearch, range: nil)
+            let url = PetstoreClientAPI.basePath + path
+            
+            let nillableParameters: [String:AnyObject?] = [:]
+            let parameters = APIHelper.rejectNil(nillableParameters)
+
+            let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+            return requestBuilder(method: "DELETE", URLString: url, parameters: parameters, isBody: true)
+        }
+    
+    }
+}
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift
new file mode 100644
index 00000000000..61e2bf2886d
--- /dev/null
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift
@@ -0,0 +1,82 @@
+// AlamofireImplementations.swift
+//
+// Generated by swagger-codegen
+// https://github.com/swagger-api/swagger-codegen
+//
+
+import Alamofire
+
+class AlamofireRequestBuilderFactory: RequestBuilderFactory {
+    func getBuilder<T>() -> RequestBuilder<T>.Type {
+        return AlamofireRequestBuilder<T>.self
+    }
+}
+
+// Store manager to retain its reference
+private var managerStore: [String: Alamofire.Manager] = [:]
+
+class AlamofireRequestBuilder<T>: RequestBuilder<T> {
+    required init(method: String, URLString: String, parameters: [String : AnyObject]?, isBody: Bool) {
+        super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody)
+    }
+
+    override func execute(completion: (response: Response<T>?, erorr: NSError?) -> Void) {
+        let managerId = NSUUID().UUIDString
+        // Create a new manager for each request to customize its request header
+        let configuration = NSURLSessionConfiguration.defaultSessionConfiguration()
+        configuration.HTTPAdditionalHeaders = buildHeaders()
+        let manager = Alamofire.Manager(configuration: configuration)
+        managerStore[managerId] = manager
+
+        let encoding = isBody ? Alamofire.ParameterEncoding.JSON : Alamofire.ParameterEncoding.URL
+        let request = manager.request(Alamofire.Method(rawValue: method)!, URLString, parameters: parameters, encoding: encoding)
+        if let credential = self.credential {
+            request.authenticate(usingCredential: credential)
+        }
+
+        request.responseJSON(options: .AllowFragments) { (req, res, json, error) in
+            managerStore.removeValueForKey(managerId)
+
+            if let error = error {
+                completion(response: nil, erorr: error)
+                return
+            }
+            if res!.statusCode >= 400 {
+                //TODO: Add error entity
+                let userInfo: [NSObject : AnyObject] = (json != nil) ? ["data": json!] : [:]
+                let error = NSError(domain: res!.URL!.URLString, code: res!.statusCode, userInfo: userInfo)
+                completion(response: nil, erorr: error)
+                return
+            }
+
+            if () is T {
+                let response = Response(response: res!, body: () as! T)
+                completion(response: response, erorr: nil)
+                return
+            }
+            if let json: AnyObject = json {
+                let body = Decoders.decode(clazz: T.self, source: json)
+                let response = Response(response: res!, body: body)
+                completion(response: response, erorr: nil)
+                return
+            } else if "" is T {
+                // swagger-parser currently doesn't support void, which will be fixed in future swagger-parser release
+                // https://github.com/swagger-api/swagger-parser/pull/34
+                let response = Response(response: res!, body: "" as! T)
+                completion(response: response, erorr: nil)
+                return
+            }
+            
+            completion(response: nil, erorr: NSError(domain: "localhost", code: 500, userInfo: ["reason": "unreacheable code"]))
+        }
+    }
+
+    private func buildHeaders() -> [String: AnyObject] {
+        var httpHeaders = Manager.defaultHTTPHeaders
+        for (key, value) in self.headers {
+            httpHeaders[key] = value
+        }
+        return httpHeaders
+    }
+}
+
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Extensions.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Extensions.swift
new file mode 100644
index 00000000000..80af4351f04
--- /dev/null
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Extensions.swift
@@ -0,0 +1,79 @@
+// Extensions.swift
+//
+// Generated by swagger-codegen
+// https://github.com/swagger-api/swagger-codegen
+//
+
+import Alamofire
+import PromiseKit
+
+extension Bool: JSONEncodable {
+    func encodeToJSON() -> AnyObject { return self }
+}
+
+extension Float: JSONEncodable {
+    func encodeToJSON() -> AnyObject { return self }
+}
+
+extension Int: JSONEncodable {
+    func encodeToJSON() -> AnyObject { return self }
+}
+
+extension Double: JSONEncodable {
+    func encodeToJSON() -> AnyObject { return self }
+}
+
+extension String: JSONEncodable {
+    func encodeToJSON() -> AnyObject { return self }
+}
+
+private func encodeIfPossible<T>(object: T) -> AnyObject {
+    if object is JSONEncodable {
+        return (object as! JSONEncodable).encodeToJSON()
+    } else {
+        return object as! AnyObject
+    }
+}
+
+extension Array: JSONEncodable {
+    func encodeToJSON() -> AnyObject {
+        return self.map(encodeIfPossible)
+    }
+}
+
+extension Dictionary: JSONEncodable {
+    func encodeToJSON() -> AnyObject {
+        var dictionary = [NSObject:AnyObject]()
+        for (key, value) in self {
+            dictionary[key as! NSObject] = encodeIfPossible(value)
+        }
+        return dictionary
+    }
+}
+
+
+private let dateFormatter: NSDateFormatter = {
+    let dateFormatter = NSDateFormatter()
+    dateFormatter.dateFormat = "yyyy-MM-dd"
+    return dateFormatter
+}()
+
+extension NSDate: JSONEncodable {
+    func encodeToJSON() -> AnyObject {
+        return dateFormatter.stringFromDate(self)
+    }
+}
+
+extension RequestBuilder {
+    func execute() -> Promise<Response<T>>  {
+        let deferred = Promise<Response<T>>.defer()
+        self.execute { (response: Response<T>?, error: NSError?) in
+            if let response = response {
+                deferred.fulfill(response)
+            } else {
+                deferred.reject(error!)
+            }
+        }
+        return deferred.promise
+    }
+}
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models.swift
new file mode 100644
index 00000000000..d8ef5b109c2
--- /dev/null
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models.swift
@@ -0,0 +1,185 @@
+// Models.swift
+//
+// Generated by swagger-codegen
+// https://github.com/swagger-api/swagger-codegen
+//
+
+import Foundation
+
+protocol JSONEncodable {
+    func encodeToJSON() -> AnyObject
+}
+
+class Response<T> {
+    let statusCode: Int
+    let header: [String: String]
+    let body: T
+
+    init(statusCode: Int, header: [String: String], body: T) {
+        self.statusCode = statusCode
+        self.header = header
+        self.body = body
+    }
+
+    convenience init(response: NSHTTPURLResponse, body: T) {
+        let rawHeader = response.allHeaderFields
+        var header = [String:String]()
+        for (key, value) in rawHeader {
+            header[key as! String] = value as? String
+        }
+        self.init(statusCode: response.statusCode, header: header, body: body)
+    }
+}
+
+private var once = dispatch_once_t()
+class Decoders {
+    static private var decoders = Dictionary<String, ((AnyObject) -> AnyObject)>()
+    
+    static func addDecoder<T>(#clazz: T.Type, decoder: ((AnyObject) -> T)) {
+        let key = "\(T.self)"
+        decoders[key] = { decoder($0) as! AnyObject }
+    }
+    
+    static func decode<T>(#clazz: [T].Type, source: AnyObject) -> [T] {
+        let array = source as! [AnyObject]
+        return array.map { Decoders.decode(clazz: T.self, source: $0) }
+    }
+    
+    static func decode<T, Key: Hashable>(#clazz: [Key:T].Type, source: AnyObject) -> [Key:T] {
+        let sourceDictinoary = source as! [Key: AnyObject]
+        var dictionary = [Key:T]()
+        for (key, value) in sourceDictinoary {
+            dictionary[key] = Decoders.decode(clazz: T.self, source: value)
+        }
+        return dictionary
+    }
+    
+    static func decode<T>(#clazz: T.Type, source: AnyObject) -> T {
+        initialize()
+        if source is T {
+            return source as! T
+        }
+        
+        let key = "\(T.self)"
+        if let decoder = decoders[key] {
+           return decoder(source) as! T
+        } else {
+            fatalError("Source \(source) is not convertible to type \(clazz): Maybe swagger file is insufficient")
+        }
+    }
+
+    static func decodeOptional<T>(#clazz: T.Type, source: AnyObject?) -> T? {
+        if source is NSNull {
+            return nil
+        }
+        return source.map { (source: AnyObject) -> T in
+            Decoders.decode(clazz: clazz, source: source)
+        }
+    }
+
+    static func decodeOptional<T>(#clazz: [T].Type, source: AnyObject?) -> [T]? {
+        if source is NSNull {
+            return nil
+        }
+        return source.map { (someSource: AnyObject) -> [T] in
+            Decoders.decode(clazz: clazz, source: someSource)
+        }
+    }
+
+    static func decodeOptional<T, Key: Hashable>(#clazz: [Key:T].Type, source: AnyObject?) -> [Key:T]? {
+        if source is NSNull {
+            return nil
+        }
+        return source.map { (someSource: AnyObject) -> [Key:T] in
+            Decoders.decode(clazz: clazz, source: someSource)
+        }
+    }
+	
+    static private func initialize() {
+        dispatch_once(&once) {
+            let formatters = [
+                "yyyy-MM-dd",
+                "yyyy-MM-dd'T'HH:mm:ssZZZZZ",
+                "yyyy-MM-dd'T'HH:mm:ss'Z'"
+            ].map { (format: String) -> NSDateFormatter in
+                let formatter = NSDateFormatter()
+                formatter.dateFormat = format
+                return formatter
+            }
+            // 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
+                    }
+                }
+                fatalError("formatter failed to parse \(sourceString)")
+            } 
+
+			// Decoder for User
+            Decoders.addDecoder(clazz: User.self) { (source: AnyObject) -> User in
+                let sourceDictionary = source as! [NSObject:AnyObject]
+                var instance = User()
+                instance.id = Decoders.decodeOptional(clazz: Int.self, source: sourceDictionary["id"])
+                instance.username = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["username"])
+                instance.firstName = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["firstName"])
+                instance.lastName = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["lastName"])
+                instance.email = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["email"])
+                instance.password = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["password"])
+                instance.phone = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["phone"])
+                instance.userStatus = Decoders.decodeOptional(clazz: Int.self, source: sourceDictionary["userStatus"])
+                return instance
+            }
+			
+
+			// Decoder for Category
+            Decoders.addDecoder(clazz: Category.self) { (source: AnyObject) -> Category in
+                let sourceDictionary = source as! [NSObject:AnyObject]
+                var 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
+                let sourceDictionary = source as! [NSObject:AnyObject]
+                var 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
+                let sourceDictionary = source as! [NSObject:AnyObject]
+                var 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
+                let sourceDictionary = source as! [NSObject:AnyObject]
+                var 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/Category.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Category.swift
new file mode 100644
index 00000000000..eab3e7b9e01
--- /dev/null
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Category.swift
@@ -0,0 +1,25 @@
+//
+// Category.swift
+//
+// Generated by swagger-codegen
+// https://github.com/swagger-api/swagger-codegen
+//
+
+import Foundation
+
+
+class Category: JSONEncodable {
+
+    var id: Int?
+    var name: String?
+    
+
+    // MARK: JSONEncodable
+    func encodeToJSON() -> AnyObject {
+        var nillableDictionary = [String:AnyObject?]()
+        nillableDictionary["id"] = self.id
+        nillableDictionary["name"] = self.name
+        let dictionary: [String:AnyObject] = APIHelper.rejectNil(nillableDictionary) ?? [:]
+        return dictionary
+    }
+}
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Order.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Order.swift
new file mode 100644
index 00000000000..11884502bc1
--- /dev/null
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Order.swift
@@ -0,0 +1,40 @@
+//
+// Order.swift
+//
+// Generated by swagger-codegen
+// https://github.com/swagger-api/swagger-codegen
+//
+
+import Foundation
+
+
+class Order: JSONEncodable {
+
+    enum Status: String { 
+        case Placed = "placed"
+        case Approved = "approved"
+        case Delivered = "delivered"
+    }
+    
+    var id: Int?
+    var petId: Int?
+    var quantity: Int?
+    var shipDate: NSDate?
+    /** Order Status */
+    var status: Status?
+    var complete: Bool?
+    
+
+    // MARK: JSONEncodable
+    func encodeToJSON() -> AnyObject {
+        var nillableDictionary = [String:AnyObject?]()
+        nillableDictionary["id"] = self.id
+        nillableDictionary["petId"] = self.petId
+        nillableDictionary["quantity"] = self.quantity
+        nillableDictionary["shipDate"] = self.shipDate?.encodeToJSON()
+        nillableDictionary["status"] = self.status?.rawValue
+        nillableDictionary["complete"] = self.complete
+        let dictionary: [String:AnyObject] = APIHelper.rejectNil(nillableDictionary) ?? [:]
+        return dictionary
+    }
+}
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Pet.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Pet.swift
new file mode 100644
index 00000000000..0baac38a285
--- /dev/null
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Pet.swift
@@ -0,0 +1,40 @@
+//
+// Pet.swift
+//
+// Generated by swagger-codegen
+// https://github.com/swagger-api/swagger-codegen
+//
+
+import Foundation
+
+
+class Pet: JSONEncodable {
+
+    enum Status: String { 
+        case Available = "available"
+        case Pending = "pending"
+        case Sold = "sold"
+    }
+    
+    var id: Int?
+    var category: Category?
+    var name: String?
+    var photoUrls: [String]?
+    var tags: [Tag]?
+    /** pet status in the store */
+    var status: Status?
+    
+
+    // MARK: JSONEncodable
+    func encodeToJSON() -> AnyObject {
+        var nillableDictionary = [String:AnyObject?]()
+        nillableDictionary["id"] = self.id
+        nillableDictionary["category"] = self.category?.encodeToJSON()
+        nillableDictionary["name"] = self.name
+        nillableDictionary["photoUrls"] = self.photoUrls?.encodeToJSON()
+        nillableDictionary["tags"] = self.tags?.encodeToJSON()
+        nillableDictionary["status"] = self.status?.rawValue
+        let dictionary: [String:AnyObject] = APIHelper.rejectNil(nillableDictionary) ?? [:]
+        return dictionary
+    }
+}
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Tag.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Tag.swift
new file mode 100644
index 00000000000..2951506a0dc
--- /dev/null
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Tag.swift
@@ -0,0 +1,25 @@
+//
+// Tag.swift
+//
+// Generated by swagger-codegen
+// https://github.com/swagger-api/swagger-codegen
+//
+
+import Foundation
+
+
+class Tag: JSONEncodable {
+
+    var id: Int?
+    var name: String?
+    
+
+    // MARK: JSONEncodable
+    func encodeToJSON() -> AnyObject {
+        var nillableDictionary = [String:AnyObject?]()
+        nillableDictionary["id"] = self.id
+        nillableDictionary["name"] = self.name
+        let dictionary: [String:AnyObject] = APIHelper.rejectNil(nillableDictionary) ?? [:]
+        return dictionary
+    }
+}
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/User.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/User.swift
new file mode 100644
index 00000000000..f2461238dc7
--- /dev/null
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/User.swift
@@ -0,0 +1,38 @@
+//
+// User.swift
+//
+// Generated by swagger-codegen
+// https://github.com/swagger-api/swagger-codegen
+//
+
+import Foundation
+
+
+class User: JSONEncodable {
+
+    var id: Int?
+    var username: String?
+    var firstName: String?
+    var lastName: String?
+    var email: String?
+    var password: String?
+    var phone: String?
+    /** User Status */
+    var userStatus: Int?
+    
+
+    // MARK: JSONEncodable
+    func encodeToJSON() -> AnyObject {
+        var nillableDictionary = [String:AnyObject?]()
+        nillableDictionary["id"] = self.id
+        nillableDictionary["username"] = self.username
+        nillableDictionary["firstName"] = self.firstName
+        nillableDictionary["lastName"] = self.lastName
+        nillableDictionary["email"] = self.email
+        nillableDictionary["password"] = self.password
+        nillableDictionary["phone"] = self.phone
+        nillableDictionary["userStatus"] = self.userStatus
+        let dictionary: [String:AnyObject] = APIHelper.rejectNil(nillableDictionary) ?? [:]
+        return dictionary
+    }
+}
diff --git a/samples/client/petstore/typescript-angular/.gitignore b/samples/client/petstore/typescript-angular/.gitignore
new file mode 100644
index 00000000000..abfad1bf5e2
--- /dev/null
+++ b/samples/client/petstore/typescript-angular/.gitignore
@@ -0,0 +1,3 @@
+/node_modules
+/typings
+/client.js
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular/API/Client/Category.ts b/samples/client/petstore/typescript-angular/API/Client/Category.ts
new file mode 100644
index 00000000000..7faf87208eb
--- /dev/null
+++ b/samples/client/petstore/typescript-angular/API/Client/Category.ts
@@ -0,0 +1,13 @@
+/// <reference path="api.d.ts" />
+
+module API.Client {
+    'use strict';
+
+    export class Category {
+
+        id: number;
+
+        name: string;
+    }
+
+}
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular/API/Client/Order.ts b/samples/client/petstore/typescript-angular/API/Client/Order.ts
new file mode 100644
index 00000000000..abee3a2894b
--- /dev/null
+++ b/samples/client/petstore/typescript-angular/API/Client/Order.ts
@@ -0,0 +1,32 @@
+/// <reference path="api.d.ts" />
+
+module API.Client {
+    'use strict';
+
+    export class Order {
+
+        id: number;
+
+        petId: number;
+
+        quantity: number;
+
+        shipDate: Date;
+
+        /**
+         * Order Status
+         */
+        status: Order.StatusEnum;
+
+        complete: boolean;
+    }
+
+    export module Order {
+
+        export enum StatusEnum {  
+            placed = <any> 'placed', 
+            approved = <any> 'approved', 
+            delivered = <any> 'delivered',
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular/API/Client/Pet.ts b/samples/client/petstore/typescript-angular/API/Client/Pet.ts
new file mode 100644
index 00000000000..9523bef90b0
--- /dev/null
+++ b/samples/client/petstore/typescript-angular/API/Client/Pet.ts
@@ -0,0 +1,32 @@
+/// <reference path="api.d.ts" />
+
+module API.Client {
+    'use strict';
+
+    export class Pet {
+
+        id: number;
+
+        category: Category;
+
+        name: string;
+
+        photoUrls: Array<string>;
+
+        tags: Array<Tag>;
+
+        /**
+         * pet status in the store
+         */
+        status: Pet.StatusEnum;
+    }
+
+    export module Pet {
+
+        export enum StatusEnum {  
+            available = <any> 'available', 
+            pending = <any> 'pending', 
+            sold = <any> 'sold',
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular/API/Client/PetApi.ts b/samples/client/petstore/typescript-angular/API/Client/PetApi.ts
new file mode 100644
index 00000000000..6bb4e10d387
--- /dev/null
+++ b/samples/client/petstore/typescript-angular/API/Client/PetApi.ts
@@ -0,0 +1,267 @@
+/// <reference path="api.d.ts" />
+
+/* tslint:disable:no-unused-variable member-ordering */
+
+module API.Client {
+    'use strict';
+
+    export class PetApi {
+        private basePath = '/v2';
+
+        static $inject: string[] = ['$http'];
+
+        constructor(private $http: ng.IHttpService, basePath?: string) {
+            if (basePath) {
+                this.basePath = basePath;
+            }
+        }
+
+        public updatePet (body?: Pet, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
+            var path = this.basePath + '/pet';
+
+            var queryParameters: any = {};
+            var headerParams: any = {};
+
+            var httpRequestParams: any = {
+                method: 'PUT',
+                url: path,
+                json: true,
+                data: body,
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                for (var k in extraHttpRequestParams) {
+                    if (extraHttpRequestParams.hasOwnProperty(k)) {
+                        httpRequestParams[k] = extraHttpRequestParams[k];
+                    }
+                }
+            }
+
+            return this.$http(httpRequestParams);
+        }
+
+        public addPet (body?: Pet, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
+            var path = this.basePath + '/pet';
+
+            var queryParameters: any = {};
+            var headerParams: any = {};
+
+            var httpRequestParams: any = {
+                method: 'POST',
+                url: path,
+                json: true,
+                data: body,
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                for (var k in extraHttpRequestParams) {
+                    if (extraHttpRequestParams.hasOwnProperty(k)) {
+                        httpRequestParams[k] = extraHttpRequestParams[k];
+                    }
+                }
+            }
+
+            return this.$http(httpRequestParams);
+        }
+
+        public findPetsByStatus (status?: Array<string>, extraHttpRequestParams?: any ) : ng.IHttpPromise<Array<Pet>> {
+            var path = this.basePath + '/pet/findByStatus';
+
+            var queryParameters: any = {};
+            var headerParams: any = {};
+
+            if (status !== undefined) {
+                queryParameters['status'] = status;
+            }
+
+            var httpRequestParams: any = {
+                method: 'GET',
+                url: path,
+                json: true,
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                for (var k in extraHttpRequestParams) {
+                    if (extraHttpRequestParams.hasOwnProperty(k)) {
+                        httpRequestParams[k] = extraHttpRequestParams[k];
+                    }
+                }
+            }
+
+            return this.$http(httpRequestParams);
+        }
+
+        public findPetsByTags (tags?: Array<string>, extraHttpRequestParams?: any ) : ng.IHttpPromise<Array<Pet>> {
+            var path = this.basePath + '/pet/findByTags';
+
+            var queryParameters: any = {};
+            var headerParams: any = {};
+
+            if (tags !== undefined) {
+                queryParameters['tags'] = tags;
+            }
+
+            var httpRequestParams: any = {
+                method: 'GET',
+                url: path,
+                json: true,
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                for (var k in extraHttpRequestParams) {
+                    if (extraHttpRequestParams.hasOwnProperty(k)) {
+                        httpRequestParams[k] = extraHttpRequestParams[k];
+                    }
+                }
+            }
+
+            return this.$http(httpRequestParams);
+        }
+
+        public getPetById (petId: number, extraHttpRequestParams?: any ) : ng.IHttpPromise<Pet> {
+            var path = this.basePath + '/pet/{petId}';
+
+            path = path.replace('{' + 'petId' + '}', String(petId));
+
+            var queryParameters: any = {};
+            var headerParams: any = {};
+
+            // verify required parameter 'petId' is set
+            if (!petId) {
+                throw new Error('Missing required parameter petId when calling getPetById');
+            }
+
+            var httpRequestParams: any = {
+                method: 'GET',
+                url: path,
+                json: true,
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                for (var k in extraHttpRequestParams) {
+                    if (extraHttpRequestParams.hasOwnProperty(k)) {
+                        httpRequestParams[k] = extraHttpRequestParams[k];
+                    }
+                }
+            }
+
+            return this.$http(httpRequestParams);
+        }
+
+        public updatePetWithForm (petId: string, name?: string, status?: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
+            var path = this.basePath + '/pet/{petId}';
+
+            path = path.replace('{' + 'petId' + '}', String(petId));
+
+            var queryParameters: any = {};
+            var headerParams: any = {};
+
+            // verify required parameter 'petId' is set
+            if (!petId) {
+                throw new Error('Missing required parameter petId when calling updatePetWithForm');
+            }
+
+            var httpRequestParams: any = {
+                method: 'POST',
+                url: path,
+                json: true,
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                for (var k in extraHttpRequestParams) {
+                    if (extraHttpRequestParams.hasOwnProperty(k)) {
+                        httpRequestParams[k] = extraHttpRequestParams[k];
+                    }
+                }
+            }
+
+            return this.$http(httpRequestParams);
+        }
+
+        public deletePet (petId: number, apiKey?: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
+            var path = this.basePath + '/pet/{petId}';
+
+            path = path.replace('{' + 'petId' + '}', String(petId));
+
+            var queryParameters: any = {};
+            var headerParams: any = {};
+
+            // verify required parameter 'petId' is set
+            if (!petId) {
+                throw new Error('Missing required parameter petId when calling deletePet');
+            }
+
+            headerParams['apiKey'] = apiKey;
+
+            var httpRequestParams: any = {
+                method: 'DELETE',
+                url: path,
+                json: true,
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                for (var k in extraHttpRequestParams) {
+                    if (extraHttpRequestParams.hasOwnProperty(k)) {
+                        httpRequestParams[k] = extraHttpRequestParams[k];
+                    }
+                }
+            }
+
+            return this.$http(httpRequestParams);
+        }
+
+        public uploadFile (petId: number, additionalMetadata?: string, file?: any, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
+            var path = this.basePath + '/pet/{petId}/uploadImage';
+
+            path = path.replace('{' + 'petId' + '}', String(petId));
+
+            var queryParameters: any = {};
+            var headerParams: any = {};
+
+            // verify required parameter 'petId' is set
+            if (!petId) {
+                throw new Error('Missing required parameter petId when calling uploadFile');
+            }
+
+            var httpRequestParams: any = {
+                method: 'POST',
+                url: path,
+                json: true,
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                for (var k in extraHttpRequestParams) {
+                    if (extraHttpRequestParams.hasOwnProperty(k)) {
+                        httpRequestParams[k] = extraHttpRequestParams[k];
+                    }
+                }
+            }
+
+            return this.$http(httpRequestParams);
+        }
+    }
+}
diff --git a/samples/client/petstore/typescript-angular/API/Client/StoreApi.ts b/samples/client/petstore/typescript-angular/API/Client/StoreApi.ts
new file mode 100644
index 00000000000..948b6859381
--- /dev/null
+++ b/samples/client/petstore/typescript-angular/API/Client/StoreApi.ts
@@ -0,0 +1,138 @@
+/// <reference path="api.d.ts" />
+
+/* tslint:disable:no-unused-variable member-ordering */
+
+module API.Client {
+    'use strict';
+
+    export class StoreApi {
+        private basePath = '/v2';
+
+        static $inject: string[] = ['$http'];
+
+        constructor(private $http: ng.IHttpService, basePath?: string) {
+            if (basePath) {
+                this.basePath = basePath;
+            }
+        }
+
+        public getInventory (extraHttpRequestParams?: any ) : ng.IHttpPromise<{ [key: string]: number; }> {
+            var path = this.basePath + '/store/inventory';
+
+            var queryParameters: any = {};
+            var headerParams: any = {};
+
+            var httpRequestParams: any = {
+                method: 'GET',
+                url: path,
+                json: true,
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                for (var k in extraHttpRequestParams) {
+                    if (extraHttpRequestParams.hasOwnProperty(k)) {
+                        httpRequestParams[k] = extraHttpRequestParams[k];
+                    }
+                }
+            }
+
+            return this.$http(httpRequestParams);
+        }
+
+        public placeOrder (body?: Order, extraHttpRequestParams?: any ) : ng.IHttpPromise<Order> {
+            var path = this.basePath + '/store/order';
+
+            var queryParameters: any = {};
+            var headerParams: any = {};
+
+            var httpRequestParams: any = {
+                method: 'POST',
+                url: path,
+                json: true,
+                data: body,
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                for (var k in extraHttpRequestParams) {
+                    if (extraHttpRequestParams.hasOwnProperty(k)) {
+                        httpRequestParams[k] = extraHttpRequestParams[k];
+                    }
+                }
+            }
+
+            return this.$http(httpRequestParams);
+        }
+
+        public getOrderById (orderId: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<Order> {
+            var path = this.basePath + '/store/order/{orderId}';
+
+            path = path.replace('{' + 'orderId' + '}', String(orderId));
+
+            var queryParameters: any = {};
+            var headerParams: any = {};
+
+            // verify required parameter 'orderId' is set
+            if (!orderId) {
+                throw new Error('Missing required parameter orderId when calling getOrderById');
+            }
+
+            var httpRequestParams: any = {
+                method: 'GET',
+                url: path,
+                json: true,
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                for (var k in extraHttpRequestParams) {
+                    if (extraHttpRequestParams.hasOwnProperty(k)) {
+                        httpRequestParams[k] = extraHttpRequestParams[k];
+                    }
+                }
+            }
+
+            return this.$http(httpRequestParams);
+        }
+
+        public deleteOrder (orderId: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
+            var path = this.basePath + '/store/order/{orderId}';
+
+            path = path.replace('{' + 'orderId' + '}', String(orderId));
+
+            var queryParameters: any = {};
+            var headerParams: any = {};
+
+            // verify required parameter 'orderId' is set
+            if (!orderId) {
+                throw new Error('Missing required parameter orderId when calling deleteOrder');
+            }
+
+            var httpRequestParams: any = {
+                method: 'DELETE',
+                url: path,
+                json: true,
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                for (var k in extraHttpRequestParams) {
+                    if (extraHttpRequestParams.hasOwnProperty(k)) {
+                        httpRequestParams[k] = extraHttpRequestParams[k];
+                    }
+                }
+            }
+
+            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
new file mode 100644
index 00000000000..2ec9b456f27
--- /dev/null
+++ b/samples/client/petstore/typescript-angular/API/Client/Tag.ts
@@ -0,0 +1,13 @@
+/// <reference path="api.d.ts" />
+
+module API.Client {
+    'use strict';
+
+    export class Tag {
+
+        id: number;
+
+        name: string;
+    }
+
+}
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular/API/Client/User.ts b/samples/client/petstore/typescript-angular/API/Client/User.ts
new file mode 100644
index 00000000000..ca8ac57c7a3
--- /dev/null
+++ b/samples/client/petstore/typescript-angular/API/Client/User.ts
@@ -0,0 +1,28 @@
+/// <reference path="api.d.ts" />
+
+module API.Client {
+    'use strict';
+
+    export class User {
+
+        id: number;
+
+        username: string;
+
+        firstName: string;
+
+        lastName: string;
+
+        email: string;
+
+        password: string;
+
+        phone: string;
+
+        /**
+         * User Status
+         */
+        userStatus: number;
+    }
+
+}
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular/API/Client/UserApi.ts b/samples/client/petstore/typescript-angular/API/Client/UserApi.ts
new file mode 100644
index 00000000000..eb04f4b31f0
--- /dev/null
+++ b/samples/client/petstore/typescript-angular/API/Client/UserApi.ts
@@ -0,0 +1,260 @@
+/// <reference path="api.d.ts" />
+
+/* tslint:disable:no-unused-variable member-ordering */
+
+module API.Client {
+    'use strict';
+
+    export class UserApi {
+        private basePath = '/v2';
+
+        static $inject: string[] = ['$http'];
+
+        constructor(private $http: ng.IHttpService, basePath?: string) {
+            if (basePath) {
+                this.basePath = basePath;
+            }
+        }
+
+        public createUser (body?: User, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
+            var path = this.basePath + '/user';
+
+            var queryParameters: any = {};
+            var headerParams: any = {};
+
+            var httpRequestParams: any = {
+                method: 'POST',
+                url: path,
+                json: true,
+                data: body,
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                for (var k in extraHttpRequestParams) {
+                    if (extraHttpRequestParams.hasOwnProperty(k)) {
+                        httpRequestParams[k] = extraHttpRequestParams[k];
+                    }
+                }
+            }
+
+            return this.$http(httpRequestParams);
+        }
+
+        public createUsersWithArrayInput (body?: Array<User>, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
+            var path = this.basePath + '/user/createWithArray';
+
+            var queryParameters: any = {};
+            var headerParams: any = {};
+
+            var httpRequestParams: any = {
+                method: 'POST',
+                url: path,
+                json: true,
+                data: body,
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                for (var k in extraHttpRequestParams) {
+                    if (extraHttpRequestParams.hasOwnProperty(k)) {
+                        httpRequestParams[k] = extraHttpRequestParams[k];
+                    }
+                }
+            }
+
+            return this.$http(httpRequestParams);
+        }
+
+        public createUsersWithListInput (body?: Array<User>, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
+            var path = this.basePath + '/user/createWithList';
+
+            var queryParameters: any = {};
+            var headerParams: any = {};
+
+            var httpRequestParams: any = {
+                method: 'POST',
+                url: path,
+                json: true,
+                data: body,
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                for (var k in extraHttpRequestParams) {
+                    if (extraHttpRequestParams.hasOwnProperty(k)) {
+                        httpRequestParams[k] = extraHttpRequestParams[k];
+                    }
+                }
+            }
+
+            return this.$http(httpRequestParams);
+        }
+
+        public loginUser (username?: string, password?: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<string> {
+            var path = this.basePath + '/user/login';
+
+            var queryParameters: any = {};
+            var headerParams: any = {};
+
+            if (username !== undefined) {
+                queryParameters['username'] = username;
+            }
+
+            if (password !== undefined) {
+                queryParameters['password'] = password;
+            }
+
+            var httpRequestParams: any = {
+                method: 'GET',
+                url: path,
+                json: true,
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                for (var k in extraHttpRequestParams) {
+                    if (extraHttpRequestParams.hasOwnProperty(k)) {
+                        httpRequestParams[k] = extraHttpRequestParams[k];
+                    }
+                }
+            }
+
+            return this.$http(httpRequestParams);
+        }
+
+        public logoutUser (extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
+            var path = this.basePath + '/user/logout';
+
+            var queryParameters: any = {};
+            var headerParams: any = {};
+
+            var httpRequestParams: any = {
+                method: 'GET',
+                url: path,
+                json: true,
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                for (var k in extraHttpRequestParams) {
+                    if (extraHttpRequestParams.hasOwnProperty(k)) {
+                        httpRequestParams[k] = extraHttpRequestParams[k];
+                    }
+                }
+            }
+
+            return this.$http(httpRequestParams);
+        }
+
+        public getUserByName (username: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<User> {
+            var path = this.basePath + '/user/{username}';
+
+            path = path.replace('{' + 'username' + '}', String(username));
+
+            var queryParameters: any = {};
+            var headerParams: any = {};
+
+            // verify required parameter 'username' is set
+            if (!username) {
+                throw new Error('Missing required parameter username when calling getUserByName');
+            }
+
+            var httpRequestParams: any = {
+                method: 'GET',
+                url: path,
+                json: true,
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                for (var k in extraHttpRequestParams) {
+                    if (extraHttpRequestParams.hasOwnProperty(k)) {
+                        httpRequestParams[k] = extraHttpRequestParams[k];
+                    }
+                }
+            }
+
+            return this.$http(httpRequestParams);
+        }
+
+        public updateUser (username: string, body?: User, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
+            var path = this.basePath + '/user/{username}';
+
+            path = path.replace('{' + 'username' + '}', String(username));
+
+            var queryParameters: any = {};
+            var headerParams: any = {};
+
+            // verify required parameter 'username' is set
+            if (!username) {
+                throw new Error('Missing required parameter username when calling updateUser');
+            }
+
+            var httpRequestParams: any = {
+                method: 'PUT',
+                url: path,
+                json: true,
+                data: body,
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                for (var k in extraHttpRequestParams) {
+                    if (extraHttpRequestParams.hasOwnProperty(k)) {
+                        httpRequestParams[k] = extraHttpRequestParams[k];
+                    }
+                }
+            }
+
+            return this.$http(httpRequestParams);
+        }
+
+        public deleteUser (username: string, extraHttpRequestParams?: any ) : ng.IHttpPromise<{}> {
+            var path = this.basePath + '/user/{username}';
+
+            path = path.replace('{' + 'username' + '}', String(username));
+
+            var queryParameters: any = {};
+            var headerParams: any = {};
+
+            // verify required parameter 'username' is set
+            if (!username) {
+                throw new Error('Missing required parameter username when calling deleteUser');
+            }
+
+            var httpRequestParams: any = {
+                method: 'DELETE',
+                url: path,
+                json: true,
+                
+                params: queryParameters,
+                headers: headerParams
+            };
+
+            if (extraHttpRequestParams) {
+                for (var k in extraHttpRequestParams) {
+                    if (extraHttpRequestParams.hasOwnProperty(k)) {
+                        httpRequestParams[k] = extraHttpRequestParams[k];
+                    }
+                }
+            }
+
+            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
new file mode 100644
index 00000000000..19c60623dc9
--- /dev/null
+++ b/samples/client/petstore/typescript-angular/API/Client/api.d.ts
@@ -0,0 +1,9 @@
+/// <reference path="User.ts" />
+/// <reference path="Category.ts" />
+/// <reference path="Pet.ts" />
+/// <reference path="Tag.ts" />
+/// <reference path="Order.ts" />
+
+/// <reference path="UserApi.ts" />
+/// <reference path="PetApi.ts" />
+/// <reference path="StoreApi.ts" />
diff --git a/samples/client/petstore/typescript-angular/README.md b/samples/client/petstore/typescript-angular/README.md
new file mode 100644
index 00000000000..3a4e49be9e8
--- /dev/null
+++ b/samples/client/petstore/typescript-angular/README.md
@@ -0,0 +1,19 @@
+# SwaggerClient
+
+Sample of TypeScript AngularJS petstore client
+
+## Testing the generated code
+
+```
+npm install
+npm test
+```
+
+To clean the workspace run:
+```
+npm run clean
+```
+
+## Author
+
+mads@maetzke-tandrup.dk
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular/package.json b/samples/client/petstore/typescript-angular/package.json
new file mode 100644
index 00000000000..f50b782c09f
--- /dev/null
+++ b/samples/client/petstore/typescript-angular/package.json
@@ -0,0 +1,20 @@
+{
+  "name": "petstore-typescript-node-sample",
+  "version": "1.0.0",
+  "description": "Sample of generated TypeScript petstore client",
+  "main": "api.js",
+  "scripts": {
+    "postinstall": "tsd reinstall --overwrite",
+    "test": "tsc",
+    "clean": "rm -Rf node_modules/ typings/ *.js"
+  },
+  "author": "Mads M. Tandrup",
+  "license": "Apache 2.0",
+  "dependencies": {
+    "angular": "^1.4.3"
+  },
+  "devDependencies": {
+    "tsd": "^0.6.3",
+    "typescript": "^1.5.3"
+  }
+}
diff --git a/samples/client/petstore/typescript-angular/tsconfig.json b/samples/client/petstore/typescript-angular/tsconfig.json
new file mode 100644
index 00000000000..c389d5011ff
--- /dev/null
+++ b/samples/client/petstore/typescript-angular/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "noImplicitAny": true,
+        "out": "client.js"
+    },
+    "files": [
+        "API/Client/Category.ts",
+        "API/Client/Pet.ts",
+        "API/Client/StoreApi.ts",
+        "API/Client/User.ts",
+        "API/Client/api.d.ts",
+        "API/Client/Order.ts",
+        "API/Client/PetApi.ts",
+        "API/Client/Tag.ts",
+        "API/Client/UserApi.ts",
+        "typings/tsd.d.ts"
+    ]
+}
diff --git a/samples/client/petstore/typescript-angular/tsd.json b/samples/client/petstore/typescript-angular/tsd.json
new file mode 100644
index 00000000000..182b9f68fa2
--- /dev/null
+++ b/samples/client/petstore/typescript-angular/tsd.json
@@ -0,0 +1,15 @@
+{
+  "version": "v4",
+  "repo": "borisyankov/DefinitelyTyped",
+  "ref": "master",
+  "path": "typings",
+  "bundle": "typings/tsd.d.ts",
+  "installed": {
+    "angularjs/angular.d.ts": {
+      "commit": "f6c8ca47193fb67947944a3170912672ac3e908e"
+    },
+    "jquery/jquery.d.ts": {
+      "commit": "f6c8ca47193fb67947944a3170912672ac3e908e"
+    }
+  }
+}
diff --git a/samples/client/petstore/typescript-node/.gitignore b/samples/client/petstore/typescript-node/.gitignore
new file mode 100644
index 00000000000..5c06ad7bc24
--- /dev/null
+++ b/samples/client/petstore/typescript-node/.gitignore
@@ -0,0 +1,3 @@
+/node_modules
+/typings
+/*.js
diff --git a/samples/client/petstore/typescript-node/README.md b/samples/client/petstore/typescript-node/README.md
new file mode 100644
index 00000000000..82225d3260a
--- /dev/null
+++ b/samples/client/petstore/typescript-node/README.md
@@ -0,0 +1,22 @@
+# SwaggerClient
+
+Sample of TypeScript Node.js petstore client
+
+## Testing the generated code
+
+```
+npm install
+npm test
+```
+
+This will compile the code and run a small test application that will do some simple test calls to the Swagger Petstore API.
+
+To clean the workspace run:
+```
+npm run clean
+```
+
+
+## Author
+
+mads@maetzke-tandrup.dk
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-node/api.ts b/samples/client/petstore/typescript-node/api.ts
new file mode 100644
index 00000000000..0b7089fdaae
--- /dev/null
+++ b/samples/client/petstore/typescript-node/api.ts
@@ -0,0 +1,1199 @@
+import request = require('request');
+import promise = require('bluebird');
+import http = require('http');
+
+// ===============================================
+// This file is autogenerated - Please do not edit
+// ===============================================
+
+/* 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;
+}
+
+export class Pet {
+    id: number;
+    category: Category;
+    name: string;
+    photoUrls: Array<string>;
+    tags: Array<Tag>;
+    /**
+    * pet status in the store
+    */
+    status: Pet.StatusEnum;
+}
+
+export module Pet {
+    export enum StatusEnum { 
+        available = <any> 'available',
+        pending = <any> 'pending',
+        sold = <any> 'sold',
+    }
+}
+export class Tag {
+    id: number;
+    name: string;
+}
+
+export class Order {
+    id: number;
+    petId: number;
+    quantity: number;
+    shipDate: Date;
+    /**
+    * Order Status
+    */
+    status: Order.StatusEnum;
+    complete: boolean;
+}
+
+export module Order {
+    export enum StatusEnum { 
+        placed = <any> 'placed',
+        approved = <any> 'approved',
+        delivered = <any> 'delivered',
+    }
+}
+
+interface Authentication {
+    /**
+    * Apply authentication settings to header and query params.
+    */
+    applyToRequest(requestOptions: request.Options): void;
+}
+
+class HttpBasicAuth implements Authentication {
+    public username: string;
+    public password: string;
+    applyToRequest(requestOptions: request.Options): void {
+        requestOptions.auth = {
+            username: this.username, password: this.password
+        }
+    }
+}
+
+class ApiKeyAuth implements Authentication {
+    public apiKey: string;
+
+    constructor(private location: string, private paramName: string) {
+    }
+
+    applyToRequest(requestOptions: request.Options): void {
+        if (this.location == "query") {
+            (<any>requestOptions.qs)[this.paramName] = this.apiKey;
+        } else if (this.location == "header") {
+            requestOptions.headers[this.paramName] = this.apiKey;
+        }
+    }
+}
+
+class OAuth implements Authentication {
+    applyToRequest(requestOptions: request.Options): void {
+        // TODO: support oauth
+    }
+}
+
+class VoidAuth implements Authentication {
+    public username: string;
+    public password: string;
+    applyToRequest(requestOptions: request.Options): void {
+        // Do nothing
+    }
+}
+
+export class UserApi {
+    private basePath = '/v2';
+    public authentications = {
+        'default': <Authentication>new VoidAuth(),
+        'api_key': new ApiKeyAuth('header', 'api_key'),
+        'petstore_auth': new OAuth(),
+    }
+
+    constructor(url: string, basePath?: string);
+    constructor(private url: string, 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;
+    }
+
+    public createUser (body?: User) : Promise<{ response: http.ClientResponse;  }> {
+        var path = this.url + this.basePath + '/user';
+
+        var queryParameters: any = {};
+        var headerParams: any = {};
+        var formParams: any = {};
+
+        var useFormData = false;
+
+        var deferred = promise.defer<{ response: http.ClientResponse;  }>();
+
+        var 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;
+    }
+
+    public createUsersWithArrayInput (body?: Array<User>) : Promise<{ response: http.ClientResponse;  }> {
+        var path = this.url + this.basePath + '/user/createWithArray';
+
+        var queryParameters: any = {};
+        var headerParams: any = {};
+        var formParams: any = {};
+
+        var useFormData = false;
+
+        var deferred = promise.defer<{ response: http.ClientResponse;  }>();
+
+        var 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;
+    }
+
+    public createUsersWithListInput (body?: Array<User>) : Promise<{ response: http.ClientResponse;  }> {
+        var path = this.url + this.basePath + '/user/createWithList';
+
+        var queryParameters: any = {};
+        var headerParams: any = {};
+        var formParams: any = {};
+
+        var useFormData = false;
+
+        var deferred = promise.defer<{ response: http.ClientResponse;  }>();
+
+        var 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;
+    }
+
+    public loginUser (username?: string, password?: string) : Promise<{ response: http.ClientResponse; body: string;  }> {
+        var path = this.url + this.basePath + '/user/login';
+
+        var queryParameters: any = {};
+        var headerParams: any = {};
+        var formParams: any = {};
+
+        if (username !== undefined) {
+            queryParameters['username'] = username;
+        }
+
+        if (password !== undefined) {
+            queryParameters['password'] = password;
+        }
+
+        var useFormData = false;
+
+        var deferred = promise.defer<{ response: http.ClientResponse; body: string;  }>();
+
+        var 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;
+    }
+
+    public logoutUser () : Promise<{ response: http.ClientResponse;  }> {
+        var path = this.url + this.basePath + '/user/logout';
+
+        var queryParameters: any = {};
+        var headerParams: any = {};
+        var formParams: any = {};
+
+        var useFormData = false;
+
+        var deferred = promise.defer<{ response: http.ClientResponse;  }>();
+
+        var 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;
+    }
+
+    public getUserByName (username: string) : Promise<{ response: http.ClientResponse; body: User;  }> {
+        var path = this.url + this.basePath + '/user/{username}';
+
+        path = path.replace('{' + 'username' + '}', String(username));
+
+        var queryParameters: any = {};
+        var headerParams: any = {};
+        var formParams: any = {};
+
+        // verify required parameter 'username' is set
+        if (!username) {
+            throw new Error('Missing required parameter username when calling getUserByName');
+        }
+
+        var useFormData = false;
+
+        var deferred = promise.defer<{ response: http.ClientResponse; body: User;  }>();
+
+        var 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;
+    }
+
+    public updateUser (username: string, body?: User) : Promise<{ response: http.ClientResponse;  }> {
+        var path = this.url + this.basePath + '/user/{username}';
+
+        path = path.replace('{' + 'username' + '}', String(username));
+
+        var queryParameters: any = {};
+        var headerParams: any = {};
+        var formParams: any = {};
+
+        // verify required parameter 'username' is set
+        if (!username) {
+            throw new Error('Missing required parameter username when calling updateUser');
+        }
+
+        var useFormData = false;
+
+        var deferred = promise.defer<{ response: http.ClientResponse;  }>();
+
+        var 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;
+    }
+
+    public deleteUser (username: string) : Promise<{ response: http.ClientResponse;  }> {
+        var path = this.url + this.basePath + '/user/{username}';
+
+        path = path.replace('{' + 'username' + '}', String(username));
+
+        var queryParameters: any = {};
+        var headerParams: any = {};
+        var formParams: any = {};
+
+        // verify required parameter 'username' is set
+        if (!username) {
+            throw new Error('Missing required parameter username when calling deleteUser');
+        }
+
+        var useFormData = false;
+
+        var deferred = promise.defer<{ response: http.ClientResponse;  }>();
+
+        var 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 {
+    private basePath = '/v2';
+    public authentications = {
+        'default': <Authentication>new VoidAuth(),
+        'api_key': new ApiKeyAuth('header', 'api_key'),
+        'petstore_auth': new OAuth(),
+    }
+
+    constructor(url: string, basePath?: string);
+    constructor(private url: string, 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;
+    }
+
+    public updatePet (body?: Pet) : Promise<{ response: http.ClientResponse;  }> {
+        var path = this.url + this.basePath + '/pet';
+
+        var queryParameters: any = {};
+        var headerParams: any = {};
+        var formParams: any = {};
+
+        var useFormData = false;
+
+        var deferred = promise.defer<{ response: http.ClientResponse;  }>();
+
+        var 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;
+    }
+
+    public addPet (body?: Pet) : Promise<{ response: http.ClientResponse;  }> {
+        var path = this.url + this.basePath + '/pet';
+
+        var queryParameters: any = {};
+        var headerParams: any = {};
+        var formParams: any = {};
+
+        var useFormData = false;
+
+        var deferred = promise.defer<{ response: http.ClientResponse;  }>();
+
+        var requestOptions: request.Options = {
+            method: 'POST',
+            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;
+    }
+
+    public findPetsByStatus (status?: Array<string>) : Promise<{ response: http.ClientResponse; body: Array<Pet>;  }> {
+        var path = this.url + this.basePath + '/pet/findByStatus';
+
+        var queryParameters: any = {};
+        var headerParams: any = {};
+        var formParams: any = {};
+
+        if (status !== undefined) {
+            queryParameters['status'] = status;
+        }
+
+        var useFormData = false;
+
+        var deferred = promise.defer<{ response: http.ClientResponse; body: Array<Pet>;  }>();
+
+        var requestOptions: request.Options = {
+            method: 'GET',
+            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;
+    }
+
+    public findPetsByTags (tags?: Array<string>) : Promise<{ response: http.ClientResponse; body: Array<Pet>;  }> {
+        var path = this.url + this.basePath + '/pet/findByTags';
+
+        var queryParameters: any = {};
+        var headerParams: any = {};
+        var formParams: any = {};
+
+        if (tags !== undefined) {
+            queryParameters['tags'] = tags;
+        }
+
+        var useFormData = false;
+
+        var deferred = promise.defer<{ response: http.ClientResponse; body: Array<Pet>;  }>();
+
+        var requestOptions: request.Options = {
+            method: 'GET',
+            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;
+    }
+
+    public getPetById (petId: number) : Promise<{ response: http.ClientResponse; body: Pet;  }> {
+        var path = this.url + this.basePath + '/pet/{petId}';
+
+        path = path.replace('{' + 'petId' + '}', String(petId));
+
+        var queryParameters: any = {};
+        var headerParams: any = {};
+        var formParams: any = {};
+
+        // verify required parameter 'petId' is set
+        if (!petId) {
+            throw new Error('Missing required parameter petId when calling getPetById');
+        }
+
+        var useFormData = false;
+
+        var deferred = promise.defer<{ response: http.ClientResponse; body: Pet;  }>();
+
+        var requestOptions: request.Options = {
+            method: 'GET',
+            qs: queryParameters,
+            headers: headerParams,
+            uri: path,
+            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) {
+                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;
+    }
+
+    public updatePetWithForm (petId: string, name?: string, status?: string) : Promise<{ response: http.ClientResponse;  }> {
+        var path = this.url + this.basePath + '/pet/{petId}';
+
+        path = path.replace('{' + 'petId' + '}', String(petId));
+
+        var queryParameters: any = {};
+        var headerParams: any = {};
+        var formParams: any = {};
+
+        // verify required parameter 'petId' is set
+        if (!petId) {
+            throw new Error('Missing required parameter petId when calling updatePetWithForm');
+        }
+
+        var useFormData = false;
+
+        if (name !== undefined) {
+            formParams['name'] = name;
+        }
+
+        if (status !== undefined) {
+            formParams['status'] = status;
+        }
+
+        var deferred = promise.defer<{ response: http.ClientResponse;  }>();
+
+        var requestOptions: request.Options = {
+            method: 'POST',
+            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;
+    }
+
+    public deletePet (petId: number, apiKey?: string) : Promise<{ response: http.ClientResponse;  }> {
+        var path = this.url + this.basePath + '/pet/{petId}';
+
+        path = path.replace('{' + 'petId' + '}', String(petId));
+
+        var queryParameters: any = {};
+        var headerParams: any = {};
+        var formParams: any = {};
+
+        // verify required parameter 'petId' is set
+        if (!petId) {
+            throw new Error('Missing required parameter petId when calling deletePet');
+        }
+
+        headerParams['apiKey'] = apiKey;
+
+        var useFormData = false;
+
+        var deferred = promise.defer<{ response: http.ClientResponse;  }>();
+
+        var 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;
+    }
+
+    public uploadFile (petId: number, additionalMetadata?: string, file?: any) : Promise<{ response: http.ClientResponse;  }> {
+        var path = this.url + this.basePath + '/pet/{petId}/uploadImage';
+
+        path = path.replace('{' + 'petId' + '}', String(petId));
+
+        var queryParameters: any = {};
+        var headerParams: any = {};
+        var formParams: any = {};
+
+        // verify required parameter 'petId' is set
+        if (!petId) {
+            throw new Error('Missing required parameter petId when calling uploadFile');
+        }
+
+        var useFormData = false;
+
+        if (additionalMetadata !== undefined) {
+            formParams['additionalMetadata'] = additionalMetadata;
+        }
+
+        if (file !== undefined) {
+            formParams['file'] = file;
+        }
+        useFormData = true;
+
+        var deferred = promise.defer<{ response: http.ClientResponse;  }>();
+
+        var requestOptions: request.Options = {
+            method: 'POST',
+            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;
+    }
+}
+export class StoreApi {
+    private basePath = '/v2';
+    public authentications = {
+        'default': <Authentication>new VoidAuth(),
+        'api_key': new ApiKeyAuth('header', 'api_key'),
+        'petstore_auth': new OAuth(),
+    }
+
+    constructor(url: string, basePath?: string);
+    constructor(private url: string, 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;
+    }
+
+    public getInventory () : Promise<{ response: http.ClientResponse; body: { [key: string]: number; };  }> {
+        var path = this.url + this.basePath + '/store/inventory';
+
+        var queryParameters: any = {};
+        var headerParams: any = {};
+        var formParams: any = {};
+
+        var useFormData = false;
+
+        var deferred = promise.defer<{ response: http.ClientResponse; body: { [key: string]: number; };  }>();
+
+        var requestOptions: request.Options = {
+            method: 'GET',
+            qs: queryParameters,
+            headers: headerParams,
+            uri: path,
+            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) {
+                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;
+    }
+
+    public placeOrder (body?: Order) : Promise<{ response: http.ClientResponse; body: Order;  }> {
+        var path = this.url + this.basePath + '/store/order';
+
+        var queryParameters: any = {};
+        var headerParams: any = {};
+        var formParams: any = {};
+
+        var useFormData = false;
+
+        var deferred = promise.defer<{ response: http.ClientResponse; body: Order;  }>();
+
+        var 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;
+    }
+
+    public getOrderById (orderId: string) : Promise<{ response: http.ClientResponse; body: Order;  }> {
+        var path = this.url + this.basePath + '/store/order/{orderId}';
+
+        path = path.replace('{' + 'orderId' + '}', String(orderId));
+
+        var queryParameters: any = {};
+        var headerParams: any = {};
+        var formParams: any = {};
+
+        // verify required parameter 'orderId' is set
+        if (!orderId) {
+            throw new Error('Missing required parameter orderId when calling getOrderById');
+        }
+
+        var useFormData = false;
+
+        var deferred = promise.defer<{ response: http.ClientResponse; body: Order;  }>();
+
+        var 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;
+    }
+
+    public deleteOrder (orderId: string) : Promise<{ response: http.ClientResponse;  }> {
+        var path = this.url + this.basePath + '/store/order/{orderId}';
+
+        path = path.replace('{' + 'orderId' + '}', String(orderId));
+
+        var queryParameters: any = {};
+        var headerParams: any = {};
+        var formParams: any = {};
+
+        // verify required parameter 'orderId' is set
+        if (!orderId) {
+            throw new Error('Missing required parameter orderId when calling deleteOrder');
+        }
+
+        var useFormData = false;
+
+        var deferred = promise.defer<{ response: http.ClientResponse;  }>();
+
+        var 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;
+    }
+}
diff --git a/samples/client/petstore/typescript-node/client.ts b/samples/client/petstore/typescript-node/client.ts
new file mode 100644
index 00000000000..111c76f03c7
--- /dev/null
+++ b/samples/client/petstore/typescript-node/client.ts
@@ -0,0 +1,51 @@
+import api = require('./api');
+import fs = require('fs');
+
+var petApi = new api.PetApi('http://petstore.swagger.io');
+petApi.apiKey = 'special-key';
+
+var pet = new api.Pet();
+pet.name = 'TypeScriptDoggie';
+
+var petId: any;
+
+var exitCode = 0;
+
+// Test various API calls to the petstore
+petApi.addPet(pet)
+.then((res) => {
+	var newPet = <api.Pet>(<any>res.response).body;
+	petId = (<any>res.response).body.id;
+	console.log(`Created pet with ID ${petId}`);
+	newPet.status = api.Pet.StatusEnum.available;
+	return petApi.updatePet(newPet);
+})
+.then((res) => {
+	console.log('Updated pet using POST body');
+	return petApi.updatePetWithForm(petId, undefined, "pending");
+})
+.then((res) => {
+	console.log('Updated pet using POST form');
+	return petApi.uploadFile(petId, undefined, fs.createReadStream('sample.png'));
+})
+.then((res) => {
+	console.log('Uploaded image');
+	return petApi.getPetById(petId);
+})
+.then((res) => {
+	console.log('Got pet by ID: ' + JSON.stringify(res.body));
+	if (res.body.status != api.Pet.StatusEnum.pending) {
+		throw new Error("Unexpected pet status");
+	}
+})
+.catch((err:any) => {
+	console.error(err);
+	exitCode = 1;
+})
+.finally(() => {
+	return petApi.deletePet(petId);
+})
+.then((res) => {
+	console.log('Deleted pet');
+	process.exit(exitCode);
+});
diff --git a/samples/client/petstore/typescript-node/package.json b/samples/client/petstore/typescript-node/package.json
new file mode 100644
index 00000000000..ee598dcc6c2
--- /dev/null
+++ b/samples/client/petstore/typescript-node/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "petstore-typescript-node-sample",
+  "version": "1.0.0",
+  "description": "Sample of generated TypeScript petstore client",
+  "main": "api.js",
+  "scripts": {
+    "postinstall": "tsd reinstall --overwrite",
+    "test": "tsc && node client.js",
+    "clean": "rm -Rf node_modules/ typings/ *.js"
+  },
+  "author": "Mads M. Tandrup",
+  "license": "Apache 2.0",
+  "dependencies": {
+    "bluebird": "^2.9.34",
+    "request": "^2.60.0"
+  },
+  "devDependencies": {
+    "tsd": "^0.6.3",
+    "typescript": "^1.5.3"
+  }
+}
diff --git a/samples/client/petstore/typescript-node/sample.png b/samples/client/petstore/typescript-node/sample.png
new file mode 100644
index 00000000000..c5916f28970
Binary files /dev/null and b/samples/client/petstore/typescript-node/sample.png differ
diff --git a/samples/client/petstore/typescript-node/tsconfig.json b/samples/client/petstore/typescript-node/tsconfig.json
new file mode 100644
index 00000000000..572228f6356
--- /dev/null
+++ b/samples/client/petstore/typescript-node/tsconfig.json
@@ -0,0 +1,12 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "noImplicitAny": true,
+        "target": "ES5"
+    },
+    "files": [
+        "api.ts",
+        "client.ts",
+        "typings/tsd.d.ts"
+    ]
+}
diff --git a/samples/client/petstore/typescript-node/tsd.json b/samples/client/petstore/typescript-node/tsd.json
new file mode 100644
index 00000000000..89e4861f949
--- /dev/null
+++ b/samples/client/petstore/typescript-node/tsd.json
@@ -0,0 +1,21 @@
+{
+  "version": "v4",
+  "repo": "borisyankov/DefinitelyTyped",
+  "ref": "master",
+  "path": "typings",
+  "bundle": "typings/tsd.d.ts",
+  "installed": {
+    "bluebird/bluebird.d.ts": {
+      "commit": "f6c8ca47193fb67947944a3170912672ac3e908e"
+    },
+    "request/request.d.ts": {
+      "commit": "f6c8ca47193fb67947944a3170912672ac3e908e"
+    },
+    "form-data/form-data.d.ts": {
+      "commit": "f6c8ca47193fb67947944a3170912672ac3e908e"
+    },
+    "node/node.d.ts": {
+      "commit": "f6c8ca47193fb67947944a3170912672ac3e908e"
+    }
+  }
+}
diff --git a/samples/client/wordnik/android-java/pom.xml b/samples/client/wordnik/android-java/pom.xml
index 0be5e486152..f2a84451d83 100644
--- a/samples/client/wordnik/android-java/pom.xml
+++ b/samples/client/wordnik/android-java/pom.xml
@@ -152,7 +152,7 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-annotations-version>1.5.1-M1</swagger-annotations-version>
+        <swagger-annotations-version>1.5.3</swagger-annotations-version>
         <jackson-version>2.1.4</jackson-version>
         <junit-version>4.8.1</junit-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
diff --git a/samples/server/petstore/java-inflector/README.md b/samples/server/petstore/java-inflector/README.md
new file mode 100644
index 00000000000..c1309670c5a
--- /dev/null
+++ b/samples/server/petstore/java-inflector/README.md
@@ -0,0 +1,8 @@
+# Swagger Inflector
+
+Run with
+
+```
+mvn package jetty:run
+``
+
diff --git a/samples/server/petstore/java-inflector/inflector.yaml b/samples/server/petstore/java-inflector/inflector.yaml
new file mode 100644
index 00000000000..25ec6dde3f2
--- /dev/null
+++ b/samples/server/petstore/java-inflector/inflector.yaml
@@ -0,0 +1,10 @@
+controllerPackage: io.swagger.handler
+modelPackage:  io.swagger.model
+swaggerUrl: ./src/main/swagger/swagger.json
+modelMappings:
+  User : io.swagger.model.User
+  Category : io.swagger.model.Category
+  Pet : io.swagger.model.Pet
+  Tag : io.swagger.model.Tag
+  Order : io.swagger.model.Order
+  
diff --git a/samples/server/petstore/java-inflector/pom.xml b/samples/server/petstore/java-inflector/pom.xml
new file mode 100644
index 00000000000..7b7ec1d8b3d
--- /dev/null
+++ b/samples/server/petstore/java-inflector/pom.xml
@@ -0,0 +1,92 @@
+<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">
+    <parent>
+        <groupId>org.sonatype.oss</groupId>
+        <artifactId>oss-parent</artifactId>
+        <version>5</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>io.swagger</groupId>
+    <artifactId>swagger-inflector-server</artifactId>
+    <packaging>jar</packaging>
+    <name>swagger-inflector-server</name>
+    <version>1.0.0</version>
+    <prerequisites>
+        <maven>2.2.0</maven>
+    </prerequisites>
+
+    <build>
+        <defaultGoal>install</defaultGoal>
+        <directory>target</directory>
+        <finalName>${project.artifactId}-${project.version}</finalName>
+        <plugins>
+            <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>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <excludes>
+                        <exclude>**/logback.xml</exclude>
+                    </excludes>
+                    <archive>
+                        <manifestEntries>
+                            <mode>development</mode>
+                            <url>${project.url}</url>
+                            <implementation-version>${project.version}</implementation-version>
+                            <package>io.swagger</package>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
+                <version>${jetty-version}</version>
+                <configuration>
+                    <monitoredDirName>.</monitoredDirName>
+                    <scanTargets>
+                        <scanTarget>inflector.yaml</scanTarget>
+                        <scanTarget>src/main/swagger/swagger.yaml</scanTarget>
+                    </scanTargets>
+                    <scanIntervalSeconds>1</scanIntervalSeconds>
+                    <webApp>
+                        <contextPath>/</contextPath>
+                    </webApp>
+                    <httpConnector>
+                        <port>8080</port>
+                        <idleTimeout>60000</idleTimeout>
+                    </httpConnector>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <!-- inflector client -->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-inflector</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+    <properties>
+        <maven-plugin-version>1.0.0</maven-plugin-version>
+        <swagger-core-version>1.5.3</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>
+        <slf4j-version>1.6.3</slf4j-version>
+    </properties>
+</project>
\ No newline at end of file
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
new file mode 100644
index 00000000000..9f31acf53da
--- /dev/null
+++ b/samples/server/petstore/java-inflector/src/main/java/io/swagger/handler/PetController.java
@@ -0,0 +1,73 @@
+package io.swagger.handler;
+
+import io.swagger.inflector.models.RequestContext;
+import io.swagger.inflector.models.ResponseContext;
+import javax.ws.rs.core.Response.Status;
+
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import java.io.File;
+import java.util.List;
+
+import io.swagger.model.*;
+
+import io.swagger.model.Pet;
+import java.io.File;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2015-08-24T17:25:49.737-07:00")
+public class PetController  {
+  /** 
+   * Uncomment and implement as you see fit.  These operations will map
+   * Direclty to operation calls from the routing logic.  Because the inflector
+   * Code allows you to implement logic incrementally, they are disabled.
+   **/
+
+  /*
+    public ResponseContext updatePet(RequestContext request , Pet body) {
+        return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
+    }
+  */
+
+  /*
+    public ResponseContext addPet(RequestContext request , Pet body) {
+        return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
+    }
+  */
+
+  /*
+    public ResponseContext findPetsByStatus(RequestContext request , List<String> status) {
+        return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
+    }
+  */
+
+  /*
+    public ResponseContext findPetsByTags(RequestContext request , List<String> tags) {
+        return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
+    }
+  */
+
+  /*
+    public ResponseContext getPetById(RequestContext request , Long petId) {
+        return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
+    }
+  */
+
+  /*
+    public ResponseContext updatePetWithForm(RequestContext request , String petId, String name, String status) {
+        return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
+    }
+  */
+
+  /*
+    public ResponseContext deletePet(RequestContext request , Long petId, String apiKey) {
+        return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
+    }
+  */
+
+  /*
+    public ResponseContext uploadFile(RequestContext request , Long petId, String additionalMetadata, FormDataContentDisposition fileDetail) {
+        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
new file mode 100644
index 00000000000..3506b6b920c
--- /dev/null
+++ b/samples/server/petstore/java-inflector/src/main/java/io/swagger/handler/StoreController.java
@@ -0,0 +1,49 @@
+package io.swagger.handler;
+
+import io.swagger.inflector.models.RequestContext;
+import io.swagger.inflector.models.ResponseContext;
+import javax.ws.rs.core.Response.Status;
+
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import java.io.File;
+import java.util.List;
+
+import io.swagger.model.*;
+
+import java.util.Map;
+import io.swagger.model.Order;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2015-08-24T17:25:49.737-07:00")
+public class StoreController  {
+  /** 
+   * Uncomment and implement as you see fit.  These operations will map
+   * Direclty to operation calls from the routing logic.  Because the inflector
+   * Code allows you to implement logic incrementally, they are disabled.
+   **/
+
+  /*
+    public ResponseContext getInventory(RequestContext request ) {
+        return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
+    }
+  */
+
+  /*
+    public ResponseContext placeOrder(RequestContext request , Order body) {
+        return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
+    }
+  */
+
+  /*
+    public ResponseContext getOrderById(RequestContext request , String orderId) {
+        return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
+    }
+  */
+
+  /*
+    public ResponseContext deleteOrder(RequestContext request , String orderId) {
+        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/UserController.java b/samples/server/petstore/java-inflector/src/main/java/io/swagger/handler/UserController.java
new file mode 100644
index 00000000000..3ca4fa0e394
--- /dev/null
+++ b/samples/server/petstore/java-inflector/src/main/java/io/swagger/handler/UserController.java
@@ -0,0 +1,73 @@
+package io.swagger.handler;
+
+import io.swagger.inflector.models.RequestContext;
+import io.swagger.inflector.models.ResponseContext;
+import javax.ws.rs.core.Response.Status;
+
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import java.io.File;
+import java.util.List;
+
+import io.swagger.model.*;
+
+import io.swagger.model.User;
+import java.util.*;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2015-08-24T17:25:49.737-07:00")
+public class UserController  {
+  /** 
+   * Uncomment and implement as you see fit.  These operations will map
+   * Direclty to operation calls from the routing logic.  Because the inflector
+   * Code allows you to implement logic incrementally, they are disabled.
+   **/
+
+  /*
+    public ResponseContext createUser(RequestContext request , User body) {
+        return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
+    }
+  */
+
+  /*
+    public ResponseContext createUsersWithArrayInput(RequestContext request , List<User> body) {
+        return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
+    }
+  */
+
+  /*
+    public ResponseContext createUsersWithListInput(RequestContext request , List<User> body) {
+        return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
+    }
+  */
+
+  /*
+    public ResponseContext loginUser(RequestContext request , String username, String password) {
+        return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
+    }
+  */
+
+  /*
+    public ResponseContext logoutUser(RequestContext request ) {
+        return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
+    }
+  */
+
+  /*
+    public ResponseContext getUserByName(RequestContext request , String username) {
+        return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
+    }
+  */
+
+  /*
+    public ResponseContext updateUser(RequestContext request , String username, User body) {
+        return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
+    }
+  */
+
+  /*
+    public ResponseContext deleteUser(RequestContext request , String username) {
+        return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
+    }
+  */
+
+}
+
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
new file mode 100644
index 00000000000..03a37fef5b0
--- /dev/null
+++ b/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Category.java
@@ -0,0 +1,51 @@
+package io.swagger.model;
+
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+@ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2015-08-24T17:25:49.737-07:00")
+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 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/java-inflector/src/main/java/io/swagger/model/Order.java b/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Order.java
new file mode 100644
index 00000000000..de3a2f8b9eb
--- /dev/null
+++ b/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Order.java
@@ -0,0 +1,112 @@
+package io.swagger.model;
+
+import java.util.Date;
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+@ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2015-08-24T17:25:49.737-07:00")
+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 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/java-inflector/src/main/java/io/swagger/model/Pet.java b/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Pet.java
new file mode 100644
index 00000000000..eb81026f601
--- /dev/null
+++ b/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Pet.java
@@ -0,0 +1,114 @@
+package io.swagger.model;
+
+import io.swagger.model.Category;
+import io.swagger.model.Tag;
+import java.util.*;
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+@ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2015-08-24T17:25:49.737-07: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,  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 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/java-inflector/src/main/java/io/swagger/model/Tag.java b/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Tag.java
new file mode 100644
index 00000000000..8c8f2597461
--- /dev/null
+++ b/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Tag.java
@@ -0,0 +1,51 @@
+package io.swagger.model;
+
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+@ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2015-08-24T17:25:49.737-07:00")
+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 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/java-inflector/src/main/java/io/swagger/model/User.java b/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/User.java
new file mode 100644
index 00000000000..be5261cdb70
--- /dev/null
+++ b/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/User.java
@@ -0,0 +1,136 @@
+package io.swagger.model;
+
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+@ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2015-08-24T17:25:49.737-07: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;
+
+  
+  /**
+   **/
+  @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 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/java-inflector/src/main/swagger/swagger.json b/samples/server/petstore/java-inflector/src/main/swagger/swagger.json
new file mode 100644
index 00000000000..36ecd60503e
--- /dev/null
+++ b/samples/server/petstore/java-inflector/src/main/swagger/swagger.json
@@ -0,0 +1,770 @@
+{
+  "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",
+    "version" : "1.0.0",
+    "title" : "Swagger Petstore",
+    "termsOfService" : "http://swagger.io/terms/",
+    "contact" : {
+      "email" : "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" : {
+    "/pet" : {
+      "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" ]
+        } ]
+      }
+    },
+    "/pet/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" : [ {
+          "name" : "status",
+          "in" : "query",
+          "description" : "Status values that need to be considered for filter",
+          "required" : false,
+          "type" : "array",
+          "items" : {
+            "type" : "string"
+          },
+          "collectionFormat" : "multi",
+          "default" : "available"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/definitions/Pet"
+              }
+            }
+          },
+          "400" : {
+            "description" : "Invalid status value"
+          }
+        },
+        "security" : [ {
+          "petstore_auth" : [ "write:pets", "read:pets" ]
+        } ]
+      }
+    },
+    "/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.",
+        "operationId" : "findPetsByTags",
+        "produces" : [ "application/json", "application/xml" ],
+        "parameters" : [ {
+          "name" : "tags",
+          "in" : "query",
+          "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" ]
+        } ]
+      }
+    },
+    "/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",
+        "operationId" : "getPetById",
+        "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" : {
+              "$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" : [ {
+          "name" : "petId",
+          "in" : "path",
+          "description" : "ID of pet that needs to be updated",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "name",
+          "in" : "formData",
+          "description" : "Updated name of the pet",
+          "required" : false,
+          "type" : "string"
+        }, {
+          "name" : "status",
+          "in" : "formData",
+          "description" : "Updated status of the pet",
+          "required" : false,
+          "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" : [ {
+          "name" : "api_key",
+          "in" : "header",
+          "description" : "",
+          "required" : false,
+          "type" : "string"
+        }, {
+          "name" : "petId",
+          "in" : "path",
+          "description" : "Pet id to delete",
+          "required" : true,
+          "type" : "integer",
+          "format" : "int64"
+        } ],
+        "responses" : {
+          "400" : {
+            "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" : {
+      "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"
+          }
+        }
+      }
+    },
+    "/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",
+        "operationId" : "getOrderById",
+        "produces" : [ "application/json", "application/xml" ],
+        "parameters" : [ {
+          "name" : "orderId",
+          "in" : "path",
+          "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" : [ {
+          "name" : "orderId",
+          "in" : "path",
+          "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"
+          }
+        }
+      }
+    },
+    "/user" : {
+      "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"
+          }
+        }
+      }
+    },
+    "/user/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"
+          }
+        }
+      }
+    },
+    "/user/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"
+          }
+        }
+      }
+    },
+    "/user/login" : {
+      "get" : {
+        "tags" : [ "user" ],
+        "summary" : "Logs user into the system",
+        "description" : "",
+        "operationId" : "loginUser",
+        "produces" : [ "application/json", "application/xml" ],
+        "parameters" : [ {
+          "name" : "username",
+          "in" : "query",
+          "description" : "The user name for login",
+          "required" : false,
+          "type" : "string"
+        }, {
+          "name" : "password",
+          "in" : "query",
+          "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"
+          }
+        }
+      }
+    },
+    "/user/logout" : {
+      "get" : {
+        "tags" : [ "user" ],
+        "summary" : "Logs out current logged in user session",
+        "description" : "",
+        "operationId" : "logoutUser",
+        "produces" : [ "application/json", "application/xml" ],
+        "parameters" : [ ],
+        "responses" : {
+          "default" : {
+            "description" : "successful operation"
+          }
+        }
+      }
+    },
+    "/user/{username}" : {
+      "get" : {
+        "tags" : [ "user" ],
+        "summary" : "Get user by user name",
+        "description" : "",
+        "operationId" : "getUserByName",
+        "produces" : [ "application/json", "application/xml" ],
+        "parameters" : [ {
+          "name" : "username",
+          "in" : "path",
+          "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"
+            },
+            "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"
+          }
+        }
+      },
+      "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" : [ {
+          "name" : "username",
+          "in" : "path",
+          "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" : [ {
+          "name" : "username",
+          "in" : "path",
+          "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" : {
+      "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"
+        }
+      },
+      "xml" : {
+        "name" : "User"
+      }
+    },
+    "Category" : {
+      "properties" : {
+        "id" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "name" : {
+          "type" : "string"
+        }
+      },
+      "xml" : {
+        "name" : "Category"
+      }
+    },
+    "Pet" : {
+      "required" : [ "name", "photoUrls" ],
+      "properties" : {
+        "id" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "category" : {
+          "$ref" : "#/definitions/Category"
+        },
+        "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" ]
+        }
+      },
+      "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"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/samples/server/petstore/java-inflector/src/main/webapp/WEB-INF/web.xml b/samples/server/petstore/java-inflector/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 00000000000..34a2eea6bcf
--- /dev/null
+++ b/samples/server/petstore/java-inflector/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,24 @@
+<?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>swagger-inflector</servlet-name>
+        <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
+        <init-param>
+            <param-name>javax.ws.rs.Application</param-name>
+            <param-value>io.swagger.inflector.SwaggerInflector</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>swagger-inflector</servlet-name>
+        <url-pattern>/*</url-pattern>
+    </servlet-mapping>
+    <filter>
+        <filter-name>CORSFilter</filter-name>
+        <filter-class>io.swagger.inflector.utils.CORSFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>CORSFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+</web-app>
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs/pom.xml b/samples/server/petstore/jaxrs/pom.xml
index cac2f6daf79..ae9f3e06162 100644
--- a/samples/server/petstore/jaxrs/pom.xml
+++ b/samples/server/petstore/jaxrs/pom.xml
@@ -119,13 +119,12 @@
       <artifactId>jersey-server</artifactId>
       <version>${jersey-version}</version>
     </dependency>
-
     <dependency>
-      <groupId>org.scalatest</groupId>
-      <artifactId>scalatest_2.9.1</artifactId>
-      <version>${scala-test-version}</version>
-      <scope>test</scope>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>${servlet-api-version}</version>
     </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -133,9 +132,30 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>${servlet-api-version}</version>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-client</artifactId>
+      <version>${jersey-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>
@@ -148,11 +168,10 @@
     </repository>
   </repositories>
   <properties>
-    <swagger-core-version>1.5.0</swagger-core-version>
+    <swagger-core-version>1.5.3</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
-    <jersey-version>1.13</jersey-version>
+    <jersey-version>1.18.1</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>
   </properties>
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 cae767c0393..300636842ba 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,5 +1,6 @@
 package io.swagger.api;
 
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-08-23T23:29:16.812-07: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 c2eeacf13d3..e7ad9b521ac 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,8 +5,8 @@
 import javax.servlet.*;
 import javax.servlet.http.HttpServletResponse;
 
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-08-23T23:29:16.812-07:00")
 public class ApiOriginFilter implements javax.servlet.Filter {
-	@Override
 	public void doFilter(ServletRequest request, ServletResponse response,
 			FilterChain chain) throws IOException, ServletException {
 		HttpServletResponse res = (HttpServletResponse) response;
@@ -16,11 +16,7 @@ public void doFilter(ServletRequest request, ServletResponse response,
 		chain.doFilter(request, response);
 	}
 
-	@Override
-	public void destroy() {
-	}
+	public void destroy() {}
 
-	@Override
-	public void init(FilterConfig filterConfig) throws ServletException {
-	}
+	public void init(FilterConfig filterConfig) throws ServletException {}
 }
\ No newline at end of file
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 9e5b0ee44e2..6d6958c1c90 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,6 +3,7 @@
 import javax.xml.bind.annotation.XmlTransient;
 
 @javax.xml.bind.annotation.XmlRootElement
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-08-23T23:29:16.812-07: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/NotFoundException.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/NotFoundException.java
index 9c8410e47ab..c3eab326e64 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,5 +1,6 @@
 package io.swagger.api;
 
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-08-23T23:29:16.812-07: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 055fa75c80b..f583f1e64cf 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
@@ -26,6 +26,7 @@
 
 
 @io.swagger.annotations.Api(value = "/pet", description = "the pet API")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-08-23T23:29:16.812-07:00")
 public class PetApi  {
 
    private final PetApiService delegate = PetApiServiceFactory.getPetApi();
@@ -36,11 +37,11 @@ public class PetApi  {
     @Produces({ "application/json", "application/xml" })
     @io.swagger.annotations.ApiOperation(value = "Update an existing pet", notes = "", response = Void.class)
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception"),
+        @io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception", response = Void.class),
         
-        @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found"),
+        @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Void.class),
         
-        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied") })
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class) })
 
     public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store"  ) Pet body)
     throws NotFoundException {
@@ -52,7 +53,7 @@ public Response updatePet(@ApiParam(value = "Pet object that needs to be added t
     @Produces({ "application/json", "application/xml" })
     @io.swagger.annotations.ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class)
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input") })
+        @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)
     throws NotFoundException {
@@ -64,9 +65,9 @@ public Response addPet(@ApiParam(value = "Pet object that needs to be added to t
     @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")
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
         
-        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid status value") })
+        @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)
     throws NotFoundException {
@@ -78,9 +79,9 @@ public Response findPetsByStatus(@ApiParam(value = "Status values that need to b
     @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")
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
         
-        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid tag value") })
+        @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)
     throws NotFoundException {
@@ -92,11 +93,11 @@ public Response findPetsByTags(@ApiParam(value = "Tags to filter by") @QueryPara
     @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)
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found"),
+        @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Pet.class),
         
-        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class),
         
-        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied") })
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Pet.class) })
 
     public Response getPetById(@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathParam("petId") Long petId)
     throws NotFoundException {
@@ -108,7 +109,7 @@ public Response getPetById(@ApiParam(value = "ID of pet that needs to be fetched
     @Produces({ "application/json", "application/xml" })
     @io.swagger.annotations.ApiOperation(value = "Updates a pet in the store with form data", notes = "", response = Void.class)
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input") })
+        @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,
@@ -122,12 +123,12 @@ public Response updatePetWithForm(@ApiParam(value = "ID of pet that needs to be
     @Produces({ "application/json", "application/xml" })
     @io.swagger.annotations.ApiOperation(value = "Deletes a pet", notes = "", response = Void.class)
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid pet value") })
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid pet value", response = Void.class) })
 
-    public Response deletePet(@ApiParam(value = ""  )@HeaderParam("api_key") String apiKey,
-    @ApiParam(value = "Pet id to delete",required=true ) @PathParam("petId") Long petId)
+    public Response deletePet(@ApiParam(value = "Pet id to delete",required=true ) @PathParam("petId") Long petId,
+    @ApiParam(value = ""  )@HeaderParam("api_key") String apiKey)
     throws NotFoundException {
-    return delegate.deletePet(apiKey,petId);
+    return delegate.deletePet(petId,apiKey);
     }
     @POST
     @Path("/{petId}/uploadImage")
@@ -135,12 +136,12 @@ public Response deletePet(@ApiParam(value = ""  )@HeaderParam("api_key") String
     @Produces({ "application/json", "application/xml" })
     @io.swagger.annotations.ApiOperation(value = "uploads an image", notes = "", response = Void.class)
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 0, message = "successful operation") })
+        @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,
-    @ApiParam(value = "file to upload") @FormDataParam("file") InputStream inputStream,
-    @ApiParam(value = "file detail") @FormDataParam("file") FormDataContentDisposition fileDetail)
+      @FormDataParam("file") InputStream inputStream,
+      @FormDataParam("file") FormDataContentDisposition fileDetail)
     throws NotFoundException {
     return delegate.uploadFile(petId,additionalMetadata,fileDetail);
     }
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 6e8060269eb..708dc647f91 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
@@ -18,6 +18,7 @@
 
 import javax.ws.rs.core.Response;
 
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-08-23T23:29:16.812-07:00")
 public abstract class PetApiService {
   
       public abstract Response updatePet(Pet body)
@@ -38,7 +39,7 @@ public abstract Response getPetById(Long petId)
       public abstract Response updatePetWithForm(String petId,String name,String status)
       throws NotFoundException;
   
-      public abstract Response deletePet(String apiKey,Long petId)
+      public abstract Response deletePet(Long petId,String apiKey)
       throws NotFoundException;
   
       public abstract Response uploadFile(Long petId,String additionalMetadata,FormDataContentDisposition fileDetail)
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 f5215862ba7..a487439cb3f 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
@@ -26,6 +26,7 @@
 
 
 @io.swagger.annotations.Api(value = "/store", description = "the store API")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-08-23T23:29:16.812-07:00")
 public class StoreApi  {
 
    private final StoreApiService delegate = StoreApiServiceFactory.getStoreApi();
@@ -34,9 +35,9 @@ public class StoreApi  {
     @Path("/inventory")
     
     @Produces({ "application/json", "application/xml" })
-    @io.swagger.annotations.ApiOperation(value = "Returns pet inventories by status", notes = "Returns a map of status codes to quantities", response = Integer.class, responseContainer = "map")
+    @io.swagger.annotations.ApiOperation(value = "Returns pet inventories by status", notes = "Returns a map of status codes to quantities", response = Integer.class, responseContainer = "Map")
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation") })
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Integer.class, responseContainer = "Map") })
 
     public Response getInventory()
     throws NotFoundException {
@@ -48,9 +49,9 @@ public Response getInventory()
     @Produces({ "application/json", "application/xml" })
     @io.swagger.annotations.ApiOperation(value = "Place an order for a pet", notes = "", response = Order.class)
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
         
-        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order") })
+        @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)
     throws NotFoundException {
@@ -62,11 +63,11 @@ public Response placeOrder(@ApiParam(value = "order placed for purchasing the pe
     @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)
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found"),
+        @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = Order.class),
         
-        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
         
-        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied") })
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Order.class) })
 
     public Response getOrderById(@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathParam("orderId") String orderId)
     throws NotFoundException {
@@ -78,9 +79,9 @@ public Response getOrderById(@ApiParam(value = "ID of pet that needs to be fetch
     @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)
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found"),
+        @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = Void.class),
         
-        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied") })
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class) })
 
     public Response deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true ) @PathParam("orderId") String orderId)
     throws NotFoundException {
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 5566e9c9b57..955d640d1b5 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
@@ -18,6 +18,7 @@
 
 import javax.ws.rs.core.Response;
 
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-08-23T23:29:16.812-07:00")
 public abstract class StoreApiService {
   
       public abstract Response getInventory()
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 f904b77746b..d7bde1b1753 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
@@ -26,6 +26,7 @@
 
 
 @io.swagger.annotations.Api(value = "/user", description = "the user API")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-08-23T23:29:16.812-07:00")
 public class UserApi  {
 
    private final UserApiService delegate = UserApiServiceFactory.getUserApi();
@@ -36,7 +37,7 @@ public class UserApi  {
     @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)
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 0, message = "successful operation") })
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
 
     public Response createUser(@ApiParam(value = "Created user object"  ) User body)
     throws NotFoundException {
@@ -48,7 +49,7 @@ public Response createUser(@ApiParam(value = "Created user object"  ) User body)
     @Produces({ "application/json", "application/xml" })
     @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class)
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 0, message = "successful operation") })
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
 
     public Response createUsersWithArrayInput(@ApiParam(value = "List of user object"  ) List<User> body)
     throws NotFoundException {
@@ -60,7 +61,7 @@ public Response createUsersWithArrayInput(@ApiParam(value = "List of user object
     @Produces({ "application/json", "application/xml" })
     @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class)
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 0, message = "successful operation") })
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
 
     public Response createUsersWithListInput(@ApiParam(value = "List of user object"  ) List<User> body)
     throws NotFoundException {
@@ -72,9 +73,9 @@ public Response createUsersWithListInput(@ApiParam(value = "List of user object"
     @Produces({ "application/json", "application/xml" })
     @io.swagger.annotations.ApiOperation(value = "Logs user into the system", notes = "", response = String.class)
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = String.class),
         
-        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username/password supplied") })
+        @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)
@@ -87,7 +88,7 @@ public Response loginUser(@ApiParam(value = "The user name for login") @QueryPar
     @Produces({ "application/json", "application/xml" })
     @io.swagger.annotations.ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class)
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 0, message = "successful operation") })
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
 
     public Response logoutUser()
     throws NotFoundException {
@@ -99,11 +100,11 @@ public Response logoutUser()
     @Produces({ "application/json", "application/xml" })
     @io.swagger.annotations.ApiOperation(value = "Get user by user name", notes = "", response = User.class)
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 404, message = "User not found"),
+        @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = User.class),
         
-        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = User.class),
         
-        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied") })
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", 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)
     throws NotFoundException {
@@ -115,9 +116,9 @@ public Response getUserByName(@ApiParam(value = "The name that needs to be fetch
     @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)
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 404, message = "User not found"),
+        @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class),
         
-        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid user supplied") })
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid user supplied", 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)
@@ -130,9 +131,9 @@ public Response updateUser(@ApiParam(value = "name that need to be deleted",requ
     @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)
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 404, message = "User not found"),
+        @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class),
         
-        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied") })
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class) })
 
     public Response deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true ) @PathParam("username") String username)
     throws NotFoundException {
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 6a09fcd0feb..e838a00e282 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
@@ -18,6 +18,7 @@
 
 import javax.ws.rs.core.Response;
 
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-08-23T23:29:16.812-07:00")
 public abstract class UserApiService {
   
       public abstract Response createUser(User body)
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 56f86f70737..57666c8444b 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
@@ -6,6 +6,7 @@
 
 
 @ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-08-23T23:29:16.812-07:00")
 public class Category  {
   
   private Long id = null;
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 4d0c133e936..99b3c758473 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
@@ -7,6 +7,7 @@
 
 
 @ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-08-23T23:29:16.812-07:00")
 public class Order  {
   
   private Long id = null;
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 076a8cf8142..0b01a065022 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
@@ -1,21 +1,22 @@
 package io.swagger.model;
 
 import io.swagger.model.Category;
-import java.util.*;
 import io.swagger.model.Tag;
+import java.util.*;
 
 import io.swagger.annotations.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-08-23T23:29:16.812-07: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>() ;
+  private List<String> photoUrls = new ArrayList<String>();
+  private List<Tag> tags = new ArrayList<Tag>();
   public enum StatusEnum {
      available,  pending,  sold, 
   };
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 99dd07c00f7..935e04025c8 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
@@ -6,6 +6,7 @@
 
 
 @ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-08-23T23:29:16.812-07:00")
 public class Tag  {
   
   private Long id = null;
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 d5f43a4c25e..6d6fb0c1d94 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
@@ -6,6 +6,7 @@
 
 
 @ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-08-23T23:29:16.812-07:00")
 public class User  {
   
   private Long id = null;
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 fb0bb2bc3de..c3a7cbf8bf7 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,11 +3,13 @@
 import io.swagger.api.PetApiService;
 import io.swagger.api.impl.PetApiServiceImpl;
 
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-08-23T22:18:00.553-07:00")
 public class PetApiServiceFactory {
 
-    private final static PetApiService service = new PetApiServiceImpl();
+   private final static PetApiService service = new PetApiServiceImpl();
 
-    public static PetApiService getPetApi() {
-        return service;
-    }
+   public static PetApiService getPetApi()
+   {
+      return service;
+   }
 }
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 325f5ba7ae0..9eb7af458dd 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,11 +3,13 @@
 import io.swagger.api.StoreApiService;
 import io.swagger.api.impl.StoreApiServiceImpl;
 
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-08-23T22:18:00.553-07:00")
 public class StoreApiServiceFactory {
 
-    private final static StoreApiService service = new StoreApiServiceImpl();
+   private final static StoreApiService service = new StoreApiServiceImpl();
 
-    public static StoreApiService getStoreApi() {
-        return service;
-    }
+   public static StoreApiService getStoreApi()
+   {
+      return service;
+   }
 }
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 9a802740e2c..2f381c6b459 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,11 +3,13 @@
 import io.swagger.api.UserApiService;
 import io.swagger.api.impl.UserApiServiceImpl;
 
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-08-23T22:18:00.553-07:00")
 public class UserApiServiceFactory {
 
-    private final static UserApiService service = new UserApiServiceImpl();
+   private final static UserApiService service = new UserApiServiceImpl();
 
-    public static UserApiService getUserApi() {
-        return service;
-    }
+   public static UserApiService getUserApi()
+   {
+      return service;
+   }
 }
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 3af5a9cd420..c7ee88aaf63 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
@@ -1,69 +1,80 @@
 package io.swagger.api.impl;
 
-import com.sun.jersey.core.header.FormDataContentDisposition;
 import io.swagger.api.*;
-import io.swagger.api.NotFoundException;
-import io.swagger.model.Pet;
-
-import javax.ws.rs.core.Response;
-import java.util.List;
-
-public class PetApiServiceImpl extends PetApiService {
+import io.swagger.model.*;
 
-    @Override
-    public Response updatePet(Pet body)
-            throws NotFoundException {
-        // do some magic!
-        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-    }
+import com.sun.jersey.multipart.FormDataParam;
 
-    @Override
-    public Response addPet(Pet body)
-            throws NotFoundException {
-        // do some magic!
-        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-    }
-
-    @Override
-    public Response findPetsByStatus(List<String> status)
-            throws NotFoundException {
-        // do some magic!
-        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-    }
-
-    @Override
-    public Response findPetsByTags(List<String> tags)
-            throws NotFoundException {
-        // do some magic!
-        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-    }
+import io.swagger.model.Pet;
+import java.io.File;
 
-    @Override
-    public Response getPetById(Long petId)
-            throws NotFoundException {
-        // do some magic!
-        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-    }
+import java.util.List;
+import io.swagger.api.NotFoundException;
 
-    @Override
-    public Response updatePetWithForm(String petId, String name, String status)
-            throws NotFoundException {
-        // do some magic!
-        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-    }
+import java.io.InputStream;
 
-    @Override
-    public Response deletePet(String apiKey, Long petId)
-            throws NotFoundException {
-        // do some magic!
-        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-    }
+import com.sun.jersey.core.header.FormDataContentDisposition;
+import com.sun.jersey.multipart.FormDataParam;
 
-    @Override
-    public Response uploadFile(Long petId, String additionalMetadata, FormDataContentDisposition fileDetail)
-            throws NotFoundException {
-        // do some magic!
-        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-    }
+import javax.ws.rs.core.Response;
 
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-08-23T22:18:00.553-07:00")
+public class PetApiServiceImpl extends PetApiService {
+  
+      @Override
+      public Response updatePet(Pet body)
+      throws NotFoundException {
+      // do some magic!
+      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+  }
+  
+      @Override
+      public Response addPet(Pet body)
+      throws NotFoundException {
+      // do some magic!
+      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+  }
+  
+      @Override
+      public Response findPetsByStatus(List<String> status)
+      throws NotFoundException {
+      // do some magic!
+      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+  }
+  
+      @Override
+      public Response findPetsByTags(List<String> tags)
+      throws NotFoundException {
+      // do some magic!
+      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+  }
+  
+      @Override
+      public Response getPetById(Long petId)
+      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)
+      throws NotFoundException {
+      // do some magic!
+      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+  }
+  
+      @Override
+      public Response deletePet(Long petId,String apiKey)
+      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)
+      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 9494c3adc89..7dbf5e75dd2 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
@@ -1,39 +1,52 @@
 package io.swagger.api.impl;
 
 import io.swagger.api.*;
-import io.swagger.api.NotFoundException;
+import io.swagger.model.*;
+
+import com.sun.jersey.multipart.FormDataParam;
+
+import java.util.Map;
 import io.swagger.model.Order;
 
-import javax.ws.rs.core.Response;
+import java.util.List;
+import io.swagger.api.NotFoundException;
 
-public class StoreApiServiceImpl extends StoreApiService {
+import java.io.InputStream;
+
+import com.sun.jersey.core.header.FormDataContentDisposition;
+import com.sun.jersey.multipart.FormDataParam;
 
-    @Override
-    public Response getInventory()
-            throws NotFoundException {
-        // do some magic!
-        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-    }
-
-    @Override
-    public Response placeOrder(Order body)
-            throws NotFoundException {
-        // do some magic!
-        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-    }
-
-    @Override
-    public Response getOrderById(String orderId)
-            throws NotFoundException {
-        // do some magic!
-        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-    }
-
-    @Override
-    public Response deleteOrder(String orderId)
-            throws NotFoundException {
-        // do some magic!
-        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-    }
+import javax.ws.rs.core.Response;
 
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-08-23T22:18:00.553-07:00")
+public class StoreApiServiceImpl extends StoreApiService {
+  
+      @Override
+      public Response getInventory()
+      throws NotFoundException {
+      // do some magic!
+      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+  }
+  
+      @Override
+      public Response placeOrder(Order body)
+      throws NotFoundException {
+      // do some magic!
+      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+  }
+  
+      @Override
+      public Response getOrderById(String orderId)
+      throws NotFoundException {
+      // do some magic!
+      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+  }
+  
+      @Override
+      public Response deleteOrder(String orderId)
+      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 5a8e7a976c4..cdbc9afed19 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
@@ -1,68 +1,80 @@
 package io.swagger.api.impl;
 
 import io.swagger.api.*;
-import io.swagger.api.NotFoundException;
-import io.swagger.model.User;
-
-import javax.ws.rs.core.Response;
-import java.util.List;
-
-public class UserApiServiceImpl extends UserApiService {
+import io.swagger.model.*;
 
-    @Override
-    public Response createUser(User body)
-            throws NotFoundException {
-        // do some magic!
-        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-    }
+import com.sun.jersey.multipart.FormDataParam;
 
-    @Override
-    public Response createUsersWithArrayInput(List<User> body)
-            throws NotFoundException {
-        // do some magic!
-        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-    }
-
-    @Override
-    public Response createUsersWithListInput(List<User> body)
-            throws NotFoundException {
-        // do some magic!
-        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-    }
-
-    @Override
-    public Response loginUser(String username, String password)
-            throws NotFoundException {
-        // do some magic!
-        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-    }
+import io.swagger.model.User;
+import java.util.*;
 
-    @Override
-    public Response logoutUser()
-            throws NotFoundException {
-        // do some magic!
-        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-    }
+import java.util.List;
+import io.swagger.api.NotFoundException;
 
-    @Override
-    public Response getUserByName(String username)
-            throws NotFoundException {
-        // do some magic!
-        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-    }
+import java.io.InputStream;
 
-    @Override
-    public Response updateUser(String username, User body)
-            throws NotFoundException {
-        // do some magic!
-        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-    }
+import com.sun.jersey.core.header.FormDataContentDisposition;
+import com.sun.jersey.multipart.FormDataParam;
 
-    @Override
-    public Response deleteUser(String username)
-            throws NotFoundException {
-        // do some magic!
-        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-    }
+import javax.ws.rs.core.Response;
 
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JaxRSServerCodegen", date = "2015-08-23T22:18:00.553-07:00")
+public class UserApiServiceImpl extends UserApiService {
+  
+      @Override
+      public Response createUser(User body)
+      throws NotFoundException {
+      // do some magic!
+      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+  }
+  
+      @Override
+      public Response createUsersWithArrayInput(List<User> body)
+      throws NotFoundException {
+      // do some magic!
+      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+  }
+  
+      @Override
+      public Response createUsersWithListInput(List<User> body)
+      throws NotFoundException {
+      // do some magic!
+      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+  }
+  
+      @Override
+      public Response loginUser(String username,String password)
+      throws NotFoundException {
+      // do some magic!
+      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+  }
+  
+      @Override
+      public Response logoutUser()
+      throws NotFoundException {
+      // do some magic!
+      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+  }
+  
+      @Override
+      public Response getUserByName(String username)
+      throws NotFoundException {
+      // do some magic!
+      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+  }
+  
+      @Override
+      public Response updateUser(String username,User body)
+      throws NotFoundException {
+      // do some magic!
+      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+  }
+  
+      @Override
+      public Response deleteUser(String username)
+      throws NotFoundException {
+      // do some magic!
+      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+  }
+  
 }
diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/ApiClient.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/ApiClient.java
new file mode 100644
index 00000000000..9af0c10b543
--- /dev/null
+++ b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/ApiClient.java
@@ -0,0 +1,553 @@
+package io.swagger.client;
+
+import com.sun.jersey.api.client.Client;
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.config.ClientConfig;
+import com.sun.jersey.api.client.config.DefaultClientConfig;
+import com.sun.jersey.api.client.filter.LoggingFilter;
+import com.sun.jersey.api.client.WebResource.Builder;
+
+import com.sun.jersey.multipart.FormDataMultiPart;
+import com.sun.jersey.multipart.file.FileDataBodyPart;
+
+import javax.ws.rs.core.Response.Status.Family;
+import javax.ws.rs.core.MediaType;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.TimeZone;
+
+import java.net.URLEncoder;
+
+import java.io.IOException;
+import java.io.File;
+import java.io.UnsupportedEncodingException;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.text.ParseException;
+
+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 = "2015-08-23T11:08:48.917-07: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 JSON json = new JSON();
+
+  private Map<String, Authentication> authentications;
+
+  private DateFormat dateFormat;
+
+  public ApiClient() {
+    // Use ISO 8601 format for date and datetime.
+    // See https://en.wikipedia.org/wiki/ISO_8601
+    this.dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
+
+    // Use UTC as the default time zone.
+    this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+
+    // Set default User-Agent.
+    setUserAgent("Java-Swagger");
+
+    // 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());
+    // Prevent the authentications from being modified.
+    authentications = Collections.unmodifiableMap(authentications);
+  }
+
+  public String getBasePath() {
+    return basePath;
+  }
+
+  public ApiClient setBasePath(String basePath) {
+    this.basePath = basePath;
+    return this;
+  }
+
+  /**
+   * Get authentications (key: authentication name, value: authentication).
+   */
+  public Map<String, Authentication> getAuthentications() {
+    return authentications;
+  }
+
+  /**
+   * Get authentication for the given name.
+   *
+   * @param authName The authentication name
+   * @return The authentication, null if not found
+   */
+  public Authentication getAuthentication(String authName) {
+    return authentications.get(authName);
+  }
+
+  /**
+   * Helper method to set username for the first HTTP basic authentication.
+   */
+  public void setUsername(String username) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof HttpBasicAuth) {
+        ((HttpBasicAuth) auth).setUsername(username);
+        return;
+      }
+    }
+    throw new RuntimeException("No HTTP basic authentication configured!");
+  }
+
+  /**
+   * Helper method to set password for the first HTTP basic authentication.
+   */
+  public void setPassword(String password) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof HttpBasicAuth) {
+        ((HttpBasicAuth) auth).setPassword(password);
+        return;
+      }
+    }
+    throw new RuntimeException("No HTTP basic authentication configured!");
+  }
+
+  /**
+   * Helper method to set API key value for the first API key authentication.
+   */
+  public void setApiKey(String apiKey) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof ApiKeyAuth) {
+        ((ApiKeyAuth) auth).setApiKey(apiKey);
+        return;
+      }
+    }
+    throw new RuntimeException("No API key authentication configured!");
+  }
+
+  /**
+   * Helper method to set API key prefix for the first API key authentication.
+   */
+  public void setApiKeyPrefix(String apiKeyPrefix) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof ApiKeyAuth) {
+        ((ApiKeyAuth) auth).setApiKeyPrefix(apiKeyPrefix);
+        return;
+      }
+    }
+    throw new RuntimeException("No API key authentication configured!");
+  }
+
+  /**
+   * Set the User-Agent header's value (by adding to the default header map).
+   */
+  public ApiClient setUserAgent(String userAgent) {
+    addDefaultHeader("User-Agent", userAgent);
+    return this;
+  }
+
+  /**
+   * Add a default header.
+   *
+   * @param key The header's key
+   * @param value The header's value
+   */
+  public ApiClient addDefaultHeader(String key, String value) {
+    defaultHeaderMap.put(key, value);
+    return this;
+  }
+
+  /**
+   * Check that whether debugging is enabled for this API client.
+   */
+  public boolean isDebugging() {
+    return debugging;
+  }
+
+  /**
+   * Enable/disable debugging for this API client.
+   *
+   * @param debugging To enable (true) or disable (false) debugging
+   */
+  public ApiClient setDebugging(boolean debugging) {
+    this.debugging = debugging;
+    return this;
+  }
+
+  /**
+   * Get the date format used to parse/format date parameters.
+   */
+  public DateFormat getDateFormat() {
+    return dateFormat;
+  }
+
+  /**
+   * Set the date format used to parse/format date parameters.
+   */
+  public ApiClient getDateFormat(DateFormat dateFormat) {
+    this.dateFormat = dateFormat;
+    return this;
+  }
+
+  /**
+   * Parse the given string into Date object.
+   */
+  public Date parseDate(String str) {
+    try {
+      return dateFormat.parse(str);
+    } catch (java.text.ParseException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  /**
+   * Format the given Date object into string.
+   */
+  public String formatDate(Date date) {
+    return dateFormat.format(date);
+  }
+
+  /**
+   * Format the given parameter object into string.
+   */
+  public String parameterToString(Object param) {
+    if (param == null) {
+      return "";
+    } else if (param instanceof Date) {
+      return formatDate((Date) param);
+    } else if (param instanceof Collection) {
+      StringBuilder b = new StringBuilder();
+      for(Object o : (Collection)param) {
+        if(b.length() > 0) {
+          b.append(",");
+        }
+        b.append(String.valueOf(o));
+      }
+      return b.toString();
+    } else {
+      return String.valueOf(param);
+    }
+  }
+
+  /*
+    Format to {@code Pair} objects.
+  */
+  public List<Pair> parameterToPairs(String collectionFormat, String name, Object value){
+    List<Pair> params = new ArrayList<Pair>();
+
+    // preconditions
+    if (name == null || name.isEmpty() || value == null) return params;
+
+    Collection valueCollection = null;
+    if (value instanceof Collection) {
+      valueCollection = (Collection) value;
+    } else {
+      params.add(new Pair(name, parameterToString(value)));
+      return params;
+    }
+
+    if (valueCollection.isEmpty()){
+      return params;
+    }
+
+    // get the collection format
+    collectionFormat = (collectionFormat == null || collectionFormat.isEmpty() ? "csv" : collectionFormat); // default: csv
+
+    // create the params based on the collection format
+    if (collectionFormat.equals("multi")) {
+      for (Object item : valueCollection) {
+        params.add(new Pair(name, parameterToString(item)));
+      }
+
+      return params;
+    }
+
+    String delimiter = ",";
+
+    if (collectionFormat.equals("csv")) {
+      delimiter = ",";
+    } else if (collectionFormat.equals("ssv")) {
+      delimiter = " ";
+    } else if (collectionFormat.equals("tsv")) {
+      delimiter = "\t";
+    } else if (collectionFormat.equals("pipes")) {
+      delimiter = "|";
+    }
+
+    StringBuilder sb = new StringBuilder() ;
+    for (Object item : valueCollection) {
+      sb.append(delimiter);
+      sb.append(parameterToString(item));
+    }
+
+    params.add(new Pair(name, sb.substring(1)));
+
+    return params;
+  }
+
+  /**
+   * Select the Accept header's value from the given accepts array:
+   *   if JSON exists in the given array, use it;
+   *   otherwise use all of them (joining into a string)
+   *
+   * @param accepts The accepts array to select from
+   * @return The Accept header to use. If the given array is empty,
+   *   null will be returned (not to set the Accept header explicitly).
+   */
+  public String selectHeaderAccept(String[] accepts) {
+    if (accepts.length == 0) return null;
+    if (StringUtil.containsIgnoreCase(accepts, "application/json")) return "application/json";
+    return StringUtil.join(accepts, ",");
+  }
+
+  /**
+   * Select the Content-Type header's value from the given array:
+   *   if JSON exists in the given array, use it;
+   *   otherwise use the first one of the array.
+   *
+   * @param contentTypes The Content-Type array to select from
+   * @return The Content-Type header to use. If the given array is empty,
+   *   JSON will be used.
+   */
+  public String selectHeaderContentType(String[] contentTypes) {
+    if (contentTypes.length == 0) return "application/json";
+    if (StringUtil.containsIgnoreCase(contentTypes, "application/json")) return "application/json";
+    return contentTypes[0];
+  }
+
+  /**
+   * Escape the given string to be used as URL query value.
+   */
+  public String escapeString(String str) {
+    try {
+      return URLEncoder.encode(str, "utf8").replaceAll("\\+", "%20");
+    } catch (UnsupportedEncodingException e) {
+      return str;
+    }
+  }
+
+  /**
+   * Serialize the given Java object into string according the given
+   * Content-Type (only JSON is supported for now).
+   */
+  public String serialize(Object obj, String contentType) throws ApiException {
+    if (contentType.startsWith("application/json")) {
+      return json.serialize(obj);
+    } else {
+      throw new ApiException(400, "can not serialize object into Content-Type: " + contentType);
+    }
+  }
+
+  /**
+   * Deserialize response body to Java object according to the Content-Type.
+   */
+  public <T> T deserialize(ClientResponse response, TypeRef returnType) throws ApiException {
+    String contentType = null;
+    List<String> contentTypes = response.getHeaders().get("Content-Type");
+    if (contentTypes != null && !contentTypes.isEmpty())
+      contentType = contentTypes.get(0);
+    if (contentType == null)
+      throw new ApiException(500, "missing Content-Type in response");
+
+    String body;
+    if (response.hasEntity())
+      body = (String) response.getEntity(String.class);
+    else
+      body = "";
+
+    if (contentType.startsWith("application/json")) {
+      return json.deserialize(body, returnType);
+    } else {
+      throw new ApiException(500, "can not deserialize Content-Type: " + contentType);
+    }
+  }
+
+  /**
+   * Invoke API by sending HTTP request with the given options.
+   *
+   * @param path The sub-path of the HTTP URL
+   * @param method The request method, one of "GET", "POST", "PUT", and "DELETE"
+   * @param queryParams The query parameters
+   * @param body The request body object
+   * @param headerParams The header parameters
+   * @param formParams The form parameters
+   * @param accept The request's Accept header
+   * @param contentType The request's Content-Type header
+   * @param authNames The authentications to apply
+   * @param returnType The return type into which to deserialize the response
+   * @return The response body in type of string
+   */
+  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, TypeRef returnType) throws ApiException {
+    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);
+
+    Builder builder;
+    if (accept == null)
+      builder = client.resource(basePath + path + querystring).getRequestBuilder();
+    else
+      builder = client.resource(basePath + path + querystring).accept(accept);
+
+    for (String key : headerParams.keySet()) {
+      builder = builder.header(key, headerParams.get(key));
+    }
+    for (String key : defaultHeaderMap.keySet()) {
+      if (!headerParams.containsKey(key)) {
+        builder = builder.header(key, defaultHeaderMap.get(key));
+      }
+    }
+
+    String encodedFormParams = null;
+    if (contentType.startsWith("multipart/form-data")) {
+      FormDataMultiPart mp = new FormDataMultiPart();
+      for (Entry<String, Object> param: formParams.entrySet()) {
+        if (param.getValue() instanceof File) {
+          File file = (File) param.getValue();
+          mp.field(param.getKey(), file.getName());
+          mp.bodyPart(new FileDataBodyPart(param.getKey(), file, MediaType.MULTIPART_FORM_DATA_TYPE));
+        } else {
+          mp.field(param.getKey(), parameterToString(param.getValue()), MediaType.MULTIPART_FORM_DATA_TYPE);
+        }
+      }
+      body = mp;
+    } else if (contentType.startsWith("application/x-www-form-urlencoded")) {
+      encodedFormParams = this.getXWWWFormUrlencodedParams(formParams);
+    }
+
+    ClientResponse response = null;
+
+    if ("GET".equals(method)) {
+      response = (ClientResponse) builder.get(ClientResponse.class);
+    } else if ("POST".equals(method)) {
+      if (encodedFormParams != null) {
+        response = builder.type(contentType).post(ClientResponse.class, encodedFormParams);
+      } else 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, contentType));
+      }
+    } else if ("PUT".equals(method)) {
+      if (encodedFormParams != null) {
+        response = builder.type(contentType).put(ClientResponse.class, encodedFormParams);
+      } else if(body == null) {
+        response = builder.put(ClientResponse.class, serialize(body, contentType));
+      } else {
+        response = builder.type(contentType).put(ClientResponse.class, serialize(body, contentType));
+      }
+    } else if ("DELETE".equals(method)) {
+      if (encodedFormParams != null) {
+        response = builder.type(contentType).delete(ClientResponse.class, encodedFormParams);
+      } else if(body == null) {
+        response = builder.delete(ClientResponse.class);
+      } else {
+        response = builder.type(contentType).delete(ClientResponse.class, serialize(body, contentType));
+      }
+    } else {
+      throw new ApiException(500, "unknown method type " + method);
+    }
+
+    if (response.getStatusInfo() == ClientResponse.Status.NO_CONTENT) {
+      return null;
+    } else if (response.getStatusInfo().getFamily() == Family.SUCCESSFUL) {
+      if (returnType == null)
+        return null;
+      else
+        return deserialize(response, returnType);
+    } else {
+      String message = "error";
+      String respBody = null;
+      if (response.hasEntity()) {
+        try {
+          respBody = String.valueOf(response.getEntity(String.class));
+          message = respBody;
+        } catch (RuntimeException e) {
+          // e.printStackTrace();
+        }
+      }
+      throw new ApiException(
+        response.getStatusInfo().getStatusCode(),
+        message,
+        response.getHeaders(),
+        respBody);
+    }
+  }
+
+  /**
+   * Update query and header parameters based on authentication settings.
+   *
+   * @param authNames The authentications to apply
+   */
+  private void updateParamsForAuth(String[] authNames, List<Pair> queryParams, Map<String, String> headerParams) {
+    for (String authName : authNames) {
+      Authentication auth = authentications.get(authName);
+      if (auth == null) throw new RuntimeException("Authentication undefined: " + authName);
+      auth.applyToParams(queryParams, headerParams);
+    }
+  }
+
+  /**
+   * Encode the given form parameters as request body.
+   */
+  private String getXWWWFormUrlencodedParams(Map<String, Object> formParams) {
+    StringBuilder formParamBuilder = new StringBuilder();
+
+    for (Entry<String, Object> param : formParams.entrySet()) {
+      String keyStr = param.getKey();
+      String valueStr = parameterToString(param.getValue());
+      try {
+        formParamBuilder.append(URLEncoder.encode(param.getKey(), "utf8"))
+            .append("=")
+            .append(URLEncoder.encode(valueStr, "utf8"));
+        formParamBuilder.append("&");
+      } catch (UnsupportedEncodingException e) {
+        // move on to next
+      }
+    }
+
+    String encodedFormParams = formParamBuilder.toString();
+    if (encodedFormParams.endsWith("&")) {
+      encodedFormParams = encodedFormParams.substring(0, encodedFormParams.length() - 1);
+    }
+
+    return encodedFormParams;
+  }
+
+  /**
+   * Get an existing client or create a new client to handle HTTP request.
+   */
+  private Client getClient() {
+    if(!hostMap.containsKey(basePath)) {
+      Client client = Client.create();
+      if (debugging)
+        client.addFilter(new LoggingFilter());
+      hostMap.put(basePath, client);
+    }
+    return hostMap.get(basePath);
+  }
+}
diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/ApiException.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/ApiException.java
new file mode 100644
index 00000000000..605f8c3769d
--- /dev/null
+++ b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/ApiException.java
@@ -0,0 +1,48 @@
+package io.swagger.client;
+
+import java.util.Map;
+import java.util.List;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00")
+public class ApiException extends Exception {
+  private int code = 0;
+  private String message = null;
+  private Map<String, List<String>> responseHeaders = null;
+  private String responseBody = null;
+
+  public ApiException() {}
+
+  public ApiException(int code, String message) {
+    this.code = code;
+    this.message = message;
+  }
+
+  public ApiException(int code, String message, Map<String, List<String>> responseHeaders, String responseBody) {
+    this.code = code;
+    this.message = message;
+    this.responseHeaders = responseHeaders;
+    this.responseBody = responseBody;
+  }
+
+  public int getCode() {
+    return code;
+  }
+
+  public String getMessage() {
+    return message;
+  }
+
+  /**
+   * Get the HTTP response headers.
+   */
+  public Map<String, List<String>> getResponseHeaders() {
+    return responseHeaders;
+  }
+
+  /**
+   * Get the HTTP response body.
+   */
+  public String getResponseBody() {
+    return responseBody;
+  }
+}
diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/Configuration.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/Configuration.java
new file mode 100644
index 00000000000..524006fd7bd
--- /dev/null
+++ b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/Configuration.java
@@ -0,0 +1,22 @@
+package io.swagger.client;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00")
+public class Configuration {
+  private static ApiClient defaultApiClient = new ApiClient();
+
+  /**
+   * Get the default API client, which would be used when creating API
+   * instances without providing an API client.
+   */
+  public static ApiClient getDefaultApiClient() {
+    return defaultApiClient;
+   }
+
+  /**
+   * Set the default API client, which would be used when creating API
+   * instances without providing an API client.
+   */
+  public static void setDefaultApiClient(ApiClient apiClient) {
+    defaultApiClient = apiClient;
+  }
+}
diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/JSON.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/JSON.java
new file mode 100644
index 00000000000..3514e41778e
--- /dev/null
+++ b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/JSON.java
@@ -0,0 +1,52 @@
+package io.swagger.client;
+
+import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.datatype.joda.*;
+
+import java.io.IOException;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00")
+public class JSON {
+  private ObjectMapper mapper;
+
+  public JSON() {
+    mapper = new ObjectMapper();
+    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+    mapper.registerModule(new JodaModule());
+	}
+
+  /**
+   * Serialize the given Java object into JSON string.
+   */
+  public String serialize(Object obj) throws ApiException {
+    try {
+      if (obj != null)
+        return mapper.writeValueAsString(obj);
+      else
+        return null;
+    } catch (Exception e) {
+      throw new ApiException(400, e.getMessage());
+    }
+  }
+
+  /**
+   * Deserialize the given JSON string to Java object.
+   *
+   * @param body The JSON string
+   * @param returnType The type to deserialize inot
+   * @return The deserialized Java object
+   */
+  public <T> T deserialize(String body, TypeRef returnType) throws ApiException {
+    JavaType javaType = mapper.constructType(returnType.getType());
+    try {
+      return mapper.readValue(body, javaType);
+    } catch (IOException e) {
+      if (returnType.getType().equals(String.class))
+        return (T) body;
+      else
+        throw new ApiException(500, e.getMessage(), null, body);
+    }
+  }
+}
diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/Pair.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/Pair.java
new file mode 100644
index 00000000000..e7dd3350637
--- /dev/null
+++ b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/Pair.java
@@ -0,0 +1,39 @@
+package io.swagger.client;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00")
+public class Pair {
+    private String name = "";
+    private String value = "";
+
+    public Pair (String name, String value) {
+        setName(name);
+        setValue(value);
+    }
+
+    private void setName(String name) {
+        if (!isValidString(name)) return;
+
+        this.name = name;
+    }
+
+    private void setValue(String value) {
+        if (!isValidString(value)) return;
+
+        this.value = value;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    private boolean isValidString(String arg) {
+        if (arg == null) return false;
+        if (arg.trim().isEmpty()) return false;
+
+        return true;
+    }
+}
diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/StringUtil.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/StringUtil.java
new file mode 100644
index 00000000000..c80bc8a1647
--- /dev/null
+++ b/samples/server/petstore/jaxrs/src/test/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 = "2015-08-23T11:08:48.917-07: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/src/test/java/io/swagger/client/TypeRef.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/TypeRef.java
new file mode 100644
index 00000000000..15eb3ea05ba
--- /dev/null
+++ b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/TypeRef.java
@@ -0,0 +1,26 @@
+package io.swagger.client;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00")
+public class TypeRef<T> {
+    private final Type type;
+
+    public TypeRef() {
+        this.type = getGenericType(getClass());
+    }
+
+    private static Type getGenericType(Class<?> klass) {
+        Type superclass = klass.getGenericSuperclass();
+        if (superclass instanceof Class) {
+            throw new RuntimeException("No type parameter provided");
+        }
+        ParameterizedType parameterized = (ParameterizedType) superclass;
+        return parameterized.getActualTypeArguments()[0];
+    }
+
+    public Type getType() {
+        return type;
+    }
+}
diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/api/PetApi.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/api/PetApi.java
new file mode 100644
index 00000000000..5b71f7c199c
--- /dev/null
+++ b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/api/PetApi.java
@@ -0,0 +1,407 @@
+package io.swagger.client.api;
+
+import io.swagger.client.ApiException;
+import io.swagger.client.ApiClient;
+import io.swagger.client.Configuration;
+import io.swagger.client.Pair;
+import io.swagger.client.TypeRef;
+
+import io.swagger.client.model.*;
+
+import java.util.*;
+
+import io.swagger.client.model.Pet;
+import java.io.File;
+
+import java.io.File;
+import java.util.Map;
+import java.util.HashMap;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00")
+public class PetApi {
+  private ApiClient apiClient;
+
+  public PetApi() {
+    this(Configuration.getDefaultApiClient());
+  }
+
+  public PetApi(ApiClient apiClient) {
+    this.apiClient = apiClient;
+  }
+
+  public ApiClient getApiClient() {
+    return apiClient;
+  }
+
+  public void setApiClient(ApiClient apiClient) {
+    this.apiClient = apiClient;
+  }
+
+  
+  /**
+   * 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
+   */
+  public void addPet (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, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, 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" };
+    
+    TypeRef returnType = new TypeRef<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" };
+    
+    TypeRef returnType = new TypeRef<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", "petstore_auth" };
+    
+    TypeRef returnType = new TypeRef<Pet>() {};
+    return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
+    
+  }
+  
+  /**
+   * 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 postBody = 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 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>();
+
+    
+
+    
+
+    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);
+
+    final String[] contentTypes = {
+      "application/x-www-form-urlencoded"
+    };
+    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+
+    String[] authNames = new String[] { "petstore_auth" };
+    
+    apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    
+  }
+  
+  /**
+   * Deletes a pet
+   * 
+   * @param petId Pet id to delete
+   * @param apiKey 
+   * @return void
+   */
+  public void deletePet (Long petId, String apiKey) 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 deletePet");
+    }
+    
+
+    // 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>();
+
+    
+
+    if (apiKey != null)
+    headerParams.put("api_key", apiClient.parameterToString(apiKey));
+    
+
+    
+
+    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" };
+    
+    apiClient.invokeAPI(path, "DELETE", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, 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
+   */
+  public void uploadFile (Long petId, String additionalMetadata, File file) 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 uploadFile");
+    }
+    
+
+    // create path and map variables
+    String path = "/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>();
+
+    
+
+    
+
+    if (additionalMetadata != null)
+      formParams.put("additionalMetadata", additionalMetadata);
+    if (file != null)
+      formParams.put("file", file);
+    
+
+    final String[] accepts = {
+      "application/json", "application/xml"
+    };
+    final String accept = apiClient.selectHeaderAccept(accepts);
+
+    final String[] contentTypes = {
+      "multipart/form-data"
+    };
+    final String contentType = apiClient.selectHeaderContentType(contentTypes);
+
+    String[] authNames = new String[] { "petstore_auth" };
+    
+    apiClient.invokeAPI(path, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    
+  }
+  
+}
diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/api/StoreApi.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/api/StoreApi.java
new file mode 100644
index 00000000000..7c0430b5f71
--- /dev/null
+++ b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/api/StoreApi.java
@@ -0,0 +1,215 @@
+package io.swagger.client.api;
+
+import io.swagger.client.ApiException;
+import io.swagger.client.ApiClient;
+import io.swagger.client.Configuration;
+import io.swagger.client.Pair;
+import io.swagger.client.TypeRef;
+
+import io.swagger.client.model.*;
+
+import java.util.*;
+
+import java.util.Map;
+import io.swagger.client.model.Order;
+
+import java.io.File;
+import java.util.Map;
+import java.util.HashMap;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00")
+public class StoreApi {
+  private ApiClient apiClient;
+
+  public StoreApi() {
+    this(Configuration.getDefaultApiClient());
+  }
+
+  public StoreApi(ApiClient apiClient) {
+    this.apiClient = apiClient;
+  }
+
+  public ApiClient getApiClient() {
+    return apiClient;
+  }
+
+  public void setApiClient(ApiClient apiClient) {
+    this.apiClient = apiClient;
+  }
+
+  
+  /**
+   * 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" };
+    
+    TypeRef returnType = new TypeRef<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[] {  };
+    
+    TypeRef returnType = new TypeRef<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[] {  };
+    
+    TypeRef returnType = new TypeRef<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
+   */
+  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");
+    }
+    
+
+    // 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[] {  };
+    
+    apiClient.invokeAPI(path, "DELETE", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    
+  }
+  
+}
diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/api/UserApi.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/api/UserApi.java
new file mode 100644
index 00000000000..a11ac7d16ed
--- /dev/null
+++ b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/api/UserApi.java
@@ -0,0 +1,386 @@
+package io.swagger.client.api;
+
+import io.swagger.client.ApiException;
+import io.swagger.client.ApiClient;
+import io.swagger.client.Configuration;
+import io.swagger.client.Pair;
+import io.swagger.client.TypeRef;
+
+import io.swagger.client.model.*;
+
+import java.util.*;
+
+import io.swagger.client.model.User;
+import java.util.*;
+
+import java.io.File;
+import java.util.Map;
+import java.util.HashMap;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00")
+public class UserApi {
+  private ApiClient apiClient;
+
+  public UserApi() {
+    this(Configuration.getDefaultApiClient());
+  }
+
+  public UserApi(ApiClient apiClient) {
+    this.apiClient = apiClient;
+  }
+
+  public ApiClient getApiClient() {
+    return apiClient;
+  }
+
+  public void setApiClient(ApiClient apiClient) {
+    this.apiClient = apiClient;
+  }
+
+  
+  /**
+   * 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 ApiException {
+    Object postBody = body;
+    
+
+    // create path and map variables
+    String path = "/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>();
+
+    
+
+    
+
+    
+
+    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, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    
+  }
+  
+  /**
+   * Creates list of users with given input array
+   * 
+   * @param body List of user object
+   * @return void
+   */
+  public void createUsersWithArrayInput (List<User> body) throws ApiException {
+    Object postBody = body;
+    
+
+    // create path and map variables
+    String path = "/user/createWithArray".replaceAll("\\{format\\}","json");
+
+    // query params
+    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, "POST", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    
+  }
+  
+  /**
+   * Creates list of users with given input array
+   * 
+   * @param body List of user object
+   * @return void
+   */
+  public void createUsersWithListInput (List<User> body) throws ApiException {
+    Object postBody = body;
+    
+
+    // create path and map variables
+    String path = "/user/createWithList".replaceAll("\\{format\\}","json");
+
+    // query params
+    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, "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[] {  };
+    
+    TypeRef returnType = new TypeRef<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[] {  };
+    
+    TypeRef returnType = new TypeRef<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);
+    
+  }
+  
+  /**
+   * 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) 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 deleteUser");
+    }
+    
+
+    // 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, "DELETE", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, null);
+    
+  }
+  
+}
diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/auth/ApiKeyAuth.java
new file mode 100644
index 00000000000..41094d08440
--- /dev/null
+++ b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/auth/ApiKeyAuth.java
@@ -0,0 +1,59 @@
+package io.swagger.client.auth;
+
+import io.swagger.client.Pair;
+
+import java.util.Map;
+import java.util.List;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00")
+public class ApiKeyAuth implements Authentication {
+  private final String location;
+  private final String paramName;
+
+  private String apiKey;
+  private String apiKeyPrefix;
+
+  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;
+  }
+
+  public String getApiKeyPrefix() {
+    return apiKeyPrefix;
+  }
+
+  public void setApiKeyPrefix(String apiKeyPrefix) {
+    this.apiKeyPrefix = apiKeyPrefix;
+  }
+
+  @Override
+  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams) {
+    String value;
+    if (apiKeyPrefix != null) {
+      value = apiKeyPrefix + " " + apiKey;
+    } else {
+      value = apiKey;
+    }
+    if (location == "query") {
+      queryParams.add(new Pair(paramName, value));
+    } else if (location == "header") {
+      headerParams.put(paramName, value);
+    }
+  }
+}
diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/auth/Authentication.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/auth/Authentication.java
new file mode 100644
index 00000000000..5585eecdf1e
--- /dev/null
+++ b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/auth/Authentication.java
@@ -0,0 +1,12 @@
+package io.swagger.client.auth;
+
+import io.swagger.client.Pair;
+
+import java.util.Map;
+import java.util.List;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00")
+public interface Authentication {
+  /** Apply authentication settings to header and query params. */
+  void applyToParams(List<Pair> queryParams, Map<String, String> headerParams);
+}
diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/auth/HttpBasicAuth.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/auth/HttpBasicAuth.java
new file mode 100644
index 00000000000..740d8993862
--- /dev/null
+++ b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/auth/HttpBasicAuth.java
@@ -0,0 +1,41 @@
+package io.swagger.client.auth;
+
+import io.swagger.client.Pair;
+
+import java.util.Map;
+import java.util.List;
+
+import java.io.UnsupportedEncodingException;
+import javax.xml.bind.DatatypeConverter;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00")
+public class HttpBasicAuth implements Authentication {
+  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;
+  }
+
+  @Override
+  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams) {
+    String str = (username == null ? "" : username) + ":" + (password == null ? "" : password);
+    try {
+      headerParams.put("Authorization", "Basic " + DatatypeConverter.printBase64Binary(str.getBytes("UTF-8")));
+    } catch (UnsupportedEncodingException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/auth/OAuth.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/auth/OAuth.java
new file mode 100644
index 00000000000..b592d67848f
--- /dev/null
+++ b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/auth/OAuth.java
@@ -0,0 +1,14 @@
+package io.swagger.client.auth;
+
+import io.swagger.client.Pair;
+
+import java.util.Map;
+import java.util.List;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00")
+public class OAuth implements Authentication {
+  @Override
+  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams) {
+    // TODO: support oauth
+  }
+}
diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/Category.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/Category.java
new file mode 100644
index 00000000000..0d1945b5804
--- /dev/null
+++ b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/Category.java
@@ -0,0 +1,53 @@
+package io.swagger.client.model;
+
+
+
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+@ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00")
+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 String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Category {\n");
+    
+    sb.append("  id: ").append(id).append("\n");
+    sb.append("  name: ").append(name).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Order.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/Order.java
similarity index 93%
rename from samples/client/petstore/java/src/main/java/io/swagger/client/model/Order.java
rename to samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/Order.java
index 25864d8c9cc..2a3892f2918 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/Order.java
@@ -2,12 +2,15 @@
 
 import java.util.Date;
 
+
+
 import io.swagger.annotations.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class Order  {
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00")
+public class Order   {
   
   private Long id = null;
   private Long petId = null;
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/Pet.java
similarity index 89%
rename from samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java
rename to samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/Pet.java
index ddd0e1038c0..6cb7df1fde5 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/Pet.java
@@ -1,21 +1,24 @@
 package io.swagger.client.model;
 
 import io.swagger.client.model.Category;
-import java.util.*;
 import io.swagger.client.model.Tag;
+import java.util.*;
+
+
 
 import io.swagger.annotations.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class Pet  {
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07: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>() ;
+  private List<String> photoUrls = new ArrayList<String>();
+  private List<Tag> tags = new ArrayList<Tag>();
   public enum StatusEnum {
      available,  pending,  sold, 
   };
diff --git a/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/Tag.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/Tag.java
new file mode 100644
index 00000000000..fe212ea8ab6
--- /dev/null
+++ b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/Tag.java
@@ -0,0 +1,53 @@
+package io.swagger.client.model;
+
+
+
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+@ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07:00")
+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 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/jaxrs/src/test/java/io/swagger/client/model/User.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/User.java
new file mode 100644
index 00000000000..5b9230b8e01
--- /dev/null
+++ b/samples/server/petstore/jaxrs/src/test/java/io/swagger/client/model/User.java
@@ -0,0 +1,138 @@
+package io.swagger.client.model;
+
+
+
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+@ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-08-23T11:08:48.917-07: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;
+
+  
+  /**
+   **/
+  @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 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/jaxrs/src/test/java/io/swagger/test/integration/ResourceListingTestIT.java b/samples/server/petstore/jaxrs/src/test/java/io/swagger/test/integration/ResourceListingTestIT.java
new file mode 100644
index 00000000000..f2b6ffffa68
--- /dev/null
+++ b/samples/server/petstore/jaxrs/src/test/java/io/swagger/test/integration/ResourceListingTestIT.java
@@ -0,0 +1,85 @@
+/*
+ *  Copyright 2015 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.
+ */
+
+package io.swagger.test.integration;
+
+import io.swagger.client.ApiClient;
+import io.swagger.client.Pair;
+import io.swagger.client.TypeRef;
+import io.swagger.models.Operation;
+import io.swagger.models.Response;
+import io.swagger.models.Swagger;
+import io.swagger.models.parameters.Parameter;
+import io.swagger.models.properties.IntegerProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.Property;
+import io.swagger.util.Json;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.*;
+
+public class ResourceListingTestIT {
+    ApiClient client = new ApiClient();
+    Swagger swagger = null;
+    
+    @BeforeClass
+    public void setup() throws Exception {
+      TypeRef<String> ref = new TypeRef<String>(){};
+      List<Pair> queryParams = new ArrayList<Pair>();
+      Map<String, String> headerParams = new HashMap<String, String>();
+      Map<String, Object> formParams = new HashMap<String, Object>();
+
+      String str = client.invokeAPI("/swagger.json", "GET", queryParams, null, headerParams, formParams, "application/json", "", new String[0], ref);
+      swagger = Json.mapper().readValue(str, Swagger.class);
+      assertNotNull(swagger);      
+    }
+
+    @Test
+    public void verifyFileInput() throws Exception {
+        Operation op = swagger.getPath("/pet/{petId}/uploadImage").getPost();
+        List<Parameter> parameters = op.getParameters();
+        Parameter petId = parameters.get(0);
+        assertEquals(petId.getName(), "petId");
+        assertEquals(petId.getIn(), "path");
+
+        Parameter additionalMetadata = parameters.get(1);
+        assertEquals(additionalMetadata.getName(), "additionalMetadata");
+        assertEquals(additionalMetadata.getIn(), "formData");
+        
+        Parameter file = parameters.get(2);
+        assertEquals(file.getName(), "file");
+        assertEquals(file.getIn(), "formData");
+    }
+
+    @Test
+    public void verifyMapResponse() throws Exception {
+        Operation op = swagger.getPath("/store/inventory").getGet();
+        Response response = op.getResponses().get("200");
+        
+        Property property = response.getSchema();
+        assertTrue(property instanceof MapProperty);
+        
+        MapProperty mp = (MapProperty) property;
+        assertTrue(mp.getAdditionalProperties() instanceof IntegerProperty); 
+    }
+}
\ No newline at end of file
diff --git a/samples/server/petstore/nodejs/api/swagger.json b/samples/server/petstore/nodejs/api/swagger.json
index 6880eb18684..02c5ca0f97f 100644
--- a/samples/server/petstore/nodejs/api/swagger.json
+++ b/samples/server/petstore/nodejs/api/swagger.json
@@ -2,558 +2,851 @@
   "swagger": "2.0",
   "info": {
     "title": "Swagger Petstore",
-    "description": "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",
+    "description": "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"
   },
-  "produces": [
-    "application/json"
-  ],
+  "produces": ["application/json"],
   "host": "localhost:8080",
   "basePath": "/v2",
   "paths": {
-    "/user": {
-      "post": {
-        "x-swagger-router-controller": "User",
-        "tags": [
-          "User"
-        ],
-        "operationId": "createUser",
-        "parameters": [
-          {
-            "in": "body",
-            "name": "body",
-            "description": "Created user object",
-            "required": false,
-            "schema": {
-              "$ref": "#/definitions/User"
-            }
-          }
-        ],
-        "responses": {
-          "default": {
-            "description": "successful operation"
-          }
-        }
+  
+  "/user": {
+    "post": {
+      "summary": "Create user",
+      "description":"This can only be done by the logged in user.",
+      "x-swagger-router-controller": "User",
+      "tags": ["User"],
+      "operationId": "createUser",
+      "parameters": [
+        {
+  "in" : "body",
+  "name" : "body",
+  "description" : "Created user object",
+  "required" : false,
+  "schema" : {
+    "$ref" : "#/definitions/User"
+  }
+}
+        
+      ],
+      "responses": {
+        "default": {
+  "description" : "successful operation"
+}
+        
+        
       }
-    },
-    "/user/createWithArray": {
-      "post": {
-        "x-swagger-router-controller": "User",
-        "tags": [
-          "User"
-        ],
-        "operationId": "createUsersWithArrayInput",
-        "parameters": [
-          {
-            "in": "body",
-            "name": "body",
-            "description": "List of user object",
-            "required": false,
-            "schema": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/User"
-              }
-            }
-          }
-        ],
-        "responses": {
-          "default": {
-            "description": "successful operation"
-          }
-        }
+    }
+  } ,
+  
+  "/user/createWithArray": {
+    "post": {
+      "summary": "Creates list of users with given input array",
+      "description":"",
+      "x-swagger-router-controller": "User",
+      "tags": ["User"],
+      "operationId": "createUsersWithArrayInput",
+      "parameters": [
+        {
+  "in" : "body",
+  "name" : "body",
+  "description" : "List of user object",
+  "required" : false,
+  "schema" : {
+    "type" : "array",
+    "items" : {
+      "$ref" : "#/definitions/User"
+    }
+  }
+}
+        
+      ],
+      "responses": {
+        "default": {
+  "description" : "successful operation"
+}
+        
+        
       }
-    },
-    "/user/createWithList": {
-      "post": {
-        "x-swagger-router-controller": "User",
-        "tags": [
-          "User"
-        ],
-        "operationId": "createUsersWithListInput",
-        "parameters": [
-          {
-            "in": "body",
-            "name": "body",
-            "description": "List of user object",
-            "required": false,
-            "schema": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/User"
-              }
-            }
-          }
-        ],
-        "responses": {
-          "default": {
-            "description": "successful operation"
-          }
-        }
+    }
+  } ,
+  
+  "/user/createWithList": {
+    "post": {
+      "summary": "Creates list of users with given input array",
+      "description":"",
+      "x-swagger-router-controller": "User",
+      "tags": ["User"],
+      "operationId": "createUsersWithListInput",
+      "parameters": [
+        {
+  "in" : "body",
+  "name" : "body",
+  "description" : "List of user object",
+  "required" : false,
+  "schema" : {
+    "type" : "array",
+    "items" : {
+      "$ref" : "#/definitions/User"
+    }
+  }
+}
+        
+      ],
+      "responses": {
+        "default": {
+  "description" : "successful operation"
+}
+        
+        
       }
-    },
-    "/user/login": {
-      "get": {
-        "x-swagger-router-controller": "User",
-        "tags": [
-          "User"
-        ],
-        "operationId": "loginUser",
-        "parameters": [
-          {
-            "name": "username",
-            "in": "query",
-            "description": "The user name for login",
-            "required": false,
-            "type": "string"
-          },
-          {
-            "name": "password",
-            "in": "query",
-            "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"
-          }
-        }
+    }
+  } ,
+  
+  "/user/login": {
+    "get": {
+      "summary": "Logs user into the system",
+      "description":"",
+      "x-swagger-router-controller": "User",
+      "tags": ["User"],
+      "operationId": "loginUser",
+      "parameters": [
+        {
+  "name" : "username",
+  "in" : "query",
+  "description" : "The user name for login",
+  "required" : false,
+  "type" : "string"
+},
+        {
+  "name" : "password",
+  "in" : "query",
+  "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"
+}
+        
+        
       }
-    },
-    "/user/logout": {
-      "get": {
-        "x-swagger-router-controller": "User",
-        "tags": [
-          "User"
-        ],
-        "operationId": "logoutUser",
-        "responses": {
-          "default": {
-            "description": "successful operation"
-          }
-        }
+    }
+  } ,
+  
+  "/user/logout": {
+    "get": {
+      "summary": "Logs out current logged in user session",
+      "description":"",
+      "x-swagger-router-controller": "User",
+      "tags": ["User"],
+      "operationId": "logoutUser",
+      "responses": {
+        "default": {
+  "description" : "successful operation"
+}
+        
+        
       }
-    },
-    "/user/{username}": {
-      "delete": {
-        "x-swagger-router-controller": "User",
-        "tags": [
-          "User"
-        ],
-        "operationId": "deleteUser",
-        "parameters": [
-          {
-            "name": "username",
-            "in": "path",
-            "description": "The name that needs to be deleted",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "404": {
-            "description": "User not found"
-          },
-          "400": {
-            "description": "Invalid username supplied"
-          }
-        }
+    }
+  } ,
+  
+  "/user/{username}": {
+    "get": {
+      "summary": "Get user by user name",
+      "description":"",
+      "x-swagger-router-controller": "User",
+      "tags": ["User"],
+      "operationId": "getUserByName",
+      "parameters": [
+        {
+  "name" : "username",
+  "in" : "path",
+  "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"
+  },
+  "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"
+}
+        
+        
       }
-    },
-    "/pet": {
-      "post": {
-        "x-swagger-router-controller": "Pet",
-        "tags": [
-          "Pet"
-        ],
-        "operationId": "addPet",
-        "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"
-          }
-        }
+    }
+  } ,
+  
+  "/user/{username}": {
+    "put": {
+      "summary": "Updated user",
+      "description":"This can only be done by the logged in user.",
+      "x-swagger-router-controller": "User",
+      "tags": ["User"],
+      "operationId": "updateUser",
+      "parameters": [
+        {
+  "name" : "username",
+  "in" : "path",
+  "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"
+}
+        
+        
       }
-    },
-    "/pet/findByStatus": {
-      "get": {
-        "x-swagger-router-controller": "Pet",
-        "tags": [
-          "Pet"
-        ],
-        "operationId": "findPetsByStatus",
-        "parameters": [
-          {
-            "name": "status",
-            "in": "query",
-            "description": "Status values that need to be considered for filter",
-            "required": false,
-            "type": "array",
-            "items": {
-              "type": "string"
-            },
-            "collectionFormat": "multi",
-            "default": "available"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "successful operation",
-            "schema": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/Pet"
-              }
-            }
-          },
-          "400": {
-            "description": "Invalid status value"
-          }
-        }
+    }
+  } ,
+  
+  "/user/{username}": {
+    "delete": {
+      "summary": "Delete user",
+      "description":"This can only be done by the logged in user.",
+      "x-swagger-router-controller": "User",
+      "tags": ["User"],
+      "operationId": "deleteUser",
+      "parameters": [
+        {
+  "name" : "username",
+  "in" : "path",
+  "description" : "The name that needs to be deleted",
+  "required" : true,
+  "type" : "string"
+}
+        
+      ],
+      "responses": {
+        "404": {
+  "description" : "User not found"
+}
+        ,
+        "400": {
+  "description" : "Invalid username supplied"
+}
+        
+        
       }
-    },
-    "/pet/findByTags": {
-      "get": {
-        "x-swagger-router-controller": "Pet",
-        "tags": [
-          "Pet"
-        ],
-        "operationId": "findPetsByTags",
-        "parameters": [
-          {
-            "name": "tags",
-            "in": "query",
-            "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"
-          }
-        }
+    }
+  } 
+  
+   ,
+  
+  "/pet": {
+    "put": {
+      "summary": "Update an existing pet",
+      "description":"",
+      "x-swagger-router-controller": "Pet",
+      "tags": ["Pet"],
+      "operationId": "updatePet",
+      "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"
+}
+        
+        
       }
-    },
-    "/pet/{petId}": {
-      "delete": {
-        "x-swagger-router-controller": "Pet",
-        "tags": [
-          "Pet"
-        ],
-        "operationId": "deletePet",
-        "parameters": [
-          {
-            "name": "api_key",
-            "in": "header",
-            "description": "",
-            "required": false,
-            "type": "string"
-          },
-          {
-            "name": "petId",
-            "in": "path",
-            "description": "Pet id to delete",
-            "required": true,
-            "type": "integer",
-            "format": "int64"
-          }
-        ],
-        "responses": {
-          "400": {
-            "description": "Invalid pet value"
-          }
-        }
+    }
+  } ,
+  
+  "/pet": {
+    "post": {
+      "summary": "Add a new pet to the store",
+      "description":"",
+      "x-swagger-router-controller": "Pet",
+      "tags": ["Pet"],
+      "operationId": "addPet",
+      "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"
+}
+        
+        
       }
-    },
-    "/pet/{petId}/uploadImage": {
-      "post": {
-        "x-swagger-router-controller": "Pet",
-        "tags": [
-          "Pet"
-        ],
-        "operationId": "uploadFile",
-        "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"
-          }
-        }
+    }
+  } ,
+  
+  "/pet/findByStatus": {
+    "get": {
+      "summary": "Finds Pets by status",
+      "description":"Multiple status values can be provided with comma seperated strings",
+      "x-swagger-router-controller": "Pet",
+      "tags": ["Pet"],
+      "operationId": "findPetsByStatus",
+      "parameters": [
+        {
+  "name" : "status",
+  "in" : "query",
+  "description" : "Status values that need to be considered for filter",
+  "required" : false,
+  "type" : "array",
+  "items" : {
+    "type" : "string"
+  },
+  "collectionFormat" : "multi",
+  "default" : "available"
+}
+        
+      ],
+      "responses": {
+        "200": {
+  "description" : "successful operation",
+  "schema" : {
+    "type" : "array",
+    "items" : {
+      "$ref" : "#/definitions/Pet"
+    }
+  }
+}
+        ,
+        "400": {
+  "description" : "Invalid status value"
+}
+        
+        
       }
-    },
-    "/store/inventory": {
-      "get": {
-        "x-swagger-router-controller": "Store",
-        "tags": [
-          "Store"
-        ],
-        "operationId": "getInventory",
-        "responses": {
-          "200": {
-            "description": "successful operation",
-            "schema": {
-              "type": "object",
-              "additionalProperties": {
-                "type": "integer",
-                "format": "int32"
-              }
-            }
-          }
-        }
+    }
+  } ,
+  
+  "/pet/findByTags": {
+    "get": {
+      "summary": "Finds Pets by tags",
+      "description":"Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.",
+      "x-swagger-router-controller": "Pet",
+      "tags": ["Pet"],
+      "operationId": "findPetsByTags",
+      "parameters": [
+        {
+  "name" : "tags",
+  "in" : "query",
+  "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"
+}
+        
+        
       }
-    },
-    "/store/order": {
-      "post": {
-        "x-swagger-router-controller": "Store",
-        "tags": [
-          "Store"
-        ],
-        "operationId": "placeOrder",
-        "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"
-          }
-        }
+    }
+  } ,
+  
+  "/pet/{petId}": {
+    "get": {
+      "summary": "Find pet by ID",
+      "description":"Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions",
+      "x-swagger-router-controller": "Pet",
+      "tags": ["Pet"],
+      "operationId": "getPetById",
+      "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" : {
+    "$ref" : "#/definitions/Pet"
+  }
+}
+        ,
+        "400": {
+  "description" : "Invalid ID supplied"
+}
+        
+        
       }
-    },
-    "/store/order/{orderId}": {
-      "delete": {
-        "x-swagger-router-controller": "Store",
-        "tags": [
-          "Store"
-        ],
-        "operationId": "deleteOrder",
-        "parameters": [
-          {
-            "name": "orderId",
-            "in": "path",
-            "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"
-          }
-        }
+    }
+  } ,
+  
+  "/pet/{petId}": {
+    "post": {
+      "summary": "Updates a pet in the store with form data",
+      "description":"",
+      "x-swagger-router-controller": "Pet",
+      "tags": ["Pet"],
+      "operationId": "updatePetWithForm",
+      "parameters": [
+        {
+  "name" : "petId",
+  "in" : "path",
+  "description" : "ID of pet that needs to be updated",
+  "required" : true,
+  "type" : "string"
+},
+        {
+  "name" : "name",
+  "in" : "formData",
+  "description" : "Updated name of the pet",
+  "required" : false,
+  "type" : "string"
+},
+        {
+  "name" : "status",
+  "in" : "formData",
+  "description" : "Updated status of the pet",
+  "required" : false,
+  "type" : "string"
+}
+        
+      ],
+      "responses": {
+        "405": {
+  "description" : "Invalid input"
+}
+        
+        
       }
     }
-  },
-  "definitions": {
-    "User": {
-      "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"
-        }
-      },
-      "xml": {
-        "name": "User"
+  } ,
+  
+  "/pet/{petId}": {
+    "delete": {
+      "summary": "Deletes a pet",
+      "description":"",
+      "x-swagger-router-controller": "Pet",
+      "tags": ["Pet"],
+      "operationId": "deletePet",
+      "parameters": [
+        {
+  "name" : "api_key",
+  "in" : "header",
+  "description" : "",
+  "required" : false,
+  "type" : "string"
+},
+        {
+  "name" : "petId",
+  "in" : "path",
+  "description" : "Pet id to delete",
+  "required" : true,
+  "type" : "integer",
+  "format" : "int64"
+}
+        
+      ],
+      "responses": {
+        "400": {
+  "description" : "Invalid pet value"
+}
+        
+        
       }
-    },
-    "Category": {
-      "properties": {
-        "id": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "name": {
-          "type": "string"
-        }
-      },
-      "xml": {
-        "name": "Category"
+    }
+  } ,
+  
+  "/pet/{petId}/uploadImage": {
+    "post": {
+      "summary": "uploads an image",
+      "description":"",
+      "x-swagger-router-controller": "Pet",
+      "tags": ["Pet"],
+      "operationId": "uploadFile",
+      "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"
+}
+        
+        
       }
-    },
-    "Pet": {
-      "required": [
-        "name",
-        "photoUrls"
+    }
+  } 
+  
+   ,
+  
+  "/store/inventory": {
+    "get": {
+      "summary": "Returns pet inventories by status",
+      "description":"Returns a map of status codes to quantities",
+      "x-swagger-router-controller": "Store",
+      "tags": ["Store"],
+      "operationId": "getInventory",
+      "responses": {
+        "200": {
+  "description" : "successful operation",
+  "schema" : {
+    "type" : "object",
+    "additionalProperties" : {
+      "type" : "integer",
+      "format" : "int32"
+    }
+  }
+}
+        
+        
+      }
+    }
+  } ,
+  
+  "/store/order": {
+    "post": {
+      "summary": "Place an order for a pet",
+      "description":"",
+      "x-swagger-router-controller": "Store",
+      "tags": ["Store"],
+      "operationId": "placeOrder",
+      "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"
+}
+        
+        
+      }
+    }
+  } ,
+  
+  "/store/order/{orderId}": {
+    "get": {
+      "summary": "Find purchase order by ID",
+      "description":"For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions",
+      "x-swagger-router-controller": "Store",
+      "tags": ["Store"],
+      "operationId": "getOrderById",
+      "parameters": [
+        {
+  "name" : "orderId",
+  "in" : "path",
+  "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"
+}
+        
+        
+      }
+    }
+  } ,
+  
+  "/store/order/{orderId}": {
+    "delete": {
+      "summary": "Delete purchase order by ID",
+      "description":"For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors",
+      "x-swagger-router-controller": "Store",
+      "tags": ["Store"],
+      "operationId": "deleteOrder",
+      "parameters": [
+        {
+  "name" : "orderId",
+  "in" : "path",
+  "description" : "ID of the order that needs to be deleted",
+  "required" : true,
+  "type" : "string"
+}
+        
       ],
-      "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",
-          "enum": [
-            "available",
-            "pending",
-            "sold"
-          ]
-        }
-      },
-      "xml": {
-        "name": "Pet"
+      "responses": {
+        "404": {
+  "description" : "Order not found"
+}
+        ,
+        "400": {
+  "description" : "Invalid ID supplied"
+}
+        
+        
       }
+    }
+  } 
+  
+   
+  }, "definitions": {
+  "User": {
+  "properties" : {
+    "id" : {
+      "type" : "integer",
+      "format" : "int64"
+    },
+    "username" : {
+      "type" : "string"
+    },
+    "firstName" : {
+      "type" : "string"
+    },
+    "lastName" : {
+      "type" : "string"
+    },
+    "email" : {
+      "type" : "string"
     },
-    "Tag": {
-      "properties": {
-        "id": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "name": {
-          "type": "string"
-        }
-      },
-      "xml": {
-        "name": "Tag"
+    "password" : {
+      "type" : "string"
+    },
+    "phone" : {
+      "type" : "string"
+    },
+    "userStatus" : {
+      "type" : "integer",
+      "format" : "int32",
+      "description" : "User Status"
+    }
+  },
+  "xml" : {
+    "name" : "User"
+  }
+},"Category": {
+  "properties" : {
+    "id" : {
+      "type" : "integer",
+      "format" : "int64"
+    },
+    "name" : {
+      "type" : "string"
+    }
+  },
+  "xml" : {
+    "name" : "Category"
+  }
+},"Pet": {
+  "required" : [ "name", "photoUrls" ],
+  "properties" : {
+    "id" : {
+      "type" : "integer",
+      "format" : "int64"
+    },
+    "category" : {
+      "$ref" : "#/definitions/Category"
+    },
+    "name" : {
+      "type" : "string",
+      "example" : "doggie"
+    },
+    "photoUrls" : {
+      "type" : "array",
+      "items" : {
+        "type" : "string"
       }
     },
-    "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"
+    "tags" : {
+      "type" : "array",
+      "items" : {
+        "$ref" : "#/definitions/Tag"
       }
+    },
+    "status" : {
+      "type" : "string",
+      "description" : "pet status in the store",
+      "enum" : [ "available", "pending", "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"
+  }
+}
   }
-}
\ No newline at end of file
+}
diff --git a/samples/server/petstore/nodejs/controllers/Pet.js b/samples/server/petstore/nodejs/controllers/Pet.js
index b96815e4860..f23f593f414 100644
--- a/samples/server/petstore/nodejs/controllers/Pet.js
+++ b/samples/server/petstore/nodejs/controllers/Pet.js
@@ -6,119 +6,119 @@ var url = require('url');
 var Pet = require('./PetService');
 
 
-module.exports.updatePet = function updatePet(req, res, next) {
-    var body = req.swagger.params['body'].value;
-
-
-    var result = Pet.updatePet(body);
-
-    if (typeof result !== 'undefined') {
-        res.setHeader('Content-Type', 'application/json');
-        res.end(JSON.stringify(result || {}, null, 2));
-    }
-    else
-        res.end();
+module.exports.updatePet = function updatePet (req, res, next) {
+  var body = req.swagger.params['body'].value;
+  
+
+  var result = Pet.updatePet(body);
+
+  if(typeof result !== 'undefined') {
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify(result || {}, null, 2));
+  }
+  else
+    res.end();
 };
 
-module.exports.addPet = function addPet(req, res, next) {
-    var body = req.swagger.params['body'].value;
+module.exports.addPet = function addPet (req, res, next) {
+  var body = req.swagger.params['body'].value;
+  
 
+  var result = Pet.addPet(body);
 
-    var result = Pet.addPet(body);
-
-    if (typeof result !== 'undefined') {
-        res.setHeader('Content-Type', 'application/json');
-        res.end(JSON.stringify(result || {}, null, 2));
-    }
-    else
-        res.end();
+  if(typeof result !== 'undefined') {
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify(result || {}, null, 2));
+  }
+  else
+    res.end();
 };
 
-module.exports.findPetsByStatus = function findPetsByStatus(req, res, next) {
-    var status = req.swagger.params['status'].value;
-
+module.exports.findPetsByStatus = function findPetsByStatus (req, res, next) {
+  var status = req.swagger.params['status'].value;
+  
 
-    var result = Pet.findPetsByStatus(status);
+  var result = Pet.findPetsByStatus(status);
 
-    if (typeof result !== 'undefined') {
-        res.setHeader('Content-Type', 'application/json');
-        res.end(JSON.stringify(result || {}, null, 2));
-    }
-    else
-        res.end();
+  if(typeof result !== 'undefined') {
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify(result || {}, null, 2));
+  }
+  else
+    res.end();
 };
 
-module.exports.findPetsByTags = function findPetsByTags(req, res, next) {
-    var tags = req.swagger.params['tags'].value;
+module.exports.findPetsByTags = function findPetsByTags (req, res, next) {
+  var tags = req.swagger.params['tags'].value;
+  
 
+  var result = Pet.findPetsByTags(tags);
 
-    var result = Pet.findPetsByTags(tags);
-
-    if (typeof result !== 'undefined') {
-        res.setHeader('Content-Type', 'application/json');
-        res.end(JSON.stringify(result || {}, null, 2));
-    }
-    else
-        res.end();
+  if(typeof result !== 'undefined') {
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify(result || {}, null, 2));
+  }
+  else
+    res.end();
 };
 
-module.exports.getPetById = function getPetById(req, res, next) {
-    var petId = req.swagger.params['petId'].value;
-
+module.exports.getPetById = function getPetById (req, res, next) {
+  var petId = req.swagger.params['petId'].value;
+  
 
-    var result = Pet.getPetById(petId);
+  var result = Pet.getPetById(petId);
 
-    if (typeof result !== 'undefined') {
-        res.setHeader('Content-Type', 'application/json');
-        res.end(JSON.stringify(result || {}, null, 2));
-    }
-    else
-        res.end();
+  if(typeof result !== 'undefined') {
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify(result || {}, null, 2));
+  }
+  else
+    res.end();
 };
 
-module.exports.updatePetWithForm = function updatePetWithForm(req, res, next) {
-    var petId = req.swagger.params['petId'].value;
-    var name = req.swagger.params['name'].value;
-    var status = req.swagger.params['status'].value;
-
+module.exports.updatePetWithForm = function updatePetWithForm (req, res, next) {
+  var petId = req.swagger.params['petId'].value;
+  var name = req.swagger.params['name'].value;
+  var status = req.swagger.params['status'].value;
+  
 
-    var result = Pet.updatePetWithForm(petId, name, status);
+  var result = Pet.updatePetWithForm(petId, name, status);
 
-    if (typeof result !== 'undefined') {
-        res.setHeader('Content-Type', 'application/json');
-        res.end(JSON.stringify(result || {}, null, 2));
-    }
-    else
-        res.end();
+  if(typeof result !== 'undefined') {
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify(result || {}, null, 2));
+  }
+  else
+    res.end();
 };
 
-module.exports.deletePet = function deletePet(req, res, next) {
-    var api_key = req.swagger.params['api_key'].value;
-    var petId = req.swagger.params['petId'].value;
+module.exports.deletePet = function deletePet (req, res, next) {
+  var apiKey = req.swagger.params['api_key'].value;
+  var petId = req.swagger.params['petId'].value;
+  
 
+  var result = Pet.deletePet(apiKey, petId);
 
-    var result = Pet.deletePet(api_key, petId);
-
-    if (typeof result !== 'undefined') {
-        res.setHeader('Content-Type', 'application/json');
-        res.end(JSON.stringify(result || {}, null, 2));
-    }
-    else
-        res.end();
+  if(typeof result !== 'undefined') {
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify(result || {}, null, 2));
+  }
+  else
+    res.end();
 };
 
-module.exports.uploadFile = function uploadFile(req, res, next) {
-    var petId = req.swagger.params['petId'].value;
-    var additionalMetadata = req.swagger.params['additionalMetadata'].value;
-    var file = req.swagger.params['file'].value;
-
+module.exports.uploadFile = function uploadFile (req, res, next) {
+  var petId = req.swagger.params['petId'].value;
+  var additionalMetadata = req.swagger.params['additionalMetadata'].value;
+  var file = req.swagger.params['file'].value;
+  
 
-    var result = Pet.uploadFile(petId, additionalMetadata, file);
+  var result = Pet.uploadFile(petId, additionalMetadata, file);
 
-    if (typeof result !== 'undefined') {
-        res.setHeader('Content-Type', 'application/json');
-        res.end(JSON.stringify(result || {}, null, 2));
-    }
-    else
-        res.end();
+  if(typeof result !== 'undefined') {
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify(result || {}, null, 2));
+  }
+  else
+    res.end();
 };
diff --git a/samples/server/petstore/nodejs/controllers/PetService.js b/samples/server/petstore/nodejs/controllers/PetService.js
index 8e7eaaac090..cdfac3466ae 100644
--- a/samples/server/petstore/nodejs/controllers/PetService.js
+++ b/samples/server/petstore/nodejs/controllers/PetService.js
@@ -1,104 +1,112 @@
 'use strict';
 
-exports.updatePet = function (body) {
-
-    var examples = {};
+exports.updatePet = function(body) {
 
+  var examples = {};
+  
 
+  
 }
-exports.addPet = function (body) {
-
-    var examples = {};
+exports.addPet = function(body) {
 
+  var examples = {};
+  
 
+  
 }
-exports.findPetsByStatus = function (status) {
-
-    var examples = {};
-
-    examples['application/json'] = [{
-        "tags": [{
-            "id": 123456789,
-            "name": "aeiou"
-        }],
-        "id": 123456789,
-        "category": {
-            "id": 123456789,
-            "name": "aeiou"
-        },
-        "status": "aeiou",
-        "name": "doggie",
-        "photoUrls": ["aeiou"]
-    }];
-
-
-    if (Object.keys(examples).length > 0)
-        return examples[Object.keys(examples)[0]];
-
+exports.findPetsByStatus = function(status) {
+
+  var examples = {};
+  
+  examples['application/json'] = [ {
+  "tags" : [ {
+    "id" : 123456789,
+    "name" : "aeiou"
+  } ],
+  "id" : 123456789,
+  "category" : {
+    "id" : 123456789,
+    "name" : "aeiou"
+  },
+  "status" : "aeiou",
+  "name" : "doggie",
+  "photoUrls" : [ "aeiou" ]
+} ];
+  
+
+  
+  if(Object.keys(examples).length > 0)
+    return examples[Object.keys(examples)[0]];
+  
 }
-exports.findPetsByTags = function (tags) {
-
-    var examples = {};
-
-    examples['application/json'] = [{
-        "tags": [{
-            "id": 123456789,
-            "name": "aeiou"
-        }],
-        "id": 123456789,
-        "category": {
-            "id": 123456789,
-            "name": "aeiou"
-        },
-        "status": "aeiou",
-        "name": "doggie",
-        "photoUrls": ["aeiou"]
-    }];
-
-
-    if (Object.keys(examples).length > 0)
-        return examples[Object.keys(examples)[0]];
-
+exports.findPetsByTags = function(tags) {
+
+  var examples = {};
+  
+  examples['application/json'] = [ {
+  "tags" : [ {
+    "id" : 123456789,
+    "name" : "aeiou"
+  } ],
+  "id" : 123456789,
+  "category" : {
+    "id" : 123456789,
+    "name" : "aeiou"
+  },
+  "status" : "aeiou",
+  "name" : "doggie",
+  "photoUrls" : [ "aeiou" ]
+} ];
+  
+
+  
+  if(Object.keys(examples).length > 0)
+    return examples[Object.keys(examples)[0]];
+  
 }
-exports.getPetById = function (petId) {
-
-    var examples = {};
-
-    examples['application/json'] = {
-        "tags": [{
-            "id": 123456789,
-            "name": "aeiou"
-        }],
-        "id": 123456789,
-        "category": {
-            "id": 123456789,
-            "name": "aeiou"
-        },
-        "status": "aeiou",
-        "name": "doggie",
-        "photoUrls": ["aeiou"]
-    };
-
-
-    if (Object.keys(examples).length > 0)
-        return examples[Object.keys(examples)[0]];
-
+exports.getPetById = function(petId) {
+
+  var examples = {};
+  
+  examples['application/json'] = {
+  "tags" : [ {
+    "id" : 123456789,
+    "name" : "aeiou"
+  } ],
+  "id" : 123456789,
+  "category" : {
+    "id" : 123456789,
+    "name" : "aeiou"
+  },
+  "status" : "aeiou",
+  "name" : "doggie",
+  "photoUrls" : [ "aeiou" ]
+};
+  
+
+  
+  if(Object.keys(examples).length > 0)
+    return examples[Object.keys(examples)[0]];
+  
 }
-exports.updatePetWithForm = function (petId, name, status) {
-
-    var examples = {};
+exports.updatePetWithForm = function(petId, name, status) {
 
+  var examples = {};
+  
 
+  
 }
-exports.deletePet = function (api_key, petId) {
-
-    var examples = {};
+exports.deletePet = function(apiKey, petId) {
 
+  var examples = {};
+  
 
+  
 }
-exports.uploadFile = function (petId, additionalMetadata, file) {
-
-    var examples = {};
+exports.uploadFile = function(petId, additionalMetadata, file) {
 
+  var examples = {};
+  
 
+  
 }
diff --git a/samples/server/petstore/nodejs/controllers/Store.js b/samples/server/petstore/nodejs/controllers/Store.js
index fe00af26cc5..7059f9afa61 100644
--- a/samples/server/petstore/nodejs/controllers/Store.js
+++ b/samples/server/petstore/nodejs/controllers/Store.js
@@ -6,57 +6,57 @@ var url = require('url');
 var Store = require('./StoreService');
 
 
-module.exports.getInventory = function getInventory(req, res, next) {
+module.exports.getInventory = function getInventory (req, res, next) {
+  
 
+  var result = Store.getInventory();
 
-    var result = Store.getInventory();
-
-    if (typeof result !== 'undefined') {
-        res.setHeader('Content-Type', 'application/json');
-        res.end(JSON.stringify(result || {}, null, 2));
-    }
-    else
-        res.end();
+  if(typeof result !== 'undefined') {
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify(result || {}, null, 2));
+  }
+  else
+    res.end();
 };
 
-module.exports.placeOrder = function placeOrder(req, res, next) {
-    var body = req.swagger.params['body'].value;
-
+module.exports.placeOrder = function placeOrder (req, res, next) {
+  var body = req.swagger.params['body'].value;
+  
 
-    var result = Store.placeOrder(body);
+  var result = Store.placeOrder(body);
 
-    if (typeof result !== 'undefined') {
-        res.setHeader('Content-Type', 'application/json');
-        res.end(JSON.stringify(result || {}, null, 2));
-    }
-    else
-        res.end();
+  if(typeof result !== 'undefined') {
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify(result || {}, null, 2));
+  }
+  else
+    res.end();
 };
 
-module.exports.getOrderById = function getOrderById(req, res, next) {
-    var orderId = req.swagger.params['orderId'].value;
+module.exports.getOrderById = function getOrderById (req, res, next) {
+  var orderId = req.swagger.params['orderId'].value;
+  
 
+  var result = Store.getOrderById(orderId);
 
-    var result = Store.getOrderById(orderId);
-
-    if (typeof result !== 'undefined') {
-        res.setHeader('Content-Type', 'application/json');
-        res.end(JSON.stringify(result || {}, null, 2));
-    }
-    else
-        res.end();
+  if(typeof result !== 'undefined') {
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify(result || {}, null, 2));
+  }
+  else
+    res.end();
 };
 
-module.exports.deleteOrder = function deleteOrder(req, res, next) {
-    var orderId = req.swagger.params['orderId'].value;
-
+module.exports.deleteOrder = function deleteOrder (req, res, next) {
+  var orderId = req.swagger.params['orderId'].value;
+  
 
-    var result = Store.deleteOrder(orderId);
+  var result = Store.deleteOrder(orderId);
 
-    if (typeof result !== 'undefined') {
-        res.setHeader('Content-Type', 'application/json');
-        res.end(JSON.stringify(result || {}, null, 2));
-    }
-    else
-        res.end();
+  if(typeof result !== 'undefined') {
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify(result || {}, null, 2));
+  }
+  else
+    res.end();
 };
diff --git a/samples/server/petstore/nodejs/controllers/StoreService.js b/samples/server/petstore/nodejs/controllers/StoreService.js
index b4c820a034d..ba9ffd4fc44 100644
--- a/samples/server/petstore/nodejs/controllers/StoreService.js
+++ b/samples/server/petstore/nodejs/controllers/StoreService.js
@@ -1,57 +1,61 @@
 'use strict';
 
-exports.getInventory = function () {
-
-    var examples = {};
-
-    examples['application/json'] = {
-        "key": 123
-    };
-
-
-    if (Object.keys(examples).length > 0)
-        return examples[Object.keys(examples)[0]];
-
+exports.getInventory = function() {
+
+  var examples = {};
+  
+  examples['application/json'] = {
+  "key" : 123
+};
+  
+
+  
+  if(Object.keys(examples).length > 0)
+    return examples[Object.keys(examples)[0]];
+  
 }
-exports.placeOrder = function (body) {
-
-    var examples = {};
-
-    examples['application/json'] = {
-        "id": 123456789,
-        "petId": 123456789,
-        "complete": true,
-        "status": "aeiou",
-        "quantity": 123,
-        "shipDate": "2015-03-19T21:51:51.599+0000"
-    };
-
-
-    if (Object.keys(examples).length > 0)
-        return examples[Object.keys(examples)[0]];
-
+exports.placeOrder = function(body) {
+
+  var examples = {};
+  
+  examples['application/json'] = {
+  "id" : 123456789,
+  "petId" : 123456789,
+  "complete" : true,
+  "status" : "aeiou",
+  "quantity" : 123,
+  "shipDate" : "2015-07-09T06:03:19.571+0000"
+};
+  
+
+  
+  if(Object.keys(examples).length > 0)
+    return examples[Object.keys(examples)[0]];
+  
 }
-exports.getOrderById = function (orderId) {
-
-    var examples = {};
-
-    examples['application/json'] = {
-        "id": 123456789,
-        "petId": 123456789,
-        "complete": true,
-        "status": "aeiou",
-        "quantity": 123,
-        "shipDate": "2015-03-19T21:51:51.603+0000"
-    };
-
-
-    if (Object.keys(examples).length > 0)
-        return examples[Object.keys(examples)[0]];
-
+exports.getOrderById = function(orderId) {
+
+  var examples = {};
+  
+  examples['application/json'] = {
+  "id" : 123456789,
+  "petId" : 123456789,
+  "complete" : true,
+  "status" : "aeiou",
+  "quantity" : 123,
+  "shipDate" : "2015-07-09T06:03:19.576+0000"
+};
+  
+
+  
+  if(Object.keys(examples).length > 0)
+    return examples[Object.keys(examples)[0]];
+  
 }
-exports.deleteOrder = function (orderId) {
-
-    var examples = {};
+exports.deleteOrder = function(orderId) {
 
+  var examples = {};
+  
 
+  
 }
diff --git a/samples/server/petstore/nodejs/controllers/User.js b/samples/server/petstore/nodejs/controllers/User.js
index 89bb5368b25..d89f34c9c3f 100644
--- a/samples/server/petstore/nodejs/controllers/User.js
+++ b/samples/server/petstore/nodejs/controllers/User.js
@@ -6,115 +6,115 @@ var url = require('url');
 var User = require('./UserService');
 
 
-module.exports.createUser = function createUser(req, res, next) {
-    var body = req.swagger.params['body'].value;
-
-
-    var result = User.createUser(body);
-
-    if (typeof result !== 'undefined') {
-        res.setHeader('Content-Type', 'application/json');
-        res.end(JSON.stringify(result || {}, null, 2));
-    }
-    else
-        res.end();
+module.exports.createUser = function createUser (req, res, next) {
+  var body = req.swagger.params['body'].value;
+  
+
+  var result = User.createUser(body);
+
+  if(typeof result !== 'undefined') {
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify(result || {}, null, 2));
+  }
+  else
+    res.end();
 };
 
-module.exports.createUsersWithArrayInput = function createUsersWithArrayInput(req, res, next) {
-    var body = req.swagger.params['body'].value;
+module.exports.createUsersWithArrayInput = function createUsersWithArrayInput (req, res, next) {
+  var body = req.swagger.params['body'].value;
+  
 
+  var result = User.createUsersWithArrayInput(body);
 
-    var result = User.createUsersWithArrayInput(body);
-
-    if (typeof result !== 'undefined') {
-        res.setHeader('Content-Type', 'application/json');
-        res.end(JSON.stringify(result || {}, null, 2));
-    }
-    else
-        res.end();
+  if(typeof result !== 'undefined') {
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify(result || {}, null, 2));
+  }
+  else
+    res.end();
 };
 
-module.exports.createUsersWithListInput = function createUsersWithListInput(req, res, next) {
-    var body = req.swagger.params['body'].value;
-
+module.exports.createUsersWithListInput = function createUsersWithListInput (req, res, next) {
+  var body = req.swagger.params['body'].value;
+  
 
-    var result = User.createUsersWithListInput(body);
+  var result = User.createUsersWithListInput(body);
 
-    if (typeof result !== 'undefined') {
-        res.setHeader('Content-Type', 'application/json');
-        res.end(JSON.stringify(result || {}, null, 2));
-    }
-    else
-        res.end();
+  if(typeof result !== 'undefined') {
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify(result || {}, null, 2));
+  }
+  else
+    res.end();
 };
 
-module.exports.loginUser = function loginUser(req, res, next) {
-    var username = req.swagger.params['username'].value;
-    var password = req.swagger.params['password'].value;
+module.exports.loginUser = function loginUser (req, res, next) {
+  var username = req.swagger.params['username'].value;
+  var password = req.swagger.params['password'].value;
+  
 
+  var result = User.loginUser(username, password);
 
-    var result = User.loginUser(username, password);
-
-    if (typeof result !== 'undefined') {
-        res.setHeader('Content-Type', 'application/json');
-        res.end(JSON.stringify(result || {}, null, 2));
-    }
-    else
-        res.end();
+  if(typeof result !== 'undefined') {
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify(result || {}, null, 2));
+  }
+  else
+    res.end();
 };
 
-module.exports.logoutUser = function logoutUser(req, res, next) {
-
+module.exports.logoutUser = function logoutUser (req, res, next) {
+  
 
-    var result = User.logoutUser();
+  var result = User.logoutUser();
 
-    if (typeof result !== 'undefined') {
-        res.setHeader('Content-Type', 'application/json');
-        res.end(JSON.stringify(result || {}, null, 2));
-    }
-    else
-        res.end();
+  if(typeof result !== 'undefined') {
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify(result || {}, null, 2));
+  }
+  else
+    res.end();
 };
 
-module.exports.getUserByName = function getUserByName(req, res, next) {
-    var username = req.swagger.params['username'].value;
-
+module.exports.getUserByName = function getUserByName (req, res, next) {
+  var username = req.swagger.params['username'].value;
+  
 
-    var result = User.getUserByName(username);
+  var result = User.getUserByName(username);
 
-    if (typeof result !== 'undefined') {
-        res.setHeader('Content-Type', 'application/json');
-        res.end(JSON.stringify(result || {}, null, 2));
-    }
-    else
-        res.end();
+  if(typeof result !== 'undefined') {
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify(result || {}, null, 2));
+  }
+  else
+    res.end();
 };
 
-module.exports.updateUser = function updateUser(req, res, next) {
-    var username = req.swagger.params['username'].value;
-    var body = req.swagger.params['body'].value;
+module.exports.updateUser = function updateUser (req, res, next) {
+  var username = req.swagger.params['username'].value;
+  var body = req.swagger.params['body'].value;
+  
 
+  var result = User.updateUser(username, body);
 
-    var result = User.updateUser(username, body);
-
-    if (typeof result !== 'undefined') {
-        res.setHeader('Content-Type', 'application/json');
-        res.end(JSON.stringify(result || {}, null, 2));
-    }
-    else
-        res.end();
+  if(typeof result !== 'undefined') {
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify(result || {}, null, 2));
+  }
+  else
+    res.end();
 };
 
-module.exports.deleteUser = function deleteUser(req, res, next) {
-    var username = req.swagger.params['username'].value;
-
+module.exports.deleteUser = function deleteUser (req, res, next) {
+  var username = req.swagger.params['username'].value;
+  
 
-    var result = User.deleteUser(username);
+  var result = User.deleteUser(username);
 
-    if (typeof result !== 'undefined') {
-        res.setHeader('Content-Type', 'application/json');
-        res.end(JSON.stringify(result || {}, null, 2));
-    }
-    else
-        res.end();
+  if(typeof result !== 'undefined') {
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify(result || {}, null, 2));
+  }
+  else
+    res.end();
 };
diff --git a/samples/server/petstore/nodejs/controllers/UserService.js b/samples/server/petstore/nodejs/controllers/UserService.js
index a0c37b374d3..30aab42ada9 100644
--- a/samples/server/petstore/nodejs/controllers/UserService.js
+++ b/samples/server/petstore/nodejs/controllers/UserService.js
@@ -1,69 +1,77 @@
 'use strict';
 
-exports.createUser = function (body) {
-
-    var examples = {};
+exports.createUser = function(body) {
 
+  var examples = {};
+  
 
+  
 }
-exports.createUsersWithArrayInput = function (body) {
-
-    var examples = {};
+exports.createUsersWithArrayInput = function(body) {
 
+  var examples = {};
+  
 
+  
 }
-exports.createUsersWithListInput = function (body) {
-
-    var examples = {};
+exports.createUsersWithListInput = function(body) {
 
+  var examples = {};
+  
 
+  
 }
-exports.loginUser = function (username, password) {
-
-    var examples = {};
+exports.loginUser = function(username, password) {
 
-    examples['application/json'] = "aeiou";
-
-
-    if (Object.keys(examples).length > 0)
-        return examples[Object.keys(examples)[0]];
+  var examples = {};
+  
+  examples['application/json'] = "aeiou";
+  
 
+  
+  if(Object.keys(examples).length > 0)
+    return examples[Object.keys(examples)[0]];
+  
 }
-exports.logoutUser = function () {
-
-    var examples = {};
+exports.logoutUser = function() {
 
+  var examples = {};
+  
 
+  
 }
-exports.getUserByName = function (username) {
-
-    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)
-        return examples[Object.keys(examples)[0]];
-
+exports.getUserByName = function(username) {
+
+  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)
+    return examples[Object.keys(examples)[0]];
+  
 }
-exports.updateUser = function (username, body) {
-
-    var examples = {};
+exports.updateUser = function(username, body) {
 
+  var examples = {};
+  
 
+  
 }
-exports.deleteUser = function (username) {
-
-    var examples = {};
+exports.deleteUser = function(username) {
 
+  var examples = {};
+  
 
+  
 }
diff --git a/samples/server/petstore/nodejs/index.js b/samples/server/petstore/nodejs/index.js
index fe9724d4b88..c73b630ed20 100644
--- a/samples/server/petstore/nodejs/index.js
+++ b/samples/server/petstore/nodejs/index.js
@@ -8,9 +8,9 @@ var serverPort = 8080;
 
 // swaggerRouter configuration
 var options = {
-    swaggerUi: '/swagger.json',
-    controllers: './controllers',
-    useStubs: process.env.NODE_ENV === 'development' ? true : false // Conditionally turn on stubs (mock mode)
+  swaggerUi: '/swagger.json',
+  controllers: './controllers',
+  useStubs: process.env.NODE_ENV === 'development' ? true : false // Conditionally turn on stubs (mock mode)
 };
 
 // The Swagger document (require it, build it programmatically, fetch it from a URL, ...)
@@ -18,21 +18,21 @@ var swaggerDoc = require('./api/swagger.json');
 
 // Initialize the Swagger middleware
 swaggerTools.initializeMiddleware(swaggerDoc, function (middleware) {
-    // Interpret Swagger resources and attach metadata to request - must be first in swagger-tools middleware chain
-    app.use(middleware.swaggerMetadata());
+  // Interpret Swagger resources and attach metadata to request - must be first in swagger-tools middleware chain
+  app.use(middleware.swaggerMetadata());
 
-    // Validate Swagger requests
-    app.use(middleware.swaggerValidator());
+  // Validate Swagger requests
+  app.use(middleware.swaggerValidator());
 
-    // Route validated requests to appropriate controller
-    app.use(middleware.swaggerRouter(options));
+  // Route validated requests to appropriate controller
+  app.use(middleware.swaggerRouter(options));
 
-    // Serve the Swagger documents and Swagger UI
-    app.use(middleware.swaggerUi());
+  // Serve the Swagger documents and Swagger UI
+  app.use(middleware.swaggerUi());
 
-    // Start the server
-    http.createServer(app).listen(8080, function () {
-        console.log('Your server is listening on port %d (http://localhost:%d)', 8080, 8080);
-        console.log('Swagger-ui is available on http://localhost:%d/docs', 8080);
-    });
+  // Start the server
+  http.createServer(app).listen(8080, function () {
+    console.log('Your server is listening on port %d (http://localhost:%d)', 8080, 8080);
+    console.log('Swagger-ui is available on http://localhost:%d/docs', 8080);
+  });
 });
\ No newline at end of file
diff --git a/samples/server/petstore/nodejs/package.json b/samples/server/petstore/nodejs/package.json
index 4d0356c8e60..7bb6df08fb5 100644
--- a/samples/server/petstore/nodejs/package.json
+++ b/samples/server/petstore/nodejs/package.json
@@ -1,7 +1,7 @@
 {
   "name": "",
-  "version": "",
-  "description": "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",
+  "description": "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",
   "main": "index.js",
   "keywords": [
     "swagger"
diff --git a/samples/server/petstore/silex/SwaggerServer/.htaccess b/samples/server/petstore/silex/SwaggerServer/.htaccess
new file mode 100644
index 00000000000..e47b5fb8a0c
--- /dev/null
+++ b/samples/server/petstore/silex/SwaggerServer/.htaccess
@@ -0,0 +1,5 @@
+<IfModule mod_rewrite.c>
+    RewriteEngine On
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteRule ^(.*)$ index.php?_url=/$1 [QSA,L]
+</IfModule>
\ No newline at end of file
diff --git a/samples/server/petstore/silex/SwaggerServer/README.md b/samples/server/petstore/silex/SwaggerServer/README.md
new file mode 100644
index 00000000000..9f35636b3f8
--- /dev/null
+++ b/samples/server/petstore/silex/SwaggerServer/README.md
@@ -0,0 +1,10 @@
+# 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/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:
+
+[TEMPLATES](https://github.com/swagger-api/swagger-codegen/tree/master/modules/swagger-codegen/src/main/resources/silex/)
diff --git a/samples/server/petstore/silex/SwaggerServer/composer.json b/samples/server/petstore/silex/SwaggerServer/composer.json
new file mode 100644
index 00000000000..466cd3fbc77
--- /dev/null
+++ b/samples/server/petstore/silex/SwaggerServer/composer.json
@@ -0,0 +1,5 @@
+{
+  "require": {
+    "silex/silex": "~1.2"
+  }
+}
\ No newline at end of file
diff --git a/samples/server/petstore/silex/SwaggerServer/index.php b/samples/server/petstore/silex/SwaggerServer/index.php
new file mode 100644
index 00000000000..1526f3cb8f3
--- /dev/null
+++ b/samples/server/petstore/silex/SwaggerServer/index.php
@@ -0,0 +1,184 @@
+<?php
+require_once __DIR__ . '/vendor/autoload.php';
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Silex\Application;
+
+$app = new Silex\Application();
+
+    
+        
+            
+
+$app->POST('/user', function(Application $app, Request $request) {
+            
+            
+            return new Response('How about implementing createUser as a POST method ?');
+            });
+
+            
+
+$app->POST('/user/createWithArray', function(Application $app, Request $request) {
+            
+            
+            return new Response('How about implementing createUsersWithArrayInput as a POST method ?');
+            });
+
+            
+
+$app->POST('/user/createWithList', function(Application $app, Request $request) {
+            
+            
+            return new Response('How about implementing createUsersWithListInput as a POST method ?');
+            });
+
+            
+
+$app->GET('/user/login', function(Application $app, Request $request) {
+            $username = $request->get('username');    $password = $request->get('password');    
+            
+            return new Response('How about implementing loginUser as a GET method ?');
+            });
+
+            
+
+$app->GET('/user/logout', function(Application $app, Request $request) {
+            
+            
+            return new Response('How about implementing logoutUser as a GET method ?');
+            });
+
+            
+
+$app->GET('/user/{username}', function(Application $app, Request $request, $username) {
+            
+            
+            return new Response('How about implementing getUserByName as a GET method ?');
+            });
+
+            
+
+$app->PUT('/user/{username}', function(Application $app, Request $request, $username) {
+            
+            
+            return new Response('How about implementing updateUser as a PUT method ?');
+            });
+
+            
+
+$app->DELETE('/user/{username}', function(Application $app, Request $request, $username) {
+            
+            
+            return new Response('How about implementing deleteUser as a DELETE method ?');
+            });
+
+            
+        
+    
+        
+            
+
+$app->PUT('/pet', function(Application $app, Request $request) {
+            
+            
+            return new Response('How about implementing updatePet as a PUT method ?');
+            });
+
+            
+
+$app->POST('/pet', function(Application $app, Request $request) {
+            
+            
+            return new Response('How about implementing addPet as a POST method ?');
+            });
+
+            
+
+$app->GET('/pet/findByStatus', function(Application $app, Request $request) {
+            $status = $request->get('status');    
+            
+            return new Response('How about implementing findPetsByStatus as a GET method ?');
+            });
+
+            
+
+$app->GET('/pet/findByTags', function(Application $app, Request $request) {
+            $tags = $request->get('tags');    
+            
+            return new Response('How about implementing findPetsByTags as a GET method ?');
+            });
+
+            
+
+$app->GET('/pet/{petId}', function(Application $app, Request $request, $pet_id) {
+            
+            
+            return new Response('How about implementing getPetById as a GET method ?');
+            });
+
+            
+
+$app->POST('/pet/{petId}', function(Application $app, Request $request, $pet_id) {
+            
+            $name = $request->get('name');    $status = $request->get('status');    
+            return new Response('How about implementing updatePetWithForm as a POST method ?');
+            });
+
+            
+
+$app->DELETE('/pet/{petId}', function(Application $app, Request $request, $pet_id) {
+            
+            
+            return new Response('How about implementing deletePet as a DELETE method ?');
+            });
+
+            
+
+$app->POST('/pet/{petId}/uploadImage', function(Application $app, Request $request, $pet_id) {
+            
+            $additional_metadata = $request->get('additional_metadata');    $file = $request->get('file');    
+            return new Response('How about implementing uploadFile as a POST method ?');
+            });
+
+            
+        
+    
+        
+            
+
+$app->GET('/store/inventory', function(Application $app, Request $request) {
+            
+            
+            return new Response('How about implementing getInventory as a GET method ?');
+            });
+
+            
+
+$app->POST('/store/order', function(Application $app, Request $request) {
+            
+            
+            return new Response('How about implementing placeOrder as a POST method ?');
+            });
+
+            
+
+$app->GET('/store/order/{orderId}', function(Application $app, Request $request, $order_id) {
+            
+            
+            return new Response('How about implementing getOrderById as a GET method ?');
+            });
+
+            
+
+$app->DELETE('/store/order/{orderId}', function(Application $app, Request $request, $order_id) {
+            
+            
+            return new Response('How about implementing deleteOrder as a DELETE method ?');
+            });
+
+            
+        
+    
+
+$app->run();
diff --git a/samples/server/petstore/sinatra/Gemfile b/samples/server/petstore/sinatra/Gemfile
new file mode 100644
index 00000000000..be9c3168ea6
--- /dev/null
+++ b/samples/server/petstore/sinatra/Gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem "sinatra"
+gem "sinatra-cross_origin"
\ No newline at end of file
diff --git a/samples/server/petstore/sinatra/Gemfile.lock b/samples/server/petstore/sinatra/Gemfile.lock
new file mode 100644
index 00000000000..3b7c05b4083
--- /dev/null
+++ b/samples/server/petstore/sinatra/Gemfile.lock
@@ -0,0 +1,19 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    rack (1.6.4)
+    rack-protection (1.5.3)
+      rack
+    sinatra (1.4.6)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    sinatra-cross_origin (0.3.2)
+    tilt (2.0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  sinatra
+  sinatra-cross_origin
diff --git a/samples/server/petstore/sinatra/README.md b/samples/server/petstore/sinatra/README.md
new file mode 100644
index 00000000000..c5b8cfffe77
--- /dev/null
+++ b/samples/server/petstore/sinatra/README.md
@@ -0,0 +1,29 @@
+# Swagger for Sinatra
+
+## Overview
+This is a project to provide Swagger support inside the [Sinatra](http://www.sinatrarb.com/) framework.  You can find
+out more about both the spec and the framework at http://swagger.io.  For more information about 
+Wordnik's APIs, please visit http://developer.wordnik.com.
+
+## Prerequisites
+You need to install ruby 1.9.3 and the following gems:
+
+```
+sinatra
+sinatra-cross_origin
+```
+
+## Getting started
+This sample was generated with the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project.
+
+```
+rackup -p 4567 config.ru
+```
+
+In your [swagger ui](https://github.com/swagger-api/swagger-ui), put in the following URL:
+
+```
+http://localhost:4567/resources.json
+```
+
+Voila!
diff --git a/samples/server/petstore/sinatra/api/pet_api.rb b/samples/server/petstore/sinatra/api/pet_api.rb
new file mode 100644
index 00000000000..5f995c531d8
--- /dev/null
+++ b/samples/server/petstore/sinatra/api/pet_api.rb
@@ -0,0 +1,231 @@
+require 'json'
+
+
+MyApp.add_route('PUT', '/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', '/pet', {
+  "resourcePath" => "/Pet",
+  "summary" => "Add a new pet to the store",
+  "nickname" => "add_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('GET', '/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', '/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', '/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', '/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', '/pet/{petId}', {
+  "resourcePath" => "/Pet",
+  "summary" => "Deletes a pet",
+  "nickname" => "delete_pet", 
+  "responseClass" => "void", 
+  "endpoint" => "/pet/{petId}", 
+  "notes" => "",
+  "parameters" => [
+    
+    
+    {
+      "name" => "pet_id",
+      "description" => "Pet id to delete",
+      "dataType" => "int",
+      "paramType" => "path",
+    },
+    
+    
+    {
+      "name" => "api_key",
+      "description" => "",
+      "dataType" => "string",
+      "paramType" => "header",
+    },
+    
+    
+    ]}) do
+  cross_origin
+  # the guts live here
+
+  {"message" => "yes, it worked"}.to_json
+end
+
+
+MyApp.add_route('POST', '/pet/{petId}/uploadImage', {
+  "resourcePath" => "/Pet",
+  "summary" => "uploads an image",
+  "nickname" => "upload_file", 
+  "responseClass" => "void", 
+  "endpoint" => "/pet/{petId}/uploadImage", 
+  "notes" => "",
+  "parameters" => [
+    
+    
+    {
+      "name" => "pet_id",
+      "description" => "ID of pet to update",
+      "dataType" => "int",
+      "paramType" => "path",
+    },
+    
+    
+    
+    ]}) do
+  cross_origin
+  # the guts live here
+
+  {"message" => "yes, it worked"}.to_json
+end
+
diff --git a/samples/server/petstore/sinatra/api/store_api.rb b/samples/server/petstore/sinatra/api/store_api.rb
new file mode 100644
index 00000000000..24498387412
--- /dev/null
+++ b/samples/server/petstore/sinatra/api/store_api.rb
@@ -0,0 +1,103 @@
+require 'json'
+
+
+MyApp.add_route('GET', '/store/inventory', {
+  "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",
+  "parameters" => [
+    
+    
+    
+    
+    ]}) do
+  cross_origin
+  # the guts live here
+
+  {"message" => "yes, it worked"}.to_json
+end
+
+
+MyApp.add_route('POST', '/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",
+    }
+    
+    ]}) do
+  cross_origin
+  # the guts live here
+
+  {"message" => "yes, it worked"}.to_json
+end
+
+
+MyApp.add_route('GET', '/store/order/{orderId}', {
+  "resourcePath" => "/Store",
+  "summary" => "Find purchase order by ID",
+  "nickname" => "get_order_by_id", 
+  "responseClass" => "Order", 
+  "endpoint" => "/store/order/{orderId}", 
+  "notes" => "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+  "parameters" => [
+    
+    
+    {
+      "name" => "order_id",
+      "description" => "ID of pet that needs to be fetched",
+      "dataType" => "string",
+      "paramType" => "path",
+    },
+    
+    
+    
+    ]}) do
+  cross_origin
+  # the guts live here
+
+  {"message" => "yes, it worked"}.to_json
+end
+
+
+MyApp.add_route('DELETE', '/store/order/{orderId}', {
+  "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",
+  "parameters" => [
+    
+    
+    {
+      "name" => "order_id",
+      "description" => "ID of the order 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/api/user_api.rb b/samples/server/petstore/sinatra/api/user_api.rb
new file mode 100644
index 00000000000..98f50549ba1
--- /dev/null
+++ b/samples/server/petstore/sinatra/api/user_api.rb
@@ -0,0 +1,231 @@
+require 'json'
+
+
+MyApp.add_route('POST', '/user', {
+  "resourcePath" => "/User",
+  "summary" => "Create user",
+  "nickname" => "create_user", 
+  "responseClass" => "void", 
+  "endpoint" => "/user", 
+  "notes" => "This can only be done by the logged in user.",
+  "parameters" => [
+    
+    
+    
+    
+    {
+      "name" => "body",
+      "description" => "Created user object",
+      "dataType" => "User",
+      "paramType" => "body",
+    }
+    
+    ]}) do
+  cross_origin
+  # the guts live here
+
+  {"message" => "yes, it worked"}.to_json
+end
+
+
+MyApp.add_route('POST', '/user/createWithArray', {
+  "resourcePath" => "/User",
+  "summary" => "Creates list of users with given input array",
+  "nickname" => "create_users_with_array_input", 
+  "responseClass" => "void", 
+  "endpoint" => "/user/createWithArray", 
+  "notes" => "",
+  "parameters" => [
+    
+    
+    
+    
+    {
+      "name" => "body",
+      "description" => "List of user object",
+      "dataType" => "array[User]",
+      "paramType" => "body",
+    }
+    
+    ]}) do
+  cross_origin
+  # the guts live here
+
+  {"message" => "yes, it worked"}.to_json
+end
+
+
+MyApp.add_route('POST', '/user/createWithList', {
+  "resourcePath" => "/User",
+  "summary" => "Creates list of users with given input array",
+  "nickname" => "create_users_with_list_input", 
+  "responseClass" => "void", 
+  "endpoint" => "/user/createWithList", 
+  "notes" => "",
+  "parameters" => [
+    
+    
+    
+    
+    {
+      "name" => "body",
+      "description" => "List of user object",
+      "dataType" => "array[User]",
+      "paramType" => "body",
+    }
+    
+    ]}) do
+  cross_origin
+  # the guts live here
+
+  {"message" => "yes, it worked"}.to_json
+end
+
+
+MyApp.add_route('GET', '/user/login', {
+  "resourcePath" => "/User",
+  "summary" => "Logs user into the system",
+  "nickname" => "login_user", 
+  "responseClass" => "string", 
+  "endpoint" => "/user/login", 
+  "notes" => "",
+  "parameters" => [
+    
+    {
+      "name" => "username",
+      "description" => "The user name for login",
+      "dataType" => "string",
+      "paramType" => "query",
+      
+      "allowableValues" => "",
+      
+    },
+    
+    {
+      "name" => "password",
+      "description" => "The password for login in clear text",
+      "dataType" => "string",
+      "paramType" => "query",
+      
+      "allowableValues" => "",
+      
+    },
+    
+    
+    
+    
+    ]}) do
+  cross_origin
+  # the guts live here
+
+  {"message" => "yes, it worked"}.to_json
+end
+
+
+MyApp.add_route('GET', '/user/logout', {
+  "resourcePath" => "/User",
+  "summary" => "Logs out current logged in user session",
+  "nickname" => "logout_user", 
+  "responseClass" => "void", 
+  "endpoint" => "/user/logout", 
+  "notes" => "",
+  "parameters" => [
+    
+    
+    
+    
+    ]}) do
+  cross_origin
+  # the guts live here
+
+  {"message" => "yes, it worked"}.to_json
+end
+
+
+MyApp.add_route('GET', '/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', '/user/{username}', {
+  "resourcePath" => "/User",
+  "summary" => "Updated user",
+  "nickname" => "update_user", 
+  "responseClass" => "void", 
+  "endpoint" => "/user/{username}", 
+  "notes" => "This can only be done by the logged in user.",
+  "parameters" => [
+    
+    
+    {
+      "name" => "username",
+      "description" => "name that need to be deleted",
+      "dataType" => "string",
+      "paramType" => "path",
+    },
+    
+    
+    
+    {
+      "name" => "body",
+      "description" => "Updated user object",
+      "dataType" => "User",
+      "paramType" => "body",
+    }
+    
+    ]}) do
+  cross_origin
+  # the guts live here
+
+  {"message" => "yes, it worked"}.to_json
+end
+
+
+MyApp.add_route('DELETE', '/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/config.ru b/samples/server/petstore/sinatra/config.ru
new file mode 100644
index 00000000000..395d0587123
--- /dev/null
+++ b/samples/server/petstore/sinatra/config.ru
@@ -0,0 +1,2 @@
+require './my_app'
+run MyApp
diff --git a/samples/server/petstore/sinatra/lib/swaggering.rb b/samples/server/petstore/sinatra/lib/swaggering.rb
new file mode 100644
index 00000000000..79aca1da2c9
--- /dev/null
+++ b/samples/server/petstore/sinatra/lib/swaggering.rb
@@ -0,0 +1,154 @@
+require 'json'
+require 'sinatra/base'
+require 'sinatra/cross_origin'
+
+class Configuration
+  attr_accessor :base_path, :api_version, :swagger_version, :format_specifier
+
+  def initialize
+    @api_version = '1.0'
+    @base_path = 'http://localhost:4567'
+    @swagger_version = '1.1'
+    @format_specifier = ".json"
+  end
+end
+
+class Swaggering < Sinatra::Base
+  register Sinatra::CrossOrigin
+
+  @@routes = {}
+  @@configuration = Configuration.new
+
+  attr_accessor :configuration
+
+  def self.configure
+    get("/resources" + @@configuration.format_specifier) {
+      cross_origin
+      Swaggering.to_resource_listing
+    }
+    @@configuration ||= Configuration.new
+    yield(@@configuration) if block_given?
+  end
+  
+  def self.add_route(method, path, swag={}, opts={}, &block)
+    fullPath = swag["resourcePath"].to_s + @@configuration.format_specifier + path
+    
+    accepted = case method
+      when 'get'
+        get(fullPath, opts, &block)
+        true
+      when 'post'
+        post(fullPath, opts, &block)
+        true
+      when 'delete'
+        delete(fullPath, opts, &block)
+        true
+      when 'put' 
+        put(fullPath, opts, &block)
+        true
+      else
+        false
+    end
+
+    if accepted then
+      resourcePath = swag["resourcePath"].to_s
+      ops = @@routes[resourcePath]
+      if ops.nil?
+        ops = Array.new
+        @@routes.merge!(resourcePath => ops)
+
+        get(resourcePath + @@configuration.format_specifier) do
+          cross_origin
+          Swaggering.to_api(resourcePath)
+        end
+      end
+
+      swag.merge!("httpMethod" => method.to_s.upcase)
+      ops.push(swag)
+    end
+  end
+  
+  def self.to_resource_listing
+    apis = Array.new
+    (@@routes.keys).each do |key|
+      api = {
+        "path" => (key + ".{format}"),
+        "description" => "no description"
+      }
+      apis.push api
+    end
+  
+    resource = {
+      "apiVersion" => @@configuration.api_version,
+      "swaggerVersion" => @@configuration.swagger_version,
+      "apis" => apis
+    }
+
+    resource.to_json
+  end
+  
+  def self.to_api(resourcePath)
+    apis = {}
+    models = []
+
+    @@routes[resourcePath].each do |route|
+      endpoint = route["endpoint"].gsub(/:(\w+)(\/?)/,'{\1}\2')
+      path = (resourcePath + ".{format}" + endpoint)
+      api = apis[path]
+      if api.nil?
+        api = {"path" => path, "description" => "description", "operations" => []}
+        apis.merge!(path => api)
+      end
+      
+      parameters = route["parameters"]
+
+      unless parameters.nil? then
+        parameters.each do |param|
+          av_string = param["allowableValues"]
+          unless av_string.nil?
+            if av_string.count('[') > 0
+              pattern = /^([A-Z]*)\[(.*)\]/
+              match = pattern.match av_string
+              case match.to_a[1]
+                when "LIST"
+                  allowables = match.to_a[2].split(',')
+                  param["allowableValues"] = {
+                    "valueType" => "LIST",
+                    "values" => allowables
+                  }
+                when "RANGE"
+                  allowables = match.to_a[2].split(',')
+                  param["allowableValues"] = {
+                    "valueType" => "RANGE",
+                    "min" => allowables[0],
+                    "max" => allowables[1]
+                  }
+              end                
+            end
+          end
+        end
+      end
+      
+      op = {
+        "httpMethod" => route["httpMethod"],
+        "description" => route["summary"],
+        "responseClass" => route["responseClass"],
+        "notes" => route["notes"],
+        "nickname" => route["nickname"],
+        "summary" => route["summary"],
+        "parameters" => route["parameters"]
+      }
+      api["operations"].push(op)
+    end
+
+    api_listing = {
+      "apiVersion" => @@configuration.api_version,
+      "swaggerVersion" => @@configuration.swagger_version,
+      "basePath" => @@configuration.base_path,
+      "resourcePath" => resourcePath,
+      "apis" => apis.values,
+      "models" => models
+    }
+    api_listing.to_json
+  end
+end
diff --git a/samples/server/petstore/sinatra/my_app.rb b/samples/server/petstore/sinatra/my_app.rb
new file mode 100644
index 00000000000..9f4d991d0f1
--- /dev/null
+++ b/samples/server/petstore/sinatra/my_app.rb
@@ -0,0 +1,9 @@
+require './lib/swaggering'
+
+# only need to extend if you want special configuration!
+class MyApp < Swaggering
+  self.configure do |config|
+    config.api_version = '1.0.0' 
+  end
+end
+
diff --git a/samples/server/petstore/spring-mvc/README.md b/samples/server/petstore/spring-mvc/README.md
index 3ec7c5d70ea..3fa87e70893 100644
--- a/samples/server/petstore/spring-mvc/README.md
+++ b/samples/server/petstore/spring-mvc/README.md
@@ -8,4 +8,5 @@ This server was generated by the [swagger-codegen](https://github.com/swagger-ap
 
 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/sdoc.jsp
\ No newline at end of file
+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/pom.xml b/samples/server/petstore/spring-mvc/pom.xml
index 30cd3a41484..ad0b2c04acf 100644
--- a/samples/server/petstore/spring-mvc/pom.xml
+++ b/samples/server/petstore/spring-mvc/pom.xml
@@ -33,8 +33,7 @@
           <webAppConfig>
             <contextPath>/v2</contextPath>
           </webAppConfig>
-          <webAppSourceDirectory>target/${project.artifactId}-${project-version}</webAppSourceDirectory>
-          <webDefaultXml>${project.basedir}/conf/jetty/webdefault.xml</webDefaultXml>
+          <webAppSourceDirectory>target/${project.artifactId}-${project.version}</webAppSourceDirectory>
           <stopPort>8079</stopPort>
           <stopKey>stopit</stopKey>
           <httpConnector>
@@ -63,49 +62,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>com.googlecode.maven-download-plugin</groupId>
-        <artifactId>download-maven-plugin</artifactId>
-        <version>1.2.1</version>
-        <executions>
-          <execution>
-            <id>swagger-ui</id>
-            <goals>
-              <goal>wget</goal>
-            </goals>
-            <configuration>
-              <url>https://github.com/swagger-api/swagger-ui/archive/v${swagger-ui-version}.tar.gz</url>
-              <unpack>true</unpack>
-              <outputDirectory>${project.build.directory}</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>2.6</version>
-        <executions>
-          <execution>
-            <id>copy-resources</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>target/${project.artifactId}-${project.version}</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>${project.build.directory}/swagger-ui-${swagger-ui-version}/dist</directory>
-                  <filtering>true</filtering>
-                  <excludes>
-                    <exclude>index.html</exclude>
-                  </excludes>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
   <dependencies>
@@ -163,21 +119,6 @@
     </dependency>
 
     <!--SpringFox dependencies-->
-    <dependency>
-      <groupId>io.springfox</groupId>
-      <artifactId>springfox-core</artifactId>
-      <version>${springfox-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.springfox</groupId>
-      <artifactId>springfox-spi</artifactId>
-      <version>${springfox-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.springfox</groupId>
-      <artifactId>springfox-spring-web</artifactId>
-      <version>${springfox-version}</version>
-    </dependency>
     <dependency>
       <groupId>io.springfox</groupId>
       <artifactId>springfox-swagger2</artifactId>
@@ -189,12 +130,6 @@
       <version>${springfox-version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.scalatest</groupId>
-      <artifactId>scalatest_2.9.1</artifactId>
-      <version>${scala-test-version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -215,15 +150,14 @@
     </repository>
   </repositories>
   <properties>
-    <swagger-core-version>1.5.0</swagger-core-version>
+    <swagger-core-version>1.5.3</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
-    <swagger-ui-version>2.1.0-M2</swagger-ui-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.0-SNAPSHOT</springfox-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/src/main/java/io/swagger/api/ApiException.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiException.java
index cae767c0393..d5cc468f918 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,5 +1,6 @@
 package io.swagger.api;
 
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-08-23T14:20:14.172-07:00")
 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 c2eeacf13d3..4e9fe92b80c 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,6 +5,7 @@
 import javax.servlet.*;
 import javax.servlet.http.HttpServletResponse;
 
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-08-23T14:20:14.172-07:00")
 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 9e5b0ee44e2..5b1085f05d4 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,6 +3,7 @@
 import javax.xml.bind.annotation.XmlTransient;
 
 @javax.xml.bind.annotation.XmlRootElement
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-08-23T14:20:14.172-07:00")
 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 9c8410e47ab..04c8e861b3a 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,5 +1,6 @@
 package io.swagger.api;
 
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-08-23T14:20:14.172-07:00")
 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 6264ec78567..ae26430d13e 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
@@ -30,6 +30,7 @@
 @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 = "2015-08-23T14:20:14.172-07:00")
 public class PetApi {
   
 
@@ -77,12 +78,12 @@ public ResponseEntity<Void> addPet(
     produces = { "application/json", "application/xml" }, 
     
     method = RequestMethod.GET)
-  public ResponseEntity<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
+  public 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<Pet>(HttpStatus.OK);
+      return new ResponseEntity<List<Pet>>(HttpStatus.OK);
   }
 
   
@@ -95,12 +96,12 @@ public ResponseEntity<Pet> findPetsByStatus(@ApiParam(value = "Status values tha
     produces = { "application/json", "application/xml" }, 
     
     method = RequestMethod.GET)
-  public ResponseEntity<Pet> findPetsByTags(@ApiParam(value = "Tags to filter by") @RequestParam(value = "tags", required = false) List<String> tags
+  public 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<Pet>(HttpStatus.OK);
+      return new ResponseEntity<List<Pet>>(HttpStatus.OK);
   }
 
   
@@ -157,10 +158,10 @@ public ResponseEntity<Void> updatePetWithForm(
     
     method = RequestMethod.DELETE)
   public ResponseEntity<Void> deletePet(
-@ApiParam(value = ""  ) @RequestHeader(value="apiKey", required=false) String apiKey
+@ApiParam(value = "Pet id to delete",required=true ) @PathVariable("petId") Long petId
 ,
     
-@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!
@@ -171,7 +172,7 @@ public ResponseEntity<Void> deletePet(
 
   @ApiOperation(value = "uploads an image", notes = "", response = Void.class)
   @ApiResponses(value = { 
-    @ApiResponse(code = 0, message = "successful operation") })
+    @ApiResponse(code = 200, message = "successful operation") })
   @RequestMapping(value = "/{petId}/uploadImage", 
     produces = { "application/json", "application/xml" }, 
     consumes = { "multipart/form-data" },
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 c81693887db..1da00f9bfa7 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
@@ -30,20 +30,21 @@
 @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 = "2015-08-23T14:20:14.172-07:00")
 public class StoreApi {
   
 
-  @ApiOperation(value = "Returns pet inventories by status", notes = "Returns a map of status codes to quantities", response = Integer.class, responseContainer = "map")
+  @ApiOperation(value = "Returns pet inventories by status", notes = "Returns a map of status codes to quantities", response = Integer.class, responseContainer = "Map")
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation") })
   @RequestMapping(value = "/inventory", 
     produces = { "application/json", "application/xml" }, 
     
     method = RequestMethod.GET)
-  public ResponseEntity<Integer> getInventory()
+  public ResponseEntity<Map<String, Integer>> getInventory()
       throws NotFoundException {
       // do some magic!
-      return new ResponseEntity<Integer>(HttpStatus.OK);
+      return new ResponseEntity<Map<String, Integer>>(HttpStatus.OK);
   }
 
   
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 35227db7c67..13ef255488b 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
@@ -30,12 +30,13 @@
 @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 = "2015-08-23T14:20:14.172-07:00")
 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 = 0, message = "successful operation") })
+    @ApiResponse(code = 200, message = "successful operation") })
   @RequestMapping(value = "", 
     produces = { "application/json", "application/xml" }, 
     
@@ -52,7 +53,7 @@ public ResponseEntity<Void> createUser(
 
   @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class)
   @ApiResponses(value = { 
-    @ApiResponse(code = 0, message = "successful operation") })
+    @ApiResponse(code = 200, message = "successful operation") })
   @RequestMapping(value = "/createWithArray", 
     produces = { "application/json", "application/xml" }, 
     
@@ -69,7 +70,7 @@ public ResponseEntity<Void> createUsersWithArrayInput(
 
   @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class)
   @ApiResponses(value = { 
-    @ApiResponse(code = 0, message = "successful operation") })
+    @ApiResponse(code = 200, message = "successful operation") })
   @RequestMapping(value = "/createWithList", 
     produces = { "application/json", "application/xml" }, 
     
@@ -107,7 +108,7 @@ public ResponseEntity<String> loginUser(@ApiParam(value = "The user name for log
 
   @ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class)
   @ApiResponses(value = { 
-    @ApiResponse(code = 0, message = "successful operation") })
+    @ApiResponse(code = 200, message = "successful operation") })
   @RequestMapping(value = "/logout", 
     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 7b2de09cdd6..d15249c8d74 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,6 +18,7 @@
 @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 = "2015-08-23T14:20:14.172-07:00")
 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 ff8f366a880..2732a7c0491 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,6 +8,7 @@
 
 @Configuration
 @EnableWebMvc
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-08-23T14:20:14.172-07:00")
 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 05f7dae29ec..1799d0da80a 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,6 +2,7 @@
 
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
 
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-08-23T14:20:14.172-07:00")
 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 206e011dd48..629e5580e64 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,6 +3,7 @@
 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 = "2015-08-23T14:20:14.172-07:00")
 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/Category.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Category.java
index 56f86f70737..734f3b75e79 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
@@ -6,6 +6,7 @@
 
 
 @ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-08-23T14:20:14.172-07:00")
 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 4d0c133e936..d58ff96620d 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
@@ -7,6 +7,7 @@
 
 
 @ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-08-23T14:20:14.172-07:00")
 public class Order  {
   
   private Long id = 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 076a8cf8142..a86d7296ec7 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
@@ -1,21 +1,22 @@
 package io.swagger.model;
 
 import io.swagger.model.Category;
-import java.util.*;
 import io.swagger.model.Tag;
+import java.util.*;
 
 import io.swagger.annotations.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-08-23T14:20:14.172-07: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>() ;
+  private List<String> photoUrls = new ArrayList<String>();
+  private List<Tag> tags = new ArrayList<Tag>();
   public enum StatusEnum {
      available,  pending,  sold, 
   };
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 99dd07c00f7..d87fc671fbb 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
@@ -6,6 +6,7 @@
 
 
 @ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-08-23T14:20:14.172-07:00")
 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 d5f43a4c25e..1ef45c4bc66 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
@@ -6,6 +6,7 @@
 
 
 @ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2015-08-23T14:20:14.172-07:00")
 public class User  {
   
   private Long id = null;