diff --git a/README.md b/README.md
index 1c7ecb5758d..76db47b1e0f 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,8 @@
 
 :star::star::star: If you would like to contribute, please refer to [guidelines](https://github.com/swagger-api/swagger-codegen/blob/master/CONTRIBUTING.md) and a list of [open tasks](https://github.com/swagger-api/swagger-codegen/issues?q=is%3Aopen+is%3Aissue+label%3A%22Need+community+contribution%22).:star::star::star:
 
+:notebook_with_decorative_cover: For more information, please refer to the [Wiki page](https://github.com/swagger-api/swagger-codegen/wiki) and [FAQ](https://github.com/swagger-api/swagger-codegen/wiki/FAQ) :notebook_with_decorative_cover:
+
 ## Overview
 This is the swagger codegen project, which allows generation of client libraries automatically from a Swagger-compliant server.
 
@@ -565,7 +567,7 @@ You can also use the codegen to generate a server for a couple different framewo
 ```
 java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
   -i http://petstore.swagger.io/v2/swagger.json \
-  -l nodejs \
+  -l nodejs-server \
   -o samples/server/petstore/nodejs
 ```
 
diff --git a/bin/akka-scala-petstore.sh b/bin/akka-scala-petstore.sh
index 42beb3ce08a..0fc8dafd2d7 100755
--- a/bin/akka-scala-petstore.sh
+++ b/bin/akka-scala-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/akka-scala -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l akka-scala -o samples/client/petstore/akka-scala"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/akka-scala -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l akka-scala -o samples/client/petstore/akka-scala"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/all-wordnik.sh b/bin/all-wordnik.sh
deleted file mode 100755
index 95f71f10ab0..00000000000
--- a/bin/all-wordnik.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/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
-
-cd $APP_DIR
-./bin/android-java-wordnik-api.sh
-./bin/java-wordnik-api.sh
-./bin/objc-wordnik-api.sh
-./bin/scala-wordnik-api.sh
diff --git a/bin/android-java-wordnik-api.sh b/bin/android-java-wordnik-api.sh
deleted file mode 100755
index 551afcfa09b..00000000000
--- a/bin/android-java-wordnik-api.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/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/wordnik.json -l android -o samples/client/wordnik/android-java"
-
-java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/aspnet5-petstore-server.sh b/bin/aspnet5-petstore-server.sh
index 276d2a6e4b0..4481b4b318f 100755
--- a/bin/aspnet5-petstore-server.sh
+++ b/bin/aspnet5-petstore-server.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -l aspnet5 -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -o samples/server/petstore/aspnet5"
+ags="$@ generate -l aspnet5 -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -o samples/server/petstore/aspnet5"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/csharp-dotnet2-petstore.sh b/bin/csharp-dotnet2-petstore.sh
index fdab8bc413b..a63bfa35bfd 100755
--- a/bin/csharp-dotnet2-petstore.sh
+++ b/bin/csharp-dotnet2-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 CsharpDotNet2 -o samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -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 c3fe78f0f36..c042dd9c0cd 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/SwaggerClientTest/Lib/SwaggerClient"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l csharp -o samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/dart-petstore.sh b/bin/dart-petstore.sh
index 387d005132b..292af62977f 100755
--- a/bin/dart-petstore.sh
+++ b/bin/dart-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 dart -o samples/client/petstore/dart"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l dart -o samples/client/petstore/dart"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/dynamic-html.sh b/bin/dynamic-html.sh
index 37e9c71294d..826b70cec78 100755
--- a/bin/dynamic-html.sh
+++ b/bin/dynamic-html.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 dynamic-html  -o samples/dynamic-html"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l dynamic-html  -o samples/dynamic-html"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/flash-petstore.sh b/bin/flash-petstore.sh
index 20d75e8a8ac..804b90249c2 100755
--- a/bin/flash-petstore.sh
+++ b/bin/flash-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/flash -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l flash -o samples/client/petstore/flash"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/flash -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l flash -o samples/client/petstore/flash"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/flaskConnexion.sh b/bin/flaskConnexion.sh
index 1745d2a3ba2..563718f9061 100755
--- a/bin/flaskConnexion.sh
+++ b/bin/flaskConnexion.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 python-flask -o samples/server/petstore/flaskConnexion "
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l python-flask -o samples/server/petstore/flaskConnexion "
 
 java $JAVA_OPTS -Dservice -jar $executable $ags
diff --git a/bin/go-petstore.sh b/bin/go-petstore.sh
index 9f192d22234..35c5c0e6064 100755
--- a/bin/go-petstore.sh
+++ b/bin/go-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/go -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l go -o samples/client/petstore/go"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/go -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l go -o samples/client/petstore/go/go-petstore"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/haskell-servant-petstore.sh b/bin/haskell-servant-petstore.sh
index a35f38251cc..7032a6af26c 100755
--- a/bin/haskell-servant-petstore.sh
+++ b/bin/haskell-servant-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/haskell-servant -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l haskell-servant -o samples/server/petstore/haskell-servant"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/haskell-servant -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l haskell-servant -o samples/server/petstore/haskell-servant"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/html-petstore.sh b/bin/html-petstore.sh
index 7c0791284ca..030c36d03e1 100755
--- a/bin/html-petstore.sh
+++ b/bin/html-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 html  -o samples/html"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l html  -o samples/html"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/java-inflector-petstore-server.sh b/bin/java-inflector-petstore-server.sh
index 5200ab26bb1..2fe4c8cac0b 100755
--- a/bin/java-inflector-petstore-server.sh
+++ b/bin/java-inflector-petstore-server.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaInflector -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l inflector -o samples/server/petstore/java-inflector"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaInflector -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l inflector -o samples/server/petstore/java-inflector"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/java-wordnik-api.sh b/bin/java-wordnik-api.sh
deleted file mode 100755
index 38b5afd37f4..00000000000
--- a/bin/java-wordnik-api.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/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/wordnik.json -l java -o samples/client/wordnik/java"
-
-java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/javascript-closure-angular.sh b/bin/javascript-closure-angular.sh
index efd830034dc..9ef43666f88 100755
--- a/bin/javascript-closure-angular.sh
+++ b/bin/javascript-closure-angular.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 javascript-closure-angular -o samples/client/petstore/javascript-closure-angular"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l javascript-closure-angular -o samples/client/petstore/javascript-closure-angular"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/objc-wordnik-api.sh b/bin/objc-wordnik-api.sh
deleted file mode 100755
index 54807ca0512..00000000000
--- a/bin/objc-wordnik-api.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/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/wordnik.json -l objc -o samples/client/wordnik/objc"
-
-java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/perl-petstore.sh b/bin/perl-petstore.sh
index b2eb1753d67..f3eb5b17bd9 100755
--- a/bin/perl-petstore.sh
+++ b/bin/perl-petstore.sh
@@ -27,7 +27,7 @@ fi
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
 # complex module name used for testing
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l perl -o samples/client/petstore/perl"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml  -l perl -o samples/client/petstore/perl"
 
 java $JAVA_OPTS -jar $executable $ags
 
diff --git a/bin/php-petstore.sh b/bin/php-petstore.sh
index 14b53d65b4f..3b25c1c1cc3 100755
--- a/bin/php-petstore.sh
+++ b/bin/php-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/php -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l php -o samples/client/petstore/php"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/php -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l php -o samples/client/petstore/php"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/python-petstore.sh b/bin/python-petstore.sh
index 022629a9e20..ef120089f45 100755
--- a/bin/python-petstore.sh
+++ b/bin/python-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/python -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l python -o samples/client/petstore/python"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/python -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l python -o samples/client/petstore/python"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/qt5-petstore.sh b/bin/qt5-petstore.sh
index 7959785de34..40f05211cd0 100755
--- a/bin/qt5-petstore.sh
+++ b/bin/qt5-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/qt5cpp -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l qt5cpp -o samples/client/petstore/qt5cpp"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/qt5cpp -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l qt5cpp -o samples/client/petstore/qt5cpp"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/ruby-petstore.sh b/bin/ruby-petstore.sh
index 05cf1ee995e..f1c87e32028 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 -c bin/ruby-petstore.json -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-with-fake-endpoints-models-for-testing.yaml -l ruby -c bin/ruby-petstore.json -o samples/client/petstore/ruby"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/scala-async-petstore.sh b/bin/scala-async-petstore.sh
index 1576cff65c5..5456c98b27a 100755
--- a/bin/scala-async-petstore.sh
+++ b/bin/scala-async-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/asyncscala -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l async-scala -o samples/client/petstore/async-scala"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/asyncscala -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l async-scala -o samples/client/petstore/async-scala"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/scala-petstore.sh b/bin/scala-petstore.sh
index 390ca172395..b0ea4108160 100755
--- a/bin/scala-petstore.sh
+++ b/bin/scala-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/scala -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l scala -o samples/client/petstore/scala"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/scala -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l scala -o samples/client/petstore/scala"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/scala-wordnik-api.sh b/bin/scala-wordnik-api.sh
deleted file mode 100755
index 88692e34082..00000000000
--- a/bin/scala-wordnik-api.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/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/wordnik.json -l scala -o samples/client/wordnik/scala"
-
-java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/scalatra-petstore-server.sh b/bin/scalatra-petstore-server.sh
index 433f0bcbc0f..c902aec03bb 100755
--- a/bin/scalatra-petstore-server.sh
+++ b/bin/scalatra-petstore-server.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/scalatra -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l scalatra -o samples/server/petstore/scalatra"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/scalatra -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l scalatra -o samples/server/petstore/scalatra"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/silex-petstore-server.sh b/bin/silex-petstore-server.sh
index 85b658a3723..c273102828b 100755
--- a/bin/silex-petstore-server.sh
+++ b/bin/silex-petstore-server.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/silex -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l silex-PHP -o samples/server/petstore/silex"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/silex -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l silex-PHP -o samples/server/petstore/silex"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/slim-petstore-server.sh b/bin/slim-petstore-server.sh
index 654fc1d0e01..6e2e5270542 100755
--- a/bin/slim-petstore-server.sh
+++ b/bin/slim-petstore-server.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/slim -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l slim -o samples/server/petstore/slim"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/slim -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l slim -o samples/server/petstore/slim"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/spring-mvc-petstore-j8-async-server.sh b/bin/spring-mvc-petstore-j8-async-server.sh
index d43b0c43286..2f8d9fb9cd6 100755
--- a/bin/spring-mvc-petstore-j8-async-server.sh
+++ b/bin/spring-mvc-petstore-j8-async-server.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaSpringMVC -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l spring-mvc -o samples/server/petstore/spring-mvc-j8-async -c bin/spring-mvc-petstore-j8-async.json"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaSpringMVC -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l spring-mvc -o samples/server/petstore/spring-mvc-j8-async -c bin/spring-mvc-petstore-j8-async.json"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/spring-mvc-petstore-server.sh b/bin/spring-mvc-petstore-server.sh
index 55eaa7f32e8..14e33f2435b 100755
--- a/bin/spring-mvc-petstore-server.sh
+++ b/bin/spring-mvc-petstore-server.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaSpringMVC -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l spring-mvc -o samples/server/petstore/spring-mvc"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaSpringMVC -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l spring-mvc -o samples/server/petstore/spring-mvc"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/tizen-petstore.sh b/bin/tizen-petstore.sh
index 59497adc071..01a26b885d1 100755
--- a/bin/tizen-petstore.sh
+++ b/bin/tizen-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/tizen -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l tizen -o samples/client/petstore/tizen"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/tizen -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l tizen -o samples/client/petstore/tizen"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/modules/swagger-codegen/pom.xml b/modules/swagger-codegen/pom.xml
index 23f5aaed0d7..afaecfc3512 100644
--- a/modules/swagger-codegen/pom.xml
+++ b/modules/swagger-codegen/pom.xml
@@ -115,6 +115,14 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <profiles>
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 d386b4c4dca..e74b95cf2c1 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
@@ -9,7 +9,7 @@ public class CodegenParameter {
     public Boolean isFormParam, isQueryParam, isPathParam, isHeaderParam,
             isCookieParam, isBodyParam, hasMore, isContainer,
             secondaryParam, isCollectionFormatMulti, isPrimitiveType;
-    public String baseName, paramName, dataType, datatypeWithEnum, collectionFormat, description, baseType, defaultValue;
+    public String baseName, paramName, dataType, datatypeWithEnum, collectionFormat, description, unescapedDescription, baseType, defaultValue;
     public String example; // example value (x-example)
     public String jsonSchema;
     public Boolean isString, isInteger, isLong, isFloat, isDouble, isByteArray, isBinary, isBoolean, isDate, isDateTime;
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 9cd719dbe87..9ce8ce09735 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
@@ -1125,6 +1125,24 @@ public class DefaultCodegen {
             }
         }
 
+        if (p instanceof BaseIntegerProperty) {
+            BaseIntegerProperty sp = (BaseIntegerProperty) p;
+            property.isInteger = true;
+            /*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 IntegerProperty) {
             IntegerProperty sp = (IntegerProperty) p;
             property.isInteger = true;
@@ -1173,6 +1191,24 @@ public class DefaultCodegen {
             property.isByteArray = true;
         }
 
+        if (p instanceof DecimalProperty) {
+            DecimalProperty sp = (DecimalProperty) p;
+            property.isFloat = true;
+            /*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 DoubleProperty) {
             DoubleProperty sp = (DoubleProperty) p;
             property.isDouble = true;
@@ -1542,33 +1578,20 @@ public class DefaultCodegen {
 
 
                 allParams.add(p);
+                // Issue #2561 (neilotoole) : Moved setting of is<Type>Param flags
+                // from here to fromParameter().
                 if (param instanceof QueryParameter) {
-                    p.isQueryParam = new Boolean(true);
                     queryParams.add(p.copy());
                 } else if (param instanceof PathParameter) {
-                    p.required = true;
-                    p.isPathParam = new Boolean(true);
                     pathParams.add(p.copy());
                 } else if (param instanceof HeaderParameter) {
-                    p.isHeaderParam = new Boolean(true);
                     headerParams.add(p.copy());
                 } else if (param instanceof CookieParameter) {
-                    p.isCookieParam = new Boolean(true);
                     cookieParams.add(p.copy());
                 } else if (param instanceof BodyParameter) {
-                    p.isBodyParam = new Boolean(true);
-                    p.isBinary = p.dataType.toLowerCase().startsWith("byte");
                     bodyParam = p;
                     bodyParams.add(p.copy());
                 } else if (param instanceof FormParameter) {
-                    if ("file".equalsIgnoreCase(((FormParameter) param).getType())) {
-                        p.isFile = true;
-                    } else if("file".equals(p.baseType)){
-                    	p.isFile = true;
-                    } else {
-                        p.notFile = true;
-                    }
-                    p.isFormParam = new Boolean(true);
                     formParams.add(p.copy());
                 }
                 if (p.required == null || !p.required) {
@@ -1683,6 +1706,7 @@ public class DefaultCodegen {
         CodegenParameter p = CodegenModelFactory.newInstance(CodegenModelType.PARAMETER);
         p.baseName = param.getName();
         p.description = escapeText(param.getDescription());
+        p.unescapedDescription = param.getDescription();
         if (param.getRequired()) {
             p.required = param.getRequired();
         }
@@ -1896,6 +1920,33 @@ public class DefaultCodegen {
         // should be overridden by lang codegen
         setParameterExampleValue(p);
 
+        // Issue #2561 (neilotoole) : Set the is<TYPE>Param flags.
+        // This code has been moved to here from #fromOperation
+        // because these values should be set before calling #postProcessParameter.
+        // See: https://github.com/swagger-api/swagger-codegen/issues/2561
+        if (param instanceof QueryParameter) {
+            p.isQueryParam = true;
+        } else if (param instanceof PathParameter) {
+            p.required = true;
+            p.isPathParam = true;
+        } else if (param instanceof HeaderParameter) {
+            p.isHeaderParam = true;
+        } else if (param instanceof CookieParameter) {
+            p.isCookieParam = true;
+        } else if (param instanceof BodyParameter) {
+            p.isBodyParam = true;
+            p.isBinary = p.dataType.toLowerCase().startsWith("byte");
+        } else if (param instanceof FormParameter) {
+            if ("file".equalsIgnoreCase(((FormParameter) param).getType())) {
+                p.isFile = true;
+            } else if("file".equals(p.baseType)){
+                p.isFile = true;
+            } else {
+                p.notFile = true;
+            }
+            p.isFormParam = true;
+        }
+
         postProcessParameter(p);
         return p;
     }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java
index 76c0d1277b1..df23c1f2275 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java
@@ -89,7 +89,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
                         "Int64",
                         "Float",
                         "Guid",
-                        "Stream", // not really a primitive, we include it to avoid model import
+                        "System.IO.Stream", // not really a primitive, we include it to avoid model import
                         "Object")
         );
 
@@ -110,7 +110,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
         typeMapping.put("number", "double?");
         typeMapping.put("datetime", "DateTime?");
         typeMapping.put("date", "DateTime?");
-        typeMapping.put("file", "Stream");
+        typeMapping.put("file", "System.IO.Stream");
         typeMapping.put("array", "List");
         typeMapping.put("list", "List");
         typeMapping.put("map", "Dictionary");
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java
index 5389c509d76..0676372e64a 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java
@@ -59,6 +59,7 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
         //TODO binary should be mapped to byte array
         // mapped to String as a workaround
         typeMapping.put("binary", "string");
+        typeMapping.put("ByteArray", "string");
 
         cliOptions.add(new CliOption(CodegenConstants.MODEL_PROPERTY_NAMING, CodegenConstants.MODEL_PROPERTY_NAMING_DESC).defaultValue("camelCase"));
 
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 8c95183d1c2..523fa6ae8c6 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
@@ -168,7 +168,7 @@ public class AkkaScalaClientCodegen extends DefaultCodegen implements CodegenCon
 
     @Override
     public String getHelp() {
-        return "Generates a Scala client library base on Akka/Spray.";
+        return "Generates a Scala client library (beta) base on Akka/Spray.";
     }
 
     @Override
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 0db384adf8b..b8f2b187a6a 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
@@ -11,6 +11,7 @@ import io.swagger.codegen.SupportingFile;
 import io.swagger.codegen.CodegenProperty;
 import io.swagger.codegen.CodegenModel;
 import io.swagger.codegen.CodegenOperation;
+import io.swagger.codegen.CodegenParameter;
 import io.swagger.models.properties.*;
 import io.swagger.codegen.CliOption;
 import io.swagger.models.Model;
@@ -34,6 +35,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
     private static final Logger LOGGER = LoggerFactory.getLogger(CSharpClientCodegen.class);
     private static final String NET45 = "v4.5";
     private static final String NET35 = "v3.5";
+    private static final String UWP = "uwp";
     private static final String DATA_TYPE_WITH_ENUM_EXTENSION = "plainDatatypeWithEnum";
 
     protected String packageGuid = "{" + java.util.UUID.randomUUID().toString().toUpperCase() + "}";
@@ -44,10 +46,13 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
     protected String packageCopyright = "No Copyright";
     protected String clientPackage = "IO.Swagger.Client";
     protected String localVariablePrefix = "";
+    protected String apiDocPath = "docs/";
+    protected String modelDocPath = "docs/";
 
     protected String targetFramework = NET45;
     protected String targetFrameworkNuget = "net45";
     protected boolean supportsAsync = Boolean.TRUE;
+    protected boolean supportsUWP = Boolean.FALSE;
 
 
     protected final Map<String, String> frameworks;
@@ -60,6 +65,9 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
         modelTestTemplateFiles.put("model_test.mustache", ".cs");
         apiTestTemplateFiles.put("api_test.mustache", ".cs");
 
+        modelDocTemplateFiles.put("model_doc.mustache", ".md");
+        apiDocTemplateFiles.put("api_doc.mustache", ".md");
+
         // C# client default
         setSourceFolder("src" + File.separator + "main" + File.separator + "csharp");
 
@@ -89,6 +97,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
         frameworks = new ImmutableMap.Builder<String, String>()
                 .put(NET35, ".NET Framework 3.5 compatible")
                 .put(NET45, ".NET Framework 4.5+ compatible")
+                .put(UWP, "Universal Windows Platform - beta support")
                 .build();
         framework.defaultValue(this.targetFramework);
         framework.setEnum(frameworks);
@@ -156,6 +165,13 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
             if(additionalProperties.containsKey("supportsAsync")){
                 additionalProperties.remove("supportsAsync");
             }
+        } else if (UWP.equals(this.targetFramework)){
+            setTargetFrameworkNuget("uwp");
+            setSupportsAsync(Boolean.TRUE);
+            setSupportsUWP(Boolean.TRUE);
+            additionalProperties.put("supportsAsync", this.supportsUWP);
+            additionalProperties.put("supportsUWP", this.supportsAsync);
+
         } else {
             setTargetFrameworkNuget("net45");
             setSupportsAsync(Boolean.TRUE);
@@ -209,17 +225,19 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
         supportingFiles.add(new SupportingFile("compile.mustache", "", "compile.bat"));
         supportingFiles.add(new SupportingFile("compile-mono.sh.mustache", "", "compile-mono.sh"));
         supportingFiles.add(new SupportingFile("packages.config.mustache", "vendor" + java.io.File.separator, "packages.config"));
-        supportingFiles.add(new SupportingFile("README.md", "", "README.md"));
+        supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
         supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
         supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"));
 
-
         if (optionalAssemblyInfoFlag) {
             supportingFiles.add(new SupportingFile("AssemblyInfo.mustache", packageFolder + File.separator + "Properties", "AssemblyInfo.cs"));
         }
         if (optionalProjectFileFlag) {
             supportingFiles.add(new SupportingFile("Project.mustache", packageFolder, clientPackage + ".csproj"));
         }
+
+        additionalProperties.put("apiDocPath", apiDocPath);
+        additionalProperties.put("modelDocPath", modelDocPath);
     }
 
     @Override
@@ -290,20 +308,20 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
 
     @Override
     public Map<String, Object> postProcessModels(Map<String, Object> objMap) {
-    	Map<String, Object> objs = super.postProcessModels(objMap);
-    	
+        Map<String, Object> objs = super.postProcessModels(objMap);
+
         List<Object> models = (List<Object>) objs.get("models");
         for (Object _mo : models) {
             Map<String, Object> mo = (Map<String, Object>) _mo;
             CodegenModel cm = (CodegenModel) mo.get("model");
             for (CodegenProperty var : cm.vars) {
                 Map<String, Object> allowableValues = var.allowableValues;
-                
+
                 // handle ArrayProperty
                 if (var.items != null) {
                     allowableValues = var.items.allowableValues;
                 }
-                
+
                 if (allowableValues == null) {
                     continue;
                 }
@@ -339,12 +357,12 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
                 if (var.datatypeWithEnum != null) {
                     var.vendorExtensions.put(DATA_TYPE_WITH_ENUM_EXTENSION, var.datatypeWithEnum.substring(0, var.datatypeWithEnum.length() - 1));
                 }
-                
+
                 if (var.defaultValue != null) {
                     String enumName = null;
-                    
+
                     for (Map<String, String> enumVar : enumVars) {
-                    	
+
                         if (var.defaultValue.replace("\"", "").equals(enumVar.get("value"))) {
                             enumName = enumVar.get("name");
                             break;
@@ -403,7 +421,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
                     }
                 }
             }
-            
+
             if(removedChildEnum) {
                 // If we removed an entry from this model's vars, we need to ensure hasMore is updated
                 int count = 0, numVars = codegenProperties.size();
@@ -453,4 +471,24 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
     public void setSupportsAsync(Boolean supportsAsync){
         this.supportsAsync = supportsAsync;
     }
+
+    public void setSupportsUWP(Boolean supportsUWP){
+        this.supportsUWP = supportsUWP;
+    }
+
+    @Override
+    public String toModelDocFilename(String name) {
+        return toModelFilename(name);
+    }
+
+    @Override
+    public String apiDocFileFolder() {
+        return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
+    }
+
+    @Override
+    public String modelDocFileFolder() {
+        return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
+    }
+
 }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java
index c08ae3456b1..05654eebe5c 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java
@@ -60,7 +60,7 @@ public class CsharpDotNet2ClientCodegen extends DefaultCodegen implements Codege
                         "Integer",
                         "Long",
                         "Float",
-                        "Stream", // not really a primitive, we include it to avoid model import
+                        "System.IO.Stream", // not really a primitive, we include it to avoid model import
                         "Object")
         );
         instantiationTypes.put("array", "List");
@@ -76,7 +76,7 @@ public class CsharpDotNet2ClientCodegen extends DefaultCodegen implements Codege
         typeMapping.put("number", "double?");
         typeMapping.put("datetime", "DateTime?");
         typeMapping.put("date", "DateTime?");
-        typeMapping.put("file", "Stream");
+        typeMapping.put("file", "System.IO.Stream");
         typeMapping.put("array", "List");
         typeMapping.put("list", "List");
         typeMapping.put("map", "Dictionary");
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java
index c795345bcea..b2c1492631b 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java
@@ -25,6 +25,7 @@ public class FlaskConnexionCodegen extends DefaultCodegen implements CodegenConf
 
     public static final String CONTROLLER_PACKAGE = "controllerPackage";
     public static final String DEFAULT_CONTROLLER = "defaultController";
+    public static final String SUPPORT_PYTHON2= "supportPython2";
 
     protected String apiVersion = "1.0.0";
     protected int serverPort = 8080;
@@ -105,11 +106,17 @@ public class FlaskConnexionCodegen extends DefaultCodegen implements CodegenConf
                         "",
                         "README.md")
         );
+        supportingFiles.add(new SupportingFile("__init__.mustache",
+                        "",
+                        "__init__.py")
+        );
 
         cliOptions.add(new CliOption(CONTROLLER_PACKAGE, "controller package").
                 defaultValue("controllers"));
         cliOptions.add(new CliOption(DEFAULT_CONTROLLER, "default controller").
                 defaultValue("default_controller"));
+        cliOptions.add(new CliOption(SUPPORT_PYTHON2, "support python2").
+                defaultValue("false"));
     }
 
     @Override
@@ -124,6 +131,7 @@ public class FlaskConnexionCodegen extends DefaultCodegen implements CodegenConf
             this.controllerPackage = "controllers";
             additionalProperties.put(CONTROLLER_PACKAGE, this.controllerPackage);
         }
+
         if (additionalProperties.containsKey(DEFAULT_CONTROLLER)) {
             this.defaultController = additionalProperties.get(DEFAULT_CONTROLLER).toString();
         }
@@ -132,11 +140,19 @@ public class FlaskConnexionCodegen extends DefaultCodegen implements CodegenConf
             additionalProperties.put(DEFAULT_CONTROLLER, this.defaultController);
         }
 
+        if (Boolean.TRUE.equals(additionalProperties.get(SUPPORT_PYTHON2))) {
+            additionalProperties.put(SUPPORT_PYTHON2, Boolean.TRUE);
+        }
+
         if(!new java.io.File(controllerPackage + File.separator + defaultController + ".py").exists()) {
             supportingFiles.add(new SupportingFile("controller.mustache",
                             controllerPackage,
                             defaultController + ".py")
             );
+            supportingFiles.add(new SupportingFile("__init__.mustache",
+                            controllerPackage,
+                            "__init__.py")
+            );
         }
     }
 
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java
index 234bda9adb7..93144cf7afc 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java
@@ -4,6 +4,7 @@ import io.swagger.codegen.*;
 import io.swagger.models.properties.ArrayProperty;
 import io.swagger.models.properties.MapProperty;
 import io.swagger.models.properties.Property;
+import io.swagger.models.parameters.Parameter;
 
 import java.io.File;
 import java.util.*;
@@ -18,6 +19,8 @@ public class GoClientCodegen extends DefaultCodegen implements CodegenConfig {
 
     protected String packageName = "swagger";
     protected String packageVersion = "1.0.0";
+    protected String apiDocPath = "docs/";
+    protected String modelDocPath = "docs/";
 
     public CodegenType getTag() {
         return CodegenType.CLIENT;
@@ -36,6 +39,10 @@ public class GoClientCodegen extends DefaultCodegen implements CodegenConfig {
         outputFolder = "generated-code/go";
         modelTemplateFiles.put("model.mustache", ".go");
         apiTemplateFiles.put("api.mustache", ".go");
+
+        modelDocTemplateFiles.put("model_doc.mustache", ".md");
+        apiDocTemplateFiles.put("api_doc.mustache", ".md");
+
         templateDir = "go";
 
         setReservedWordsLowerCase(
@@ -79,11 +86,12 @@ public class GoClientCodegen extends DefaultCodegen implements CodegenConfig {
         typeMapping.clear();
         typeMapping.put("integer", "int32");
         typeMapping.put("long", "int64");
+        typeMapping.put("number", "float32");
         typeMapping.put("float", "float32");
         typeMapping.put("double", "float64");
         typeMapping.put("boolean", "bool");
         typeMapping.put("string", "string");
-        typeMapping.put("Date", "time.Time");
+        typeMapping.put("date", "time.Time");
         typeMapping.put("DateTime", "time.Time");
         typeMapping.put("password", "string");
         typeMapping.put("File", "*os.File");
@@ -91,6 +99,7 @@ public class GoClientCodegen extends DefaultCodegen implements CodegenConfig {
         // map binary to string as a workaround
         // the correct solution is to use []byte
         typeMapping.put("binary", "string");
+        typeMapping.put("ByteArray", "string");
 
         importMapping = new HashMap<String, String>();
         importMapping.put("time.Time", "time");
@@ -101,7 +110,6 @@ public class GoClientCodegen extends DefaultCodegen implements CodegenConfig {
                 .defaultValue("swagger"));
         cliOptions.add(new CliOption(CodegenConstants.PACKAGE_VERSION, "Go package version.")
                 .defaultValue("1.0.0"));
-
     }
 
     @Override
@@ -124,6 +132,9 @@ public class GoClientCodegen extends DefaultCodegen implements CodegenConfig {
 
         additionalProperties.put(CodegenConstants.PACKAGE_NAME, packageName);
         additionalProperties.put(CodegenConstants.PACKAGE_VERSION, packageVersion);
+        
+        additionalProperties.put("apiDocPath", apiDocPath);
+        additionalProperties.put("modelDocPath", modelDocPath);
 
         modelPackage = packageName;
         apiPackage = packageName;
@@ -131,7 +142,9 @@ public class GoClientCodegen extends DefaultCodegen implements CodegenConfig {
         supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
         supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
         supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"));
-        supportingFiles.add(new SupportingFile("configuration.mustache", packageName, "Configuration.go"));
+        supportingFiles.add(new SupportingFile("configuration.mustache", "", "configuration.go"));
+        supportingFiles.add(new SupportingFile("api_client.mustache", "", "api_client.go"));
+        supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
     }
 
     @Override
@@ -155,11 +168,11 @@ public class GoClientCodegen extends DefaultCodegen implements CodegenConfig {
 
     @Override
     public String apiFileFolder() {
-        return outputFolder + File.separator + packageName;
+        return outputFolder + File.separator;
     }
 
     public String modelFileFolder() {
-        return outputFolder + File.separator + packageName;
+        return outputFolder + File.separator;
     }
 
     @Override
@@ -195,6 +208,13 @@ public class GoClientCodegen extends DefaultCodegen implements CodegenConfig {
 
     @Override
     public String toModelName(String name) {
+        // camelize the model name
+        // phone_number => PhoneNumber
+        return camelize(toModelFilename(name));
+    }
+
+    @Override
+    public String toModelFilename(String name) {
         if (!StringUtils.isEmpty(modelNamePrefix)) {
             name = modelNamePrefix + "_" + name;
         }
@@ -211,17 +231,68 @@ public class GoClientCodegen extends DefaultCodegen implements CodegenConfig {
             name = "model_" + name; // e.g. return => ModelReturn (after camelize)
         }
 
-        // camelize the model name
-        // phone_number => PhoneNumber
-        return camelize(name);
+        return underscore(name);
     }
 
     @Override
-    public String toModelFilename(String name) {
-        // should be the same as the model name
+    public String toApiFilename(String name) {
+        // replace - with _ e.g. created-at => created_at
+        name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
+
+        // e.g. PetApi.go => pet_api.go
+        return underscore(name) + "_api";
+    }
+
+
+
+    /**
+     * Overrides postProcessParameter to add a vendor extension "x-exportParamName".
+     * This is useful when paramName starts with a lowercase letter, but we need that
+     * param to be exportable (starts with an Uppercase letter).
+     *
+     * @param parameter CodegenParameter object to be processed.
+     */
+    @Override
+    public void postProcessParameter(CodegenParameter parameter){
+
+        // Give the base class a chance to process
+        super.postProcessParameter(parameter);
+
+        char firstChar = parameter.paramName.charAt(0);
+
+        if (Character.isUpperCase(firstChar)) {
+            // First char is already uppercase, just use paramName.
+            parameter.vendorExtensions.put("x-exportParamName", parameter.paramName);
+
+        }
+
+        // It's a lowercase first char, let's convert it to uppercase
+        StringBuilder sb = new StringBuilder(parameter.paramName);
+        sb.setCharAt(0, Character.toUpperCase(firstChar));
+        parameter.vendorExtensions.put("x-exportParamName", sb.toString());
+    }
+
+
+    @Override
+    public String apiDocFileFolder() {
+        return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
+    }
+
+    @Override
+    public String modelDocFileFolder() {
+        return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
+    }
+
+    @Override
+    public String toModelDocFilename(String name) {
         return toModelName(name);
     }
 
+    @Override
+    public String toApiDocFilename(String name) {
+        return toApiName(name);
+    }
+
     @Override
     public String getTypeDeclaration(Property p) {
         if(p instanceof ArrayProperty) {
@@ -333,5 +404,4 @@ public class GoClientCodegen extends DefaultCodegen implements CodegenConfig {
     public void setPackageVersion(String packageVersion) {
         this.packageVersion = packageVersion;
     }
-
 }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/HaskellServantCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/HaskellServantCodegen.java
index 23f431d9a93..a78bb441c48 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/HaskellServantCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/HaskellServantCodegen.java
@@ -1,345 +1,514 @@
 package io.swagger.codegen.languages;
 
 import io.swagger.codegen.*;
+import io.swagger.models.ModelImpl;
+import io.swagger.models.parameters.Parameter;
 import io.swagger.models.properties.*;
 import io.swagger.models.Model;
 import io.swagger.models.Operation;
 import io.swagger.models.Swagger;
+import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 import java.util.*;
 import java.io.File;
 
 public class HaskellServantCodegen extends DefaultCodegen implements CodegenConfig {
 
-  // source folder where to write the files
-  protected String sourceFolder = "src";
-  protected String apiVersion = "0.0.1";
+    // source folder where to write the files
+    protected String sourceFolder = "src";
+    protected String apiVersion = "0.0.1";
 
-  /**
-   * Configures the type of generator.
-   *
-   * @return  the CodegenType for this generator
-   * @see     io.swagger.codegen.CodegenType
-   */
-  public CodegenType getTag() {
-    return CodegenType.SERVER;
-  }
 
-  /**
-   * Configures a friendly name for the generator.  This will be used by the generator
-   * to select the library with the -l flag.
-   *
-   * @return the friendly name for the generator
-   */
-  public String getName() {
-    return "haskell-servant";
-  }
-
-  /**
-   * Returns human-friendly help for the generator.  Provide the consumer with help
-   * tips, parameters here
-   *
-   * @return A string value for the help message
-   */
-  public String getHelp() {
-    return "Generates a HaskellServantCodegen library.";
-  }
-
-  public HaskellServantCodegen() {
-    super();
-
-    // set the output folder here
-    outputFolder = "generated-code/HaskellServantCodegen";
+    // How to encode special characters like $
+    // They are translated to words like "Dollar" and prefixed with '
+    // Then translated back during JSON encoding and decoding
+    private Map<Character, String> specialCharReplacements = new HashMap<Character, String>();
 
     /**
-     * Models.  You can write model files using the modelTemplateFiles map.
-     * if you want to create one template for file, you can do so here.
-     * for multiple files for model, just put another entry in the `modelTemplateFiles` with
-     * a different extension
+     * Configures the type of generator.
+     *
+     * @return the CodegenType for this generator
+     * @see io.swagger.codegen.CodegenType
      */
-    modelTemplateFiles.put(
-      "model.mustache", // the template to use
-      ".hs");       // the extension for each file to write
+    public CodegenType getTag() {
+        return CodegenType.SERVER;
+    }
 
     /**
-     * Api classes.  You can write classes for each Api file with the apiTemplateFiles map.
-     * as with models, add multiple entries with different extensions for multiple files per
-     * class
+     * Configures a friendly name for the generator.  This will be used by the generator
+     * to select the library with the -l flag.
+     *
+     * @return the friendly name for the generator
      */
-    apiTemplateFiles.put(
-      "api.mustache",   // the template to use
-      ".hs");       // the extension for each file to write
+    public String getName() {
+        return "haskell";
+    }
 
     /**
+     * Returns human-friendly help for the generator.  Provide the consumer with help
+     * tips, parameters here
+     *
+     * @return A string value for the help message
+     */
+    public String getHelp() {
+        return "Generates a Haskell server and client library.";
+    }
+
+    public HaskellServantCodegen() {
+        super();
+
+        // Initialize special characters
+        specialCharReplacements.put('$', "Dollar");
+        specialCharReplacements.put('^', "Caret");
+        specialCharReplacements.put('|', "Pipe");
+        specialCharReplacements.put('=', "Equal");
+        specialCharReplacements.put('*', "Star");
+        specialCharReplacements.put('-', "Dash");
+        specialCharReplacements.put('&', "Ampersand");
+        specialCharReplacements.put('%', "Percent");
+        specialCharReplacements.put('#', "Hash");
+        specialCharReplacements.put('@', "At");
+        specialCharReplacements.put('!', "Exclamation");
+        specialCharReplacements.put('+', "Plus");
+
+
+        // set the output folder here
+        outputFolder = "generated-code/haskell-servant";
+
+    /*
      * Template Location.  This is the location which templates will be read from.  The generator
      * will use the resource stream to attempt to read the templates.
      */
-    embeddedTemplateDir = templateDir = "haskell-servant";
+        embeddedTemplateDir = templateDir = "haskell-servant";
 
-    /**
+    /*
      * Api Package.  Optional, if needed, this can be used in templates
      */
-    apiPackage = "Api";
+        apiPackage = "API";
 
-    /**
+    /*
      * Model Package.  Optional, if needed, this can be used in templates
      */
-    modelPackage = "Model";
+        modelPackage = "Types";
 
-    /**
-     * Reserved words.  Override this with reserved words specific to your language
-     */
-    // from https://wiki.haskell.org/Keywords
-    setReservedWordsLowerCase(
-        Arrays.asList(
-            "as", "case", "of",
-            "class", "data", // "data family", "data instance",
-            "default", "deriving", // "deriving instance",
-            "do",
-            "forall", "foreign", "hiding",
-            "id",
-            "if", "then", "else",
-            "import", "infix", "infixl", "infixr",
-            "instance", "let", "in",
-            "mdo", "module", "newtype",
-            "proc", "qualified", "rec",
-            "type", // "type family", "type instance",
-            "where"
-        )
-    );
+        // Haskell keywords and reserved function names, taken mostly from https://wiki.haskell.org/Keywords
+        setReservedWordsLowerCase(
+                Arrays.asList(
+                        // Keywords
+                        "as", "case", "of",
+                        "class", "data", "family",
+                        "default", "deriving",
+                        "do", "forall", "foreign", "hiding",
+                        "if", "then", "else",
+                        "import", "infix", "infixl", "infixr",
+                        "instance", "let", "in",
+                        "mdo", "module", "newtype",
+                        "proc", "qualified", "rec",
+                        "type", "where"
+                )
+        );
 
-    /**
+    /*
      * Additional Properties.  These values can be passed to the templates and
      * are available in models, apis, and supporting files
      */
-    additionalProperties.put("apiVersion", apiVersion);
+        additionalProperties.put("apiVersion", apiVersion);
 
-    /**
+    /*
      * Supporting Files.  You can write single files for the generator with the
      * entire object tree available.  If the input file has a suffix of `.mustache
      * it will be processed by the template engine.  Otherwise, it will be copied
      */
-    supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
-    supportingFiles.add(new SupportingFile("stack.mustache", "", "stack.yaml"));
-    supportingFiles.add(new SupportingFile("haskell-servant-codegen.mustache", "", "haskell-servant-codegen.cabal"));
-    supportingFiles.add(new SupportingFile("Setup.mustache", "", "Setup.hs"));
-    supportingFiles.add(new SupportingFile("LICENSE", "", "LICENSE"));
-    supportingFiles.add(new SupportingFile("Apis.mustache", "lib", "Apis.hs"));
-    supportingFiles.add(new SupportingFile("Utils.mustache", "lib", "Utils.hs"));
-    supportingFiles.add(new SupportingFile("Client.mustache", "client", "Main.hs"));
-    supportingFiles.add(new SupportingFile("Server.mustache", "server", "Main.hs"));
+        supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
+        supportingFiles.add(new SupportingFile("stack.mustache", "", "stack.yaml"));
+        supportingFiles.add(new SupportingFile("Setup.mustache", "", "Setup.hs"));
 
-    /**
+    /*
      * Language Specific Primitives.  These types will not trigger imports by
      * the client generator
      */
-    languageSpecificPrimitives = new HashSet<String>(
-      Arrays.asList(
-        "Bool",
-        "String",
-        "Int",
-        "Integer",
-        "Float",
-        "Char",
-        "Double",
-        "List",
-        "FilePath"
-        )
-    );
+        languageSpecificPrimitives = new HashSet<String>(
+                Arrays.asList(
+                        "Bool",
+                        "String",
+                        "Int",
+                        "Integer",
+                        "Float",
+                        "Char",
+                        "Double",
+                        "List",
+                        "FilePath"
+                )
+        );
 
-    typeMapping.clear();
-    // typeMapping.put("enum", "NSString");
-    typeMapping.put("array", "List");
-    typeMapping.put("set", "Set");
-    typeMapping.put("boolean", "Bool");
-    typeMapping.put("string", "String");
-    typeMapping.put("int", "Int");
-    typeMapping.put("long", "Integer");
-    typeMapping.put("float", "Float");
-    // typeMapping.put("byte", "Byte");
-    typeMapping.put("short", "Int");
-    typeMapping.put("char", "Char");
-    typeMapping.put("double", "Double");
-    typeMapping.put("DateTime", "Integer");
-    // typeMapping.put("object", "Map");
-    typeMapping.put("file", "FilePath");
+        typeMapping.clear();
+        typeMapping.put("array", "List");
+        typeMapping.put("set", "Set");
+        typeMapping.put("boolean", "Bool");
+        typeMapping.put("string", "Text");
+        typeMapping.put("int", "Int");
+        typeMapping.put("long", "Integer");
+        typeMapping.put("short", "Int");
+        typeMapping.put("char", "Char");
+        typeMapping.put("float", "Float");
+        typeMapping.put("double", "Double");
+        typeMapping.put("DateTime", "Integer");
+        typeMapping.put("file", "FilePath");
+        typeMapping.put("number", "Double");
+        typeMapping.put("integer", "Int");
+        typeMapping.put("any", "Value");
 
-    importMapping.clear();
-    importMapping.put("Map", "qualified Data.Map as Map");
+        importMapping.clear();
+        importMapping.put("Map", "qualified Data.Map as Map");
 
-    cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC));
-    cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC));
-  }
-
-  /**
-   * Escapes a reserved word as defined in the `reservedWords` array. Handle escaping
-   * those terms here.  This logic is only called if a variable matches the reseved words
-   *
-   * @return the escaped term
-   */
-  @Override
-  public String escapeReservedWord(String name) {
-    return name + "_";
-  }
-
-  /**
-   * Location to write model files.  You can use the modelPackage() as defined when the class is
-   * instantiated
-   */
-  public String modelFileFolder() {
-    return outputFolder + File.separatorChar + "lib" + File.separatorChar + modelPackage().replace('.', File.separatorChar);
-  }
-
-  /**
-   * Location to write api files.  You can use the apiPackage() as defined when the class is
-   * instantiated
-   */
-  @Override
-  public String apiFileFolder() {
-    return outputFolder + File.separatorChar + "lib" + File.separatorChar + apiPackage().replace('.', File.separatorChar);
-  }
-
-  /**
-   * Optional - type declaration.  This is a String which is used by the templates to instantiate your
-   * types.  There is typically special handling for different property types
-   *
-   * @return a string value used as the `dataType` field for model templates, `returnType` for api templates
-   */
-  @Override
-  public String getTypeDeclaration(Property p) {
-    if(p instanceof ArrayProperty) {
-      ArrayProperty ap = (ArrayProperty) p;
-      Property inner = ap.getItems();
-      return "[" + getTypeDeclaration(inner) + "]";
+        cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC));
+        cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC));
     }
-    else if (p instanceof MapProperty) {
-      MapProperty mp = (MapProperty) p;
-      Property inner = mp.getAdditionalProperties();
-      return "Map.Map String " + getTypeDeclaration(inner);
-    }
-    return super.getTypeDeclaration(p);
-  }
 
-  /**
-   * Optional - swagger type conversion.  This is used to map swagger types in a `Property` into
-   * either language specific types via `typeMapping` or into complex models if there is not a mapping.
-   *
-   * @return a string value of the type or complex model for this property
-   * @see io.swagger.models.properties.Property
-   */
-  @Override
-  public String getSwaggerType(Property p) {
-    String swaggerType = super.getSwaggerType(p);
-    String type = null;
-    if(typeMapping.containsKey(swaggerType)) {
-      type = typeMapping.get(swaggerType);
-      if(languageSpecificPrimitives.contains(type))
+    /**
+     * Escapes a reserved word as defined in the `reservedWords` array. Handle escaping
+     * those terms here.  This logic is only called if a variable matches the reseved words
+     *
+     * @return the escaped term
+     */
+    @Override
+    public String escapeReservedWord(String name) {
+        return name + "_";
+    }
+
+    @Override
+    public void preprocessSwagger(Swagger swagger) {
+        // From the title, compute a reasonable name for the package and the API
+        String title = swagger.getInfo().getTitle();
+
+        // Drop any API suffix
+        if(title == null) {
+            title = "Swagger";
+        } else {
+            title = title.trim();
+            if (title.toUpperCase().endsWith("API")) {
+                title = title.substring(0, title.length() - 3);
+            }
+        }
+
+        String[] words = title.split(" ");
+
+        // The package name is made by appending the lowercased words of the title interspersed with dashes
+        List<String> wordsLower = new ArrayList<String>();
+        for (String word : words) {
+            wordsLower.add(word.toLowerCase());
+        }
+        String cabalName = joinStrings("-", wordsLower);
+
+        // The API name is made by appending the capitalized words of the title
+        List<String> wordsCaps = new ArrayList<String>();
+        for (String word : words) {
+            wordsCaps.add(word.substring(0, 1).toUpperCase() + word.substring(1));
+        }
+        String apiName = joinStrings("", wordsCaps);
+
+        // Set the filenames to write for the API
+        supportingFiles.add(new SupportingFile("haskell-servant-codegen.mustache", "", cabalName + ".cabal"));
+        supportingFiles.add(new SupportingFile("API.mustache", "lib/" + apiName, "API.hs"));
+        supportingFiles.add(new SupportingFile("Types.mustache", "lib/" + apiName, "Types.hs"));
+
+
+        additionalProperties.put("title", apiName);
+        additionalProperties.put("titleLower", apiName.substring(0, 1).toLowerCase() + apiName.substring(1));
+        additionalProperties.put("package", cabalName);
+
+        // Due to the way servant resolves types, we need a high context stack limit
+        additionalProperties.put("contextStackLimit", swagger.getPaths().size() * 2 + 300);
+
+        List<Map<String, Object>> replacements = new ArrayList<>();
+        Object[] replacementChars = specialCharReplacements.keySet().toArray();
+        for(int i = 0; i < replacementChars.length; i++) {
+            Character c = (Character) replacementChars[i];
+            Map<String, Object> o = new HashMap<>();
+            o.put("char", Character.toString(c));
+            o.put("replacement", "'" + specialCharReplacements.get(c));
+            o.put("hasMore", i != replacementChars.length - 1);
+            replacements.add(o);
+        }
+        additionalProperties.put("specialCharReplacements", replacements);
+
+        super.preprocessSwagger(swagger);
+    }
+
+
+    /**
+     * Optional - type declaration.  This is a String which is used by the templates to instantiate your
+     * types.  There is typically special handling for different property types
+     *
+     * @return a string value used as the `dataType` field for model templates, `returnType` for api templates
+     */
+    @Override
+    public String getTypeDeclaration(Property p) {
+        if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            Property inner = ap.getItems();
+            return "[" + getTypeDeclaration(inner) + "]";
+        } else if (p instanceof MapProperty) {
+            MapProperty mp = (MapProperty) p;
+            Property inner = mp.getAdditionalProperties();
+            return "Map.Map String " + getTypeDeclaration(inner);
+        }
+        return fixModelChars(super.getTypeDeclaration(p));
+    }
+
+    /**
+     * Optional - swagger type conversion.  This is used to map swagger types in a `Property` into
+     * either language specific types via `typeMapping` or into complex models if there is not a mapping.
+     *
+     * @return a string value of the type or complex model for this property
+     * @see io.swagger.models.properties.Property
+     */
+    @Override
+    public String getSwaggerType(Property p) {
+        String swaggerType = super.getSwaggerType(p);
+        String type = null;
+        if (typeMapping.containsKey(swaggerType)) {
+            type = typeMapping.get(swaggerType);
+            if (languageSpecificPrimitives.contains(type))
+                return toModelName(type);
+        } else if(swaggerType == "object") {
+            type = "Value";
+        } else if(typeMapping.containsValue(swaggerType)) {
+            type = swaggerType + "_";
+        } else {
+            type = swaggerType;
+        }
         return toModelName(type);
     }
-    else
-      type = swaggerType;
-    return toModelName(type);
-  }
 
-  private String capturePath(String path, List<CodegenParameter> pathParams) {
-    for (CodegenParameter p : pathParams) {
-      String pName = "{"+p.baseName+"}";
-      if (path.indexOf(pName) >= 0) {
-        path = path.replace(pName, "Capture " + "\""+p.baseName+"\" " + p.dataType);
-      }
+    @Override
+    public String toInstantiationType(Property p) {
+        if (p instanceof MapProperty) {
+            MapProperty ap = (MapProperty) p;
+            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 "(Map.Map Text " + inner + ")";
+        } else if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            String inner = getSwaggerType(ap.getItems());
+            // Return only the inner type; the wrapping with QueryList is done
+            // somewhere else, where we have access to the collection format.
+            return inner;
+        } else {
+            return null;
+        }
     }
-    return path;
-  }
 
-  private String queryPath(String path, List<CodegenParameter> queryParams) {
-    for (CodegenParameter p : queryParams) {
-      path += " :> QueryParam \"" + p.baseName + "\" " + p.dataType;
+
+    // Intersperse a separator string between a list of strings, like String.join.
+    private String joinStrings(String sep, List<String> ss) {
+        StringBuilder sb = new StringBuilder();
+        for (String s : ss) {
+            if (sb.length() > 0) {
+                sb.append(sep);
+            }
+            sb.append(s);
+        }
+        return sb.toString();
     }
-    return path;
-  }
 
-  private String bodyPath(String path, List<CodegenParameter> bodyParams) {
-    for (CodegenParameter p : bodyParams) {
-      path += " :> ReqBody '[JSON] " + p.dataType;
+    // Convert an HTTP path to a Servant route, including captured parameters.
+    // For example, the path /api/jobs/info/{id}/last would become:
+    //      "api" :> "jobs" :> "info" :> Capture "id" IdType :> "last"
+    // IdType is provided by the capture params.
+    private List<String> pathToServantRoute(String path, List<CodegenParameter> pathParams) {
+        // Map the capture params by their names.
+        HashMap<String, String> captureTypes = new HashMap<String, String>();
+        for (CodegenParameter param : pathParams) {
+            captureTypes.put(param.baseName, param.dataType);
+        }
+
+        // Cut off the leading slash, if it is present.
+        if (path.startsWith("/")) {
+            path = path.substring(1);
+        }
+
+        // Convert the path into a list of servant route components.
+        List<String> pathComponents = new ArrayList<String>();
+        for (String piece : path.split("/")) {
+            if (piece.startsWith("{") && piece.endsWith("}")) {
+                String name = piece.substring(1, piece.length() - 1);
+                pathComponents.add("Capture \"" + name + "\" " + captureTypes.get(name));
+            } else {
+                pathComponents.add("\"" + piece + "\"");
+            }
+        }
+
+        // Intersperse the servant route pieces with :> to construct the final API type
+        return pathComponents;
     }
-    return path;
-  }
 
-  private String formPath(String path, List<CodegenParameter> formParams) {
-    String names = "Form";
-    for (CodegenParameter p : formParams) {
-      if(p.dataType.equals("FilePath")){
-        // file data processing
-      }
-      names += p.baseName;
+    // Extract the arguments that are passed in the route path parameters
+    private List<String> pathToClientType(String path, List<CodegenParameter> pathParams) {
+        // Map the capture params by their names.
+        HashMap<String, String> captureTypes = new HashMap<String, String>();
+        for (CodegenParameter param : pathParams) {
+            captureTypes.put(param.baseName, param.dataType);
+        }
+
+        // Cut off the leading slash, if it is present.
+        if (path.startsWith("/")) {
+            path = path.substring(1);
+        }
+
+        // Convert the path into a list of servant route components.
+        List<String> type = new ArrayList<String>();
+        for (String piece : path.split("/")) {
+            if (piece.startsWith("{") && piece.endsWith("}")) {
+                String name = piece.substring(1, piece.length() - 1);
+                type.add(captureTypes.get(name));
+            }
+        }
+
+        return type;
     }
-    if(formParams.size() > 0){
-      path += " :> ReqBody '[FormUrlEncoded] " + names;
+
+
+    @Override
+    public CodegenOperation fromOperation(String resourcePath, String httpMethod, Operation operation, Map<String, Model> definitions, Swagger swagger) {
+        CodegenOperation op = super.fromOperation(resourcePath, httpMethod, operation, definitions, swagger);
+
+        List<String> path = pathToServantRoute(op.path, op.pathParams);
+        List<String> type = pathToClientType(op.path, op.pathParams);
+
+        // Query parameters appended to routes
+        for (CodegenParameter param : op.queryParams) {
+            String paramType = param.dataType;
+            if(param.isListContainer != null && param.isListContainer) {
+                paramType = makeQueryListType(paramType, param.collectionFormat);
+            }
+            path.add("QueryParam \"" + param.baseName + "\" " + paramType);
+            type.add("Maybe " + param.dataType);
+        }
+
+        // Either body or form data parameters appended to route
+        // As far as I know, you cannot have two ReqBody routes.
+        // Is it possible to have body params AND have form params?
+        String bodyType = null;
+        if (op.getHasBodyParam()) {
+            for (CodegenParameter param : op.bodyParams) {
+                path.add("ReqBody '[JSON] " + param.dataType);
+                bodyType = param.dataType;
+            }
+        } else if(op.getHasFormParams()) {
+            // Use the FormX data type, where X is the conglomerate of all things being passed
+            String formName = "Form" + camelize(op.operationId);
+            bodyType = formName;
+            path.add("ReqBody '[FormUrlEncoded] " + formName);
+        }
+        if(bodyType != null) {
+            type.add(bodyType);
+        }
+
+        // Special headers appended to route
+        for (CodegenParameter param : op.headerParams) {
+            path.add("Header \"" + param.baseName + "\" " + param.dataType);
+
+            String paramType = param.dataType;
+            if(param.isListContainer != null && param.isListContainer) {
+                paramType = makeQueryListType(paramType, param.collectionFormat);
+            }
+            type.add("Maybe " + paramType);
+        }
+
+        // Add the HTTP method and return type
+        String returnType = op.returnType;
+        if (returnType == null || returnType.equals("null")) {
+            returnType = "()";
+        }
+        if (returnType.indexOf(" ") >= 0) {
+            returnType = "(" + returnType + ")";
+        }
+        path.add("Verb '" + op.httpMethod.toUpperCase() + " 200 '[JSON] " + returnType);
+        type.add("m " + returnType);
+
+        op.vendorExtensions.put("x-routeType", joinStrings(" :> ", path));
+        op.vendorExtensions.put("x-clientType", joinStrings(" -> ", type));
+        op.vendorExtensions.put("x-formName", "Form" + camelize(op.operationId));
+        for(CodegenParameter param : op.formParams) {
+            param.vendorExtensions.put("x-formPrefix", camelize(op.operationId, true));
+        }
+        return op;
     }
-    return path;
-  }
 
-  private String headerPath(String path, List<CodegenParameter> headerParams) {
-    for (CodegenParameter p : headerParams) {
-      path += " :> Header \"" + p.baseName + "\" " + p.dataType;
+    private String makeQueryListType(String type, String collectionFormat) {
+        type = type.substring(1, type.length() - 1);
+        switch(collectionFormat) {
+            case "csv": return "(QueryList 'CommaSeparated (" + type + "))";
+            case "tsv": return "(QueryList 'TabSeparated (" + type + "))";
+            case "ssv": return "(QueryList 'SpaceSeparated (" + type + "))";
+            case "pipes": return "(QueryList 'PipeSeparated (" + type + "))";
+            case "multi": return "(QueryList 'MultiParamArray (" + type + "))";
+            default:
+                throw new NotImplementedException();
+        }
     }
-    return path;
-  }
 
-
-  private String filterReturnType(String rt) {
-    if (rt == null || rt.equals("null")) {
-      return "()";
-    } else if (rt.indexOf(" ") >= 0) {
-      return "(" + rt + ")";
+    private String fixOperatorChars(String string) {
+        StringBuilder sb = new StringBuilder();
+        for (char c : string.toCharArray()) {
+            if (specialCharReplacements.containsKey(c)) {
+                sb.append("'");
+                sb.append(specialCharReplacements.get(c));
+            } else {
+                sb.append(c);
+            }
+        }
+        return sb.toString();
     }
-    return rt;
-  }
 
-  private String addReturnPath(String path, String httpMethod, String returnType) {
-    return path + " :> " + upperCaseFirst(httpMethod) + " '[JSON] " + filterReturnType(returnType);
-  }
-
-  private String joinStrings(String sep, List<String> ss) {
-    StringBuilder sb = new StringBuilder();
-    for (String s : ss) {
-      if (sb.length() > 0) {
-        sb.append(sep);
-      }
-      sb.append(s);
+    // Remove characters from a string that do not belong in a model classname
+    private String fixModelChars(String string) {
+        return string.replace(".", "").replace("-", "");
     }
-    return sb.toString();
-  }
 
-  private String replacePathSplitter(String path) {
-    String[] ps = path.replaceFirst("/", "").split("/", 0);
-    List<String> rs = new ArrayList<String>();
-    for (String p : ps) {
-      if (p.indexOf("{") < 0) {
-        rs.add("\"" + p + "\"");
-      } else {
-        rs.add(p);
-      }
+    // Override fromModel to create the appropriate model namings
+    @Override
+    public CodegenModel fromModel(String name, Model mod, Map<String, Model> allDefinitions) {
+        CodegenModel model = super.fromModel(name, mod, allDefinitions);
+
+        // Clean up the class name to remove invalid characters
+        model.classname = fixModelChars(model.classname);
+        if(typeMapping.containsValue(model.classname)) {
+            model.classname += "_";
+        }
+
+        // From the model name, compute the prefix for the fields.
+        String prefix = camelize(model.classname, true);
+        for(CodegenProperty prop : model.vars) {
+            prop.name = prefix + camelize(fixOperatorChars(prop.name));
+        }
+
+        // Create newtypes for things with non-object types
+        String dataOrNewtype = "data";
+        String modelType = ((ModelImpl)  mod).getType();
+        if(modelType != "object" && typeMapping.containsKey(modelType)) {
+            String newtype = typeMapping.get(modelType);
+            model.vendorExtensions.put("x-customNewtype", newtype);
+        }
+
+        // Provide the prefix as a vendor extension, so that it can be used in the ToJSON and FromJSON instances.
+        model.vendorExtensions.put("x-prefix", prefix);
+        model.vendorExtensions.put("x-data", dataOrNewtype);
+
+        return model;
     }
-    return joinStrings(" :> ", rs);
-  }
-
-  private String upperCaseFirst(String str) {
-    char[] array = str.toLowerCase().toCharArray();
-    array[0] = Character.toUpperCase(array[0]);
-    return new String(array);
-  }
-
-  private String parseScheme(String basePath) {
-    return "Http";
-  }
-
-  @Override
-  public CodegenOperation fromOperation(String resourcePath, String httpMethod, Operation operation, Map<String, Model> definitions, Swagger swagger){
-    CodegenOperation op = super.fromOperation(resourcePath, httpMethod, operation, definitions, swagger);
-    String path = op.path;
-    op.nickname = addReturnPath(headerPath(formPath(bodyPath(queryPath(capturePath(replacePathSplitter(path), op.pathParams), op.queryParams), op.bodyParams), op.formParams), op.headerParams), op.httpMethod, op.returnType);
-    return op;
-  }
 
+    @Override
+    public CodegenParameter fromParameter(Parameter param, Set<String> imports) {
+        CodegenParameter p = super.fromParameter(param, imports);
+        p.vendorExtensions.put("x-formParamName", camelize(p.baseName));
+        p.dataType = fixModelChars(p.dataType);
+        return p;
+    }
 }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java
index d9c93e4f69e..d2d3808f8eb 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java
@@ -122,7 +122,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
         typeMapping.put("float", "Number");
         typeMapping.put("number", "Number");
         typeMapping.put("DateTime", "Date"); // Should this be dateTime?
-        typeMapping.put("Date", "Date"); // Should this be date?
+        typeMapping.put("date", "Date"); // Should this be date?
         typeMapping.put("long", "Integer");
         typeMapping.put("short", "Integer");
         typeMapping.put("char", "String");
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClosureAngularClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClosureAngularClientCodegen.java
index 5b26a84cfc2..2a2dfd86c9d 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClosureAngularClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClosureAngularClientCodegen.java
@@ -79,7 +79,7 @@ public class JavascriptClosureAngularClientCodegen extends DefaultCodegen implem
 
     @Override
     public String getHelp() {
-        return "Generates a Javascript AngularJS client library annotated with Google Closure Compiler annotations" +
+        return "Generates a Javascript AngularJS client library (beta) annotated with Google Closure Compiler annotations" +
             "(https://developers.google.com/closure/compiler/docs/js-for-compiler?hl=en)";
     }
 
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 f264a86b6a5..e4744bf037c 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
@@ -95,6 +95,7 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig {
         //TODO binary should be mapped to byte array
         // mapped to String as a workaround
         typeMapping.put("binary", "string");
+        typeMapping.put("ByteArray", "string");
 
         cliOptions.clear();
         cliOptions.add(new CliOption(MODULE_NAME, "Perl module name (convention: CamelCase or Long::Module).").defaultValue("SwaggerClient"));
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 33d5875de6e..0aed793fc09 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
@@ -110,6 +110,7 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
         typeMapping.put("list", "array");
         typeMapping.put("object", "object");
         typeMapping.put("binary", "string");
+        typeMapping.put("ByteArray", "string");
 
         cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC));
         cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC));
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 6091b36b90a..d560a946214 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
@@ -61,6 +61,7 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig
         //TODO binary should be mapped to byte array
         // mapped to String as a workaround
         typeMapping.put("binary", "str");
+        typeMapping.put("ByteArray", "str");
 
         // from https://docs.python.org/release/2.5.4/ref/keywords.html
         setReservedWordsLowerCase(
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 2eedc14ed27..828cd0eb719 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
@@ -116,6 +116,7 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig {
         typeMapping.put("object", "Object");
         typeMapping.put("file", "File");
         typeMapping.put("binary", "String");
+        typeMapping.put("ByteArray", "String");
 
         // remove modelPackage and apiPackage added by default
         Iterator<CliOption> itr = cliOptions.iterator();
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 993ef095441..a13c7a54e70 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
@@ -101,6 +101,7 @@ public class ScalaClientCodegen extends DefaultCodegen implements CodegenConfig
         //TODO binary should be mapped to byte array
         // mapped to String as a workaround
         typeMapping.put("binary", "String");
+        typeMapping.put("ByteArray", "String");
 
         languageSpecificPrimitives = new HashSet<String>(
                 Arrays.asList(
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 848b6f4caea..1dd66c6400d 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
@@ -32,18 +32,6 @@ public class SpringMVCServerCodegen extends JavaClientCodegen {
         additionalProperties.put(CodegenConstants.API_PACKAGE, apiPackage);
         additionalProperties.put(CONFIG_PACKAGE, configPackage);
 
-        languageSpecificPrimitives = new HashSet<String>(
-                Arrays.asList(
-                        "byte[]",
-                        "String",
-                        "boolean",
-                        "Boolean",
-                        "Double",
-                        "Integer",
-                        "Long",
-                        "Float")
-        );
-
         cliOptions.add(new CliOption(CONFIG_PACKAGE, "configuration package for generated code"));
 
         supportedLibraries.clear();
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java
index 0e7933fd187..921162909d5 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java
@@ -97,6 +97,7 @@ public class SwiftCodegen extends DefaultCodegen implements CodegenConfig {
                 );
         reservedWords = new HashSet<String>(
                 Arrays.asList(
+                    "Int", "Int32", "Int64", "Int64", "Float", "Double", "Bool", "Void", "String", "Character", "AnyObject",
                     "class", "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",
@@ -129,6 +130,7 @@ public class SwiftCodegen extends DefaultCodegen implements CodegenConfig {
         //TODO binary should be mapped to byte array
         // mapped to String as a workaround
         typeMapping.put("binary", "String");
+        typeMapping.put("ByteArray", "String");
 
         importMapping = new HashMap<String, String>();
 
diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/api.mustache b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/api.mustache
index c3fb85acb4f..f1756813ef4 100644
--- a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/api.mustache
@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using System.Collections.Generic;
 using RestSharp;
 using {{packageName}}.Client;
diff --git a/modules/swagger-codegen/src/main/resources/Groovy/api.mustache b/modules/swagger-codegen/src/main/resources/Groovy/api.mustache
index 6ff66a84720..0d60fa2a96f 100644
--- a/modules/swagger-codegen/src/main/resources/Groovy/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/Groovy/api.mustache
@@ -32,12 +32,12 @@ class {{classname}} {
     def queryParams = [:]
     def headerParams = [:]
 
-    {{#requiredParamCount}}
+    {{#allParams}}
     // verify required params are set
-    if({{/requiredParamCount}}{{#requiredParams}} {{paramName}} == null {{#hasMore}}|| {{/hasMore}}{{/requiredParams}}{{#requiredParamCount}}) {
+    if({{/allParams}}{{#required}} {{paramName}} == null {{#hasMore}}|| {{/hasMore}}{{/required}}{{#allParams}}) {
        throw new RuntimeException("missing required params")
     }
-    {{/requiredParamCount}}
+    {{/allParams}}
 
     {{#queryParams}}if(!"null".equals(String.valueOf({{paramName}})))
       queryParams.put("{{paramName}}", String.valueOf({{paramName}}))
@@ -53,4 +53,4 @@ class {{classname}} {
   }
   {{/operation}}
 }
-{{/operations}}
\ No newline at end of file
+{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache
index 605472d67b3..7dfb69db418 100644
--- a/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache
@@ -9,8 +9,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'com.github.dcendents.android-maven'
     
     android {
-        compileSdkVersion 22
-        buildToolsVersion '22.0.0'
+        compileSdkVersion 23
+        buildToolsVersion '23.0.2'
         defaultConfig {
             minSdkVersion 14
-            targetSdkVersion 22
+            targetSdkVersion 23
         }
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7
@@ -98,7 +98,7 @@ ext {
     jackson_version = "2.4.2"
     jersey_version = "1.18"
     jodatime_version = "2.3"
-    junit_version = "4.8.1"
+    junit_version = "4.12"
 }
 
 dependencies {
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.mustache
index 0a678861061..f644a9deda6 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.mustache
@@ -9,8 +9,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'com.github.dcendents.android-maven'
     
     android {
-        compileSdkVersion 22
-        buildToolsVersion '22.0.0'
+        compileSdkVersion 23
+        buildToolsVersion '23.0.2'
         defaultConfig {
             minSdkVersion 14
-            targetSdkVersion 22
+            targetSdkVersion 23
         }
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
index 4ba5115aaf4..c533c34558d 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
@@ -9,8 +9,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'com.github.dcendents.android-maven'
 
     android {
-        compileSdkVersion 22
-        buildToolsVersion '22.0.0'
+        compileSdkVersion 23
+        buildToolsVersion '23.0.2'
         defaultConfig {
             minSdkVersion 14
-            targetSdkVersion 22
+            targetSdkVersion 23
         }
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
index ad415b54579..d033d9a1c68 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
@@ -9,8 +9,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'com.github.dcendents.android-maven'
 
     android {
-        compileSdkVersion 22
-        buildToolsVersion '22.0.0'
+        compileSdkVersion 23
+        buildToolsVersion '23.0.2'
         defaultConfig {
             minSdkVersion 14
-            targetSdkVersion 22
+            targetSdkVersion 23
         }
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7
@@ -98,5 +98,5 @@ dependencies {
     compile 'com.squareup.okhttp:okhttp:2.7.2'
     compile 'com.squareup.okhttp:logging-interceptor:2.7.2'
     compile 'com.google.code.gson:gson:2.3.1'
-    testCompile 'junit:junit:4.8.1'
+    testCompile 'junit:junit:4.12'
 }
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
index d457749d19a..bbcbeca4367 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
@@ -163,6 +163,6 @@
     <okhttp-version>2.7.2</okhttp-version>
     <gson-version>2.3.1</gson-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
-    <junit-version>4.8.1</junit-version>
+    <junit-version>4.12</junit-version>
   </properties>
 </project>
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/build.gradle.mustache
index ca26e739496..19b741034e7 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/build.gradle.mustache
@@ -9,8 +9,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'com.github.dcendents.android-maven'
     
     android {
-        compileSdkVersion 22
-        buildToolsVersion '22.0.0'
+        compileSdkVersion 23
+        buildToolsVersion '23.0.2'
         defaultConfig {
             minSdkVersion 14
-            targetSdkVersion 22
+            targetSdkVersion 23
         }
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
index 9f34c16afc5..1bced5a0452 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
@@ -9,8 +9,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
 	apply plugin: 'com.github.dcendents.android-maven'
 
 	android {
-	    compileSdkVersion 22
-	    buildToolsVersion '22.0.0'
+	    compileSdkVersion 23
+	    buildToolsVersion '23.0.2'
 	    defaultConfig {
 	        minSdkVersion 14
-	        targetSdkVersion 22
+	        targetSdkVersion 23
 	    }
 	    compileOptions {
 	        sourceCompatibility JavaVersion.VERSION_1_7
diff --git a/modules/swagger-codegen/src/main/resources/Java/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/pom.mustache
index f0dd8c213b0..425b525cc55 100644
--- a/modules/swagger-codegen/src/main/resources/Java/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/pom.mustache
@@ -176,6 +176,6 @@
     <jackson-version>2.4.2</jackson-version>
     <jodatime-version>2.3</jodatime-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
-    <junit-version>4.8.1</junit-version>
+    <junit-version>4.12</junit-version>
   </properties>
 </project>
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/api.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/api.mustache
index 7560d5c0830..ee02339909e 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/api.mustache
@@ -29,8 +29,8 @@ import java.util.List;
 import static org.springframework.http.MediaType.*;
 
 @Controller
-@RequestMapping(value = "/{{baseName}}", produces = {APPLICATION_JSON_VALUE})
-@Api(value = "/{{baseName}}", description = "the {{baseName}} API")
+@RequestMapping(value = "/{{{baseName}}}", produces = {APPLICATION_JSON_VALUE})
+@Api(value = "/{{{baseName}}}", description = "the {{{baseName}}} API")
 {{>generatedAnnotation}}
 {{#operations}}
 public class {{classname}} {
@@ -44,8 +44,8 @@ public class {{classname}} {
     {{/hasMore}}{{/authMethods}}
   }{{/hasAuthMethods}})
   @io.swagger.annotations.ApiResponses(value = { {{#responses}}
-    @io.swagger.annotations.ApiResponse(code = {{{code}}}, message = "{{{message}}}"){{#hasMore}},{{/hasMore}}{{/responses}} })
-  @RequestMapping(value = "{{path}}", 
+    @io.swagger.annotations.ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{returnType}}}.class){{#hasMore}},{{/hasMore}}{{/responses}} })
+  @RequestMapping(value = "{{{path}}}",
     {{#hasProduces}}produces = { {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }, {{/hasProduces}}
     {{#hasConsumes}}consumes = { {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} },{{/hasConsumes}}
     method = RequestMethod.{{httpMethod}})
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/headerParams.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/headerParams.mustache
index 229717ddaa9..297d5131d92 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/headerParams.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/headerParams.mustache
@@ -1 +1 @@
-{{#isHeaderParam}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @RequestHeader(value="{{paramName}}", required={{#required}}true{{/required}}{{^required}}false{{/required}}) {{{dataType}}} {{paramName}}{{/isHeaderParam}}
+{{#isHeaderParam}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @RequestHeader(value="{{baseName}}", required={{#required}}true{{/required}}{{^required}}false{{/required}}) {{{dataType}}} {{paramName}}{{/isHeaderParam}}
diff --git a/modules/swagger-codegen/src/main/resources/Javascript/README.mustache b/modules/swagger-codegen/src/main/resources/Javascript/README.mustache
index 633f2f0aebb..37282d5a24c 100644
--- a/modules/swagger-codegen/src/main/resources/Javascript/README.mustache
+++ b/modules/swagger-codegen/src/main/resources/Javascript/README.mustache
@@ -129,7 +129,7 @@ Class | Method | HTTP request | Description
 {{/isBasic}}
 {{#isOAuth}}- **Type**: OAuth
 - **Flow**: {{flow}}
-- **Authorizatoin URL**: {{authorizationUrl}}
+- **Authorization URL**: {{authorizationUrl}}
 - **Scopes**: {{^scopes}}N/A{{/scopes}}
 {{#scopes}}  - {{scope}}: {{description}}
 {{/scopes}}
diff --git a/modules/swagger-codegen/src/main/resources/Javascript/api_doc.mustache b/modules/swagger-codegen/src/main/resources/Javascript/api_doc.mustache
index 698b42dfe11..714350a2170 100644
--- a/modules/swagger-codegen/src/main/resources/Javascript/api_doc.mustache
+++ b/modules/swagger-codegen/src/main/resources/Javascript/api_doc.mustache
@@ -80,7 +80,7 @@ Name | Type | Description  | Notes
 
 {{^authMethods}}No authorization required{{/authMethods}}{{#authMethods}}[{{name}}](../README.md#{{name}}){{^-last}}, {{/-last}}{{/authMethods}}
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: {{#consumes}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/consumes}}{{^consumes}}Not defined{{/consumes}}
  - **Accept**: {{#produces}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/produces}}{{^produces}}Not defined{{/produces}}
diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache
index 9e78174b956..bf6b76d6b41 100644
--- a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache
@@ -96,13 +96,19 @@ class VoidAuth implements Authentication {
 * {{&description}}
 */
 {{/description}}
+export enum {{classname}}ApiKeys {
+{{#authMethods}}
+{{#isApiKey}}
+    {{name}},
+{{/isApiKey}}
+{{/authMethods}}
+}
+
 export class {{classname}} {
     protected basePath = '{{basePath}}';
     protected defaultHeaders : any = {};
 
-
-
-    public authentications = {
+    protected authentications = {
         'default': <Authentication>new VoidAuth(),
 {{#authMethods}}
 {{#isBasic}}
@@ -140,6 +146,10 @@ export class {{classname}} {
             }
         }
     }
+
+    public setApiKey(key: {{classname}}ApiKeys, value: string) {
+        this.authentications[{{classname}}ApiKeys[key]].apiKey = value;
+    }
 {{#authMethods}}
 {{#isBasic}}
 
@@ -151,12 +161,6 @@ export class {{classname}} {
         this.authentications.{{name}}.password = password;
     }
 {{/isBasic}}
-{{#isApiKey}}
-
-    set apiKey(key: string) {
-        this.authentications.{{name}}.apiKey = key;
-    }
-{{/isApiKey}}
 {{#isOAuth}}
 
     set accessToken(token: string) {
@@ -186,9 +190,9 @@ export class {{classname}} {
         let formParams: any = {};
 
 {{#allParams}}{{#required}}
-        // verify required parameter '{{paramName}}' is set
-        if (!{{paramName}}) {
-            throw new Error('Missing required parameter {{paramName}} when calling {{nickname}}');
+        // verify required parameter '{{paramName}}' is not null or undefined
+        if ({{paramName}} === null || {{paramName}} === undefined) {
+            throw new Error('Required parameter {{paramName}} was null or undefined when calling {{nickname}}.');
         }
 {{/required}}{{/allParams}}
 {{#queryParams}}
diff --git a/modules/swagger-codegen/src/main/resources/akka-scala/api.mustache b/modules/swagger-codegen/src/main/resources/akka-scala/api.mustache
index fecf2827f04..4d0e8c99675 100644
--- a/modules/swagger-codegen/src/main/resources/akka-scala/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/akka-scala/api.mustache
@@ -1,3 +1,8 @@
+/**
+ * NOTE: This class is auto generated by the akka-scala (beta) swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * For any issue or feedback, please open a ticket via https://github.com/swagger-api/swagger-codegen/issues/new
+ */
 package {{package}}
 
 {{#imports}}
@@ -29,7 +34,7 @@ object {{classname}} {
       {{/dataType}}{{^dataType}}.withDefault{{>responseState}}Response[Unit]
       {{/dataType}}{{/isWildcard}}{{/responses}}{{^responseHeaders.isEmpty}}
   object {{#fnCapitalize}}{{operationId}}{{/fnCapitalize}}Headers { {{#responseHeaders}}
-    def {{name}}(r: ApiReturnWithHeaders) = r.get{{^isContainer}}{{baseType}}{{/isContainer}}{{#isContainer}}String{{/isContainer}}Header("{{baseName}}"){{/responseHeaders}}
+    def {{{name}}}(r: ApiReturnWithHeaders) = r.get{{^isContainer}}{{baseType}}{{/isContainer}}{{#isContainer}}String{{/isContainer}}Header("{{baseName}}"){{/responseHeaders}}
   }
   {{/responseHeaders.isEmpty}}
 {{/operation}}
@@ -40,4 +45,4 @@ object {{classname}} {
 
 }
 
-{{/operations}}
\ No newline at end of file
+{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/akka-scala/apiInvoker.mustache b/modules/swagger-codegen/src/main/resources/akka-scala/apiInvoker.mustache
index 0dde3673439..3b8c6ec5fe3 100644
--- a/modules/swagger-codegen/src/main/resources/akka-scala/apiInvoker.mustache
+++ b/modules/swagger-codegen/src/main/resources/akka-scala/apiInvoker.mustache
@@ -1,3 +1,9 @@
+/**
+ * NOTE: This class is auto generated by the akka-scala (beta) swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * For any issue or feedback, please open a ticket via https://github.com/swagger-api/swagger-codegen/issues/new
+ */
+
 package {{invokerPackage}}
 
 import java.io.File
diff --git a/modules/swagger-codegen/src/main/resources/akka-scala/apiRequest.mustache b/modules/swagger-codegen/src/main/resources/akka-scala/apiRequest.mustache
index 3016768f7ac..f516da6e10d 100644
--- a/modules/swagger-codegen/src/main/resources/akka-scala/apiRequest.mustache
+++ b/modules/swagger-codegen/src/main/resources/akka-scala/apiRequest.mustache
@@ -1,3 +1,8 @@
+/**
+ * NOTE: This class is auto generated by the akka-scala (beta) swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * For any issue or feedback, please open a ticket via https://github.com/swagger-api/swagger-codegen/issues/new
+ */
 package {{invokerPackage}}
 
 sealed trait ResponseState
diff --git a/modules/swagger-codegen/src/main/resources/akka-scala/apiSettings.mustache b/modules/swagger-codegen/src/main/resources/akka-scala/apiSettings.mustache
index d3ffe3613ae..d101121c8c0 100644
--- a/modules/swagger-codegen/src/main/resources/akka-scala/apiSettings.mustache
+++ b/modules/swagger-codegen/src/main/resources/akka-scala/apiSettings.mustache
@@ -1,3 +1,8 @@
+/**
+ * NOTE: This class is auto generated by the akka-scala (beta) swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * For any issue or feedback, please open a ticket via https://github.com/swagger-api/swagger-codegen/issues/new
+ */
 package {{invokerPackage}}
 
 import java.util.concurrent.TimeUnit
diff --git a/modules/swagger-codegen/src/main/resources/akka-scala/enumsSerializers.mustache b/modules/swagger-codegen/src/main/resources/akka-scala/enumsSerializers.mustache
index 52f1fd3e330..4577f59f969 100644
--- a/modules/swagger-codegen/src/main/resources/akka-scala/enumsSerializers.mustache
+++ b/modules/swagger-codegen/src/main/resources/akka-scala/enumsSerializers.mustache
@@ -1,3 +1,8 @@
+/**
+ * NOTE: This class is auto generated by the akka-scala (beta) swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * For any issue or feedback, please open a ticket via https://github.com/swagger-api/swagger-codegen/issues/new
+ */
 package {{apiPackage}}
 
 import {{modelPackage}}._
@@ -39,4 +44,4 @@ object EnumsSerializers {
     }
   }
 
-}
\ No newline at end of file
+}
diff --git a/modules/swagger-codegen/src/main/resources/akka-scala/model.mustache b/modules/swagger-codegen/src/main/resources/akka-scala/model.mustache
index a7395b5f03a..0c08f91af78 100644
--- a/modules/swagger-codegen/src/main/resources/akka-scala/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/akka-scala/model.mustache
@@ -1,3 +1,9 @@
+/**
+ * NOTE: This class is auto generated by the akka-scala (beta) swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * For any issue or feedback, please open a ticket via https://github.com/swagger-api/swagger-codegen/issues/new
+ */
+
 package {{package}}
 
 import {{invokerPackage}}.ApiModel
@@ -8,7 +14,7 @@ import org.joda.time.DateTime
 
 case class {{classname}} (
   {{#vars}}{{#description}}/* {{{description}}} */
-  {{/description}}{{name}}: {{^required}}Option[{{/required}}{{^isEnum}}{{datatype}}{{/isEnum}}{{#isEnum}}{{classname}}Enums.{{datatypeWithEnum}}{{/isEnum}}{{^required}}]{{/required}}{{#hasMore}},{{/hasMore}}{{^hasMore}}){{/hasMore}}
+  {{/description}}{{{name}}}: {{^required}}Option[{{/required}}{{^isEnum}}{{datatype}}{{/isEnum}}{{#isEnum}}{{classname}}Enums.{{datatypeWithEnum}}{{/isEnum}}{{^required}}]{{/required}}{{#hasMore}},{{/hasMore}}{{^hasMore}}){{/hasMore}}
   {{/vars}} extends ApiModel
 
 {{#hasEnums}}
diff --git a/modules/swagger-codegen/src/main/resources/akka-scala/requests.mustache b/modules/swagger-codegen/src/main/resources/akka-scala/requests.mustache
index 145354203fb..6680f84e09e 100644
--- a/modules/swagger-codegen/src/main/resources/akka-scala/requests.mustache
+++ b/modules/swagger-codegen/src/main/resources/akka-scala/requests.mustache
@@ -1,3 +1,8 @@
+/**
+ * NOTE: This class is auto generated by the akka-scala (beta) swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * For any issue or feedback, please open a ticket via https://github.com/swagger-api/swagger-codegen/issues/new
+ */
 package {{invokerPackage}}
 
 import java.io.File
@@ -8,6 +13,8 @@ sealed trait ApiReturnWithHeaders {
   def headers: Map[String, String]
   def header(name: String): Option[String] = headers.get(name)
   def getStringHeader(name: String) = header(name)
+  // workaround: return date time header in string instead of datetime object
+  def getDateTimeHeader(name: String) = header(name)
   def getIntHeader(name: String) = castedHeader(name, java.lang.Integer.parseInt)
   def getLongHeader(name: String) = castedHeader(name, java.lang.Long.parseLong)
   def getFloatHeader(name: String) = castedHeader(name, java.lang.Float.parseFloat)
diff --git a/modules/swagger-codegen/src/main/resources/android/libraries/volley/api.mustache b/modules/swagger-codegen/src/main/resources/android/libraries/volley/api.mustache
index af6f859c73d..38c7f00cdaa 100644
--- a/modules/swagger-codegen/src/main/resources/android/libraries/volley/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/android/libraries/volley/api.mustache
@@ -121,7 +121,10 @@ public class {{classname}} {
          throw ex;
       } catch (ExecutionException ex) {
          if(ex.getCause() instanceof VolleyError) {
-            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+	    VolleyError volleyError = (VolleyError)ex.getCause();
+	    if (volleyError.networkResponse != null) {
+	       throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage());
+	    }
          }
          throw ex;
       } catch (TimeoutException ex) {
diff --git a/modules/swagger-codegen/src/main/resources/android/libraries/volley/build.mustache b/modules/swagger-codegen/src/main/resources/android/libraries/volley/build.mustache
index fabdd14a6d6..917f9d11eff 100644
--- a/modules/swagger-codegen/src/main/resources/android/libraries/volley/build.mustache
+++ b/modules/swagger-codegen/src/main/resources/android/libraries/volley/build.mustache
@@ -70,7 +70,7 @@ ext {
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "com.google.code.gson:gson:$gson_version"
-    compile "org.apache.httpcomponents:httpcore:$httpclient_version"
+    compile "org.apache.httpcomponents:httpcore:$httpcore_version"
     compile "org.apache.httpcomponents:httpmime:$httpclient_version"
     compile "com.mcxiaoke.volley:library:${volley_version}@aar"
     testCompile "junit:junit:$junit_version"
diff --git a/modules/swagger-codegen/src/main/resources/asyncscala/api.mustache b/modules/swagger-codegen/src/main/resources/asyncscala/api.mustache
index dfec3d789dd..7f2edfd9aea 100644
--- a/modules/swagger-codegen/src/main/resources/asyncscala/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/asyncscala/api.mustache
@@ -10,7 +10,7 @@ import collection.mutable
 class {{classname}}(client: TransportClient, config: SwaggerConfig) extends ApiClient(client, config) {
 
   {{#operation}}
-  def {{nickname}}({{#allParams}}{{^required}}{{paramName}}: Option[{{dataType}}] = {{#defaultValue}}Some({{defaultValue}}){{/defaultValue}}{{^defaultValue}}None{{/defaultValue}}{{#hasMore}},{{/hasMore}}
+  def {{operationId}}({{#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
@@ -21,14 +21,28 @@ class {{classname}}(client: TransportClient, config: SwaggerConfig) extends ApiC
     val queryParams = new mutable.HashMap[String, String]
     val headerParams = new mutable.HashMap[String, String]
 
-    {{#requiredParamCount}}// verify required params are set
-    val paramCount = (Set[Any]({{/requiredParamCount}}{{#requiredParams}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/requiredParams}}{{#requiredParamCount}}) - null).size
-    if (paramCount != {{requiredParamCount}}) sys.error("missing required params"){{/requiredParamCount}}
+    {{#allParams}}
+    {{#required}}
+    {{^isPrimitiveType}}
+    if ({{paramName}} == null) throw new Exception("Missing required parameter '{{paramName}}' when calling {{classname}}->{{operationId}}")
 
-    {{#queryParams}}{{^required}}if({{paramName}} != null) {{paramName}}.foreach { v => queryParams += "{{baseName}}" -> v.toString }{{/required}}{{#required}}
-    if({{paramName}} != null)   queryParams += "{{baseName}}" -> {{paramName}}.toString{{/required}}{{/queryParams}}
+    {{/isPrimitiveType}}
+    {{/required}}
+    {{/allParams}}
+    {{#queryParams}}
+    {{^required}}
+    if ({{paramName}} != null) {{paramName}}.foreach { v => queryParams += "{{baseName}}" -> v.toString }
 
-    {{#headerParams}}headerParams += "{{baseName}}" -> {{paramName}}.toString{{/headerParams}}
+    {{/required}}
+    {{#required}}
+    if ({{paramName}} != null) queryParams += "{{baseName}}" -> {{paramName}}.toString
+
+    {{/required}}
+    {{/queryParams}}
+
+    {{#headerParams}}
+    headerParams += "{{baseName}}" -> {{paramName}}.toString
+    {{/headerParams}}
 
     val resFuture = client.submit("{{httpMethod}}", path, queryParams.toMap, headerParams.toMap, {{#bodyParam}}writer.write({{paramName}}){{/bodyParam}}{{^bodyParam}}"{{emptyBodyParam}}"{{/bodyParam}})
     resFuture flatMap { resp =>
diff --git a/modules/swagger-codegen/src/main/resources/asyncscala/model.mustache b/modules/swagger-codegen/src/main/resources/asyncscala/model.mustache
index bf63e76658a..68d361c4c59 100644
--- a/modules/swagger-codegen/src/main/resources/asyncscala/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/asyncscala/model.mustache
@@ -7,7 +7,7 @@ import java.util.UUID
 
 {{#model}}
 case class {{classname}} (
-  {{#vars}}{{name}}: {{#isNotRequired}}Option[{{/isNotRequired}}{{datatype}}{{#isNotRequired}}]{{/isNotRequired}}{{#hasMore}},{{/hasMore}}{{#description}}  // {{description}}{{/description}}
+  {{#vars}}{{name}}: {{^required}}Option[{{/required}}{{datatype}}{{^required}}]{{/required}}{{#hasMore}},{{/hasMore}}{{#description}}  // {{description}}{{/description}}
   {{/vars}}
 )
 {{/model}}
diff --git a/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
index 75f43b8aa1c..2c0f8f681e3 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
@@ -4,7 +4,9 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Text.RegularExpressions;
 using System.IO;
+{{^supportsUWP}}
 using System.Web;
+{{/supportsUWP}}
 using System.Linq;
 using System.Net;
 using System.Text;
@@ -103,7 +105,16 @@ namespace {{packageName}}.Client
 
             // add file parameter, if any
             foreach(var param in fileParams)
+            {
+                {{^supportsUWP}}
                 request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType);
+                {{/supportsUWP}}
+                {{#supportsUWP}}
+                byte[] paramWriter = null;
+                param.Value.Writer = delegate (Stream stream) { paramWriter = ToByteArray(stream); };
+                request.AddFile(param.Value.Name, paramWriter, param.Value.FileName, param.Value.ContentType);
+                {{/supportsUWP}}
+            }
 
             if (postBody != null) // http body (model or byte[]) parameter
             {
@@ -148,7 +159,13 @@ namespace {{packageName}}.Client
             // set user agent
             RestClient.UserAgent = Configuration.UserAgent;
 
+            {{^supportsUWP}}
             var response = RestClient.Execute(request);
+            {{/supportsUWP}}
+            {{#supportsUWP}}
+            // Using async method to perform sync call (uwp-only)
+            var response = RestClient.ExecuteTaskAsync(request).Result;
+            {{/supportsUWP}}
             return (Object) response;
         }
         {{#supportsAsync}}
@@ -444,5 +461,20 @@ namespace {{packageName}}.Client
                 return filename;
             }
         }
+        {{#supportsUWP}}
+        /// <summary>
+        /// Convert stream to byte array
+        /// </summary>
+        /// <param name="stream">IO stream</param>
+        /// <returns>Byte array</returns>
+        public static byte[] ToByteArray(Stream stream)
+        {
+            stream.Position = 0;
+            byte[] buffer = new byte[stream.Length];
+            for (int totalBytesCopied = 0; totalBytesCopied < stream.Length;)
+                totalBytesCopied += stream.Read(buffer, totalBytesCopied, Convert.ToInt32(stream.Length) - totalBytesCopied);
+            return buffer;
+        }
+        {{/supportsUWP}}
     }
 }
diff --git a/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache b/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache
index 6cec586b453..bf7f4d003ad 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache
@@ -270,11 +270,13 @@ namespace {{packageName}}.Client
         public static String ToDebugReport()
         {
             String report = "C# SDK ({{packageName}}) Debug Report:\n";
+            {{^supportsUWP}}
             report += "    OS: " + Environment.OSVersion + "\n";
             report += "    .NET Framework Version: " + Assembly
                      .GetExecutingAssembly()
                      .GetReferencedAssemblies()
                      .Where(x => x.Name == "System.Core").First().Version.ToString()  + "\n";
+            {{/supportsUWP}}
             report += "    Version of the API: {{version}}\n";
             report += "    SDK Package Version: {{packageVersion}}\n";
 
diff --git a/modules/swagger-codegen/src/main/resources/csharp/Project.mustache b/modules/swagger-codegen/src/main/resources/csharp/Project.mustache
index d418dc74f8b..d38e5d92d1e 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/Project.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/Project.mustache
@@ -8,7 +8,15 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>{{packageTitle}}</RootNamespace>
     <AssemblyName>{{packageTitle}}</AssemblyName>
+    {{^supportsUWP}}
     <TargetFrameworkVersion>{{targetFramework}}</TargetFrameworkVersion>
+    {{/supportsUWP}}
+    {{#supportsUWP}}
+    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
+    <TargetPlatformVersion>10.0.10240.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
+    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
+    {{/supportsUWP}}
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/modules/swagger-codegen/src/main/resources/csharp/README.md b/modules/swagger-codegen/src/main/resources/csharp/README.md
deleted file mode 100644
index 794a7c49b1b..00000000000
--- a/modules/swagger-codegen/src/main/resources/csharp/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-## Frameworks supported
-- .NET 4.0 or later
-- Windows Phone 7.1 (Mango)
-
-## Dependencies
-- [RestSharp] (https://www.nuget.org/packages/RestSharp) - 105.1.0 or later
-- [Json.NET] (https://www.nuget.org/packages/Newtonsoft.Json/) - 7.0.0 or later 
-
-The DLLs included in the package may not be the latest version. We recommned using [NuGet] (https://docs.nuget.org/consume/installing-nuget) to obtain the latest version of the packages:
-```
-Install-Package RestSharp
-Install-Package Newtonsoft.Json
-```
-
-NOTE: RestSharp versions greater than 105.1.0 have a bug which causes file uploads to fail. See [RestSharp#742](https://github.com/restsharp/RestSharp/issues/742)
-
-## Installation
-Run the following command to generate the DLL
-- [Mac/Linux] compile-mono.sh
-- [Windows] compile.bat
-
-Then include the DLL (under the `bin` folder) in the C# project
diff --git a/modules/swagger-codegen/src/main/resources/csharp/README.mustache b/modules/swagger-codegen/src/main/resources/csharp/README.mustache
new file mode 100644
index 00000000000..06660a3c615
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/csharp/README.mustache
@@ -0,0 +1,147 @@
+# {{packageName}} - the C# library for the {{appName}}
+
+{{#appDescription}}
+{{{appDescription}}}
+{{/appDescription}}
+
+This C# SDK is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
+
+- API version: {{appVersion}}
+- SDK version: {{packageVersion}}
+- Build date: {{generatedDate}}
+- Build package: {{generatorClass}}
+{{#infoUrl}}
+    For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})
+{{/infoUrl}}
+
+## Frameworks supported
+{{^supportUWP}}
+- .NET 4.0 or later
+- Windows Phone 7.1 (Mango)
+{{/supportUWP}}
+{{#supportUWP}}
+- UWP
+{{/supportUWP}}
+
+## Dependencies
+- [RestSharp] (https://www.nuget.org/packages/RestSharp) - 105.1.0 or later
+- [Json.NET] (https://www.nuget.org/packages/Newtonsoft.Json/) - 7.0.0 or later
+
+The DLLs included in the package may not be the latest version. We recommned using [NuGet] (https://docs.nuget.org/consume/installing-nuget) to obtain the latest version of the packages:
+```
+Install-Package RestSharp
+Install-Package Newtonsoft.Json
+```
+
+NOTE: RestSharp versions greater than 105.1.0 have a bug which causes file uploads to fail. See [RestSharp#742](https://github.com/restsharp/RestSharp/issues/742)
+
+## Installation
+Run the following command to generate the DLL
+- [Mac/Linux] `/bin/sh compile-mono.sh`
+- [Windows] `compile.bat`
+
+Then include the DLL (under the `bin` folder) in the C# project, and use the namespaces:
+```csharp
+using {{packageName}}.Api;
+using {{packageName}}.Client;
+{{#modelPackage}}
+using {{{.}}};
+{{/modelPackage}}
+```
+
+## Getting Started
+
+```csharp
+using System;
+using System.Diagnostics;
+using {{packageName}}.Api;
+using {{packageName}}.Client;
+{{#modelPackage}}
+using {{{.}}};
+{{/modelPackage}}
+
+namespace Example
+{
+    public class {{operationId}}Example
+    {
+        public void main()
+        {
+            {{#apiInfo}}{{#apis}}{{#-first}}{{#operations}}{{#operation}}{{#-first}}{{#hasAuthMethods}}{{#authMethods}}{{#isBasic}}
+            // Configure HTTP basic authorization: {{{name}}}
+            Configuration.Default.Username = 'YOUR_USERNAME';
+            Configuration.Default.Password = 'YOUR_PASSWORD';{{/isBasic}}{{#isApiKey}}
+            // Configure API key authorization: {{{name}}}
+            Configuration.Default.ApiKey.Add('{{{keyParamName}}}', 'YOUR_API_KEY');
+            // Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+            // Configuration.Default.ApiKeyPrefix.Add('{{{keyParamName}}}', 'BEARER');{{/isApiKey}}{{#isOAuth}}
+            // Configure OAuth2 access token for authorization: {{{name}}}
+            Configuration.Default.AccessToken = 'YOUR_ACCESS_TOKEN';{{/isOAuth}}{{/authMethods}}
+            {{/hasAuthMethods}}
+
+            var apiInstance = new {{classname}}();
+            {{#allParams}}
+            {{#isPrimitiveType}}
+            var {{paramName}} = {{example}};  // {{{dataType}}} | {{{description}}}{{^required}} (optional) {{/required}}{{#defaultValue}} (default to {{{.}}}){{/defaultValue}}
+            {{/isPrimitiveType}}
+            {{^isPrimitiveType}}
+            var {{paramName}} = new {{{dataType}}}(); // {{{dataType}}} | {{{description}}}{{^required}} (optional) {{/required}}{{#defaultValue}} (default to {{{.}}}){{/defaultValue}}
+            {{/isPrimitiveType}}
+            {{/allParams}}
+
+            try
+            {
+                {{#summary}}
+                // {{{.}}}
+                {{/summary}}
+                {{#returnType}}{{{.}}} result = {{/returnType}}apiInstance.{{{operationId}}}({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{#returnType}}
+                Debug.WriteLine(result);{{/returnType}}
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling {{classname}}.{{operationId}}: " + e.Message );
+            }
+        }
+    }
+}{{/-first}}{{/operation}}{{/operations}}{{/-first}}{{/apis}}{{/apiInfo}}
+```
+
+## Documentation for API Endpoints
+
+All URIs are relative to *{{basePath}}*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+{{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}*{{classname}}* | [**{{operationId}}**]({{apiDocPath}}{{classname}}.md#{{operationIdLowerCase}}) | **{{httpMethod}}** {{path}} | {{#summary}}{{{summary}}}{{/summary}}
+{{/operation}}{{/operations}}{{/apis}}{{/apiInfo}}
+
+## Documentation for Models
+
+{{#modelPackage}}
+{{#models}}{{#model}} - [{{{modelPackage}}}.{{{classname}}}]({{modelDocPath}}{{{classname}}}.md)
+{{/model}}{{/models}}
+{{/modelPackage}}
+{{^modelPackage}}
+No model defined in this package
+{{/modelPackage}}
+
+## Documentation for Authorization
+
+{{^authMethods}} All endpoints do not require authorization.
+{{/authMethods}}{{#authMethods}}{{#last}} Authentication schemes defined for the API:{{/last}}{{/authMethods}}
+{{#authMethods}}### {{name}}
+
+{{#isApiKey}}- **Type**: API key
+- **API key parameter name**: {{keyParamName}}
+- **Location**: {{#isKeyInQuery}}URL query string{{/isKeyInQuery}}{{#isKeyInHeader}}HTTP header{{/isKeyInHeader}}
+{{/isApiKey}}
+{{#isBasic}}- **Type**: HTTP basic authentication
+{{/isBasic}}
+{{#isOAuth}}- **Type**: OAuth
+- **Flow**: {{flow}}
+- **Authorization URL**: {{authorizationUrl}}
+- **Scopes**: {{^scopes}}N/A{{/scopes}}
+{{#scopes}}  - {{scope}}: {{description}}
+{{/scopes}}
+{{/isOAuth}}
+
+{{/authMethods}}
diff --git a/modules/swagger-codegen/src/main/resources/csharp/api.mustache b/modules/swagger-codegen/src/main/resources/csharp/api.mustache
index e5b497b31e2..85af270c213 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/api.mustache
@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
@@ -178,14 +177,15 @@ namespace {{packageName}}.Api
         {{/allParams}}/// <returns>ApiResponse of {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Object(void){{/returnType}}</returns>
         public ApiResponse<{{#returnType}} {{{returnType}}} {{/returnType}}{{^returnType}}Object{{/returnType}}> {{operationId}}WithHttpInfo ({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = null{{/optionalMethodArgument}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
         {
-            {{#allParams}}{{#required}}
+            {{#allParams}}
+            {{#required}}
             // verify the required parameter '{{paramName}}' is set
             if ({{paramName}} == null)
                 throw new ApiException(400, "Missing required parameter '{{paramName}}' when calling {{classname}}->{{operationId}}");
-            {{/required}}{{/allParams}}
+            {{/required}}
+            {{/allParams}}
 
             var localVarPath = "{{path}}";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -195,13 +195,17 @@ namespace {{packageName}}.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}}
+                {{#consumes}}
+                "{{mediaType}}"{{#hasMore}}, {{/hasMore}}
+                {{/consumes}}
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}}
+                {{#produces}}
+                "{{mediaType}}"{{#hasMore}}, {{/hasMore}}
+                {{/produces}}
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -210,38 +214,53 @@ namespace {{packageName}}.Api
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
-            {{#pathParams}}if ({{paramName}} != null) localVarPathParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // path parameter
+            {{#pathParams}}
+            if ({{paramName}} != null) localVarPathParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // path parameter
             {{/pathParams}}
-            {{#queryParams}}if ({{paramName}} != null) localVarQueryParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // query parameter
+            {{#queryParams}}
+            if ({{paramName}} != null) localVarQueryParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // query parameter
             {{/queryParams}}
-            {{#headerParams}}if ({{paramName}} != null) localVarHeaderParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // header parameter
+            {{#headerParams}}
+            if ({{paramName}} != null) localVarHeaderParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // header parameter
             {{/headerParams}}
-            {{#formParams}}if ({{paramName}} != null) {{#isFile}}localVarFileParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToFile("{{baseName}}", {{paramName}}));{{/isFile}}{{^isFile}}localVarFormParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // form parameter{{/isFile}}
+            {{#formParams}}
+            if ({{paramName}} != null) {{#isFile}}localVarFileParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToFile("{{baseName}}", {{paramName}}));{{/isFile}}{{^isFile}}localVarFormParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // form parameter{{/isFile}}
             {{/formParams}}
-            {{#bodyParam}}if ({{paramName}}.GetType() != typeof(byte[]))
+            {{#bodyParam}}
+            if ({{paramName}}.GetType() != typeof(byte[]))
             {
                 localVarPostBody = Configuration.ApiClient.Serialize({{paramName}}); // http body (model) parameter
             }
             else
             {
                 localVarPostBody = {{paramName}}; // byte array
-            }{{/bodyParam}}
+            }
+            {{/bodyParam}}
 
-            {{#authMethods}}// authentication ({{name}}) required
-            {{#isApiKey}}{{#isKeyInHeader}}
+            {{#authMethods}}
+            // authentication ({{name}}) required
+            {{#isApiKey}}
+            {{#isKeyInHeader}}
             if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("{{keyParamName}}")))
             {
                 localVarHeaderParams["{{keyParamName}}"] = Configuration.GetApiKeyWithPrefix("{{keyParamName}}");
-            }{{/isKeyInHeader}}{{#isKeyInQuery}}
+            }
+            {{/isKeyInHeader}}
+            {{#isKeyInQuery}}
             if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("{{keyParamName}}")))
             {
                 localVarQueryParams["{{keyParamName}}"] = Configuration.GetApiKeyWithPrefix("{{keyParamName}}");
-            }{{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}
+            }
+            {{/isKeyInQuery}}
+            {{/isApiKey}}
+            {{#isBasic}}
             // http basic authentication required
             if (!String.IsNullOrEmpty(Configuration.Username) || !String.IsNullOrEmpty(Configuration.Password))
             {
                 localVarHeaderParams["Authorization"] = "Basic " + ApiClient.Base64Encode(Configuration.Username + ":" + Configuration.Password);
-            }{{/isBasic}}{{#isOAuth}}
+            }
+            {{/isBasic}}
+            {{#isOAuth}}
             // oauth required
             if (!String.IsNullOrEmpty(Configuration.AccessToken))
             {
@@ -291,12 +310,15 @@ namespace {{packageName}}.Api
         {{/allParams}}/// <returns>Task of ApiResponse{{#returnType}} ({{returnType}}){{/returnType}}</returns>
         public async System.Threading.Tasks.Task<ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}}>> {{operationId}}AsyncWithHttpInfo ({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = null{{/optionalMethodArgument}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
         {
-            {{#allParams}}{{#required}}// verify the required parameter '{{paramName}}' is set
-            if ({{paramName}} == null) throw new ApiException(400, "Missing required parameter '{{paramName}}' when calling {{operationId}}");
-            {{/required}}{{/allParams}}
+            {{#allParams}}
+            {{#required}}
+            // verify the required parameter '{{paramName}}' is set
+            if ({{paramName}} == null)
+                throw new ApiException(400, "Missing required parameter '{{paramName}}' when calling {{classname}}->{{operationId}}");
+            {{/required}}
+            {{/allParams}}
 
             var localVarPath = "{{path}}";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -306,13 +328,17 @@ namespace {{packageName}}.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}}
+                {{#consumes}}
+                "{{mediaType}}"{{#hasMore}}, {{/hasMore}}
+                {{/consumes}}
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}}
+                {{#produces}}
+                "{{mediaType}}"{{#hasMore}}, {{/hasMore}}
+                {{/produces}}
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -321,44 +347,59 @@ namespace {{packageName}}.Api
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
-            {{#pathParams}}if ({{paramName}} != null) localVarPathParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // path parameter
+            {{#pathParams}}
+            if ({{paramName}} != null) localVarPathParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // path parameter
             {{/pathParams}}
-            {{#queryParams}}if ({{paramName}} != null) localVarQueryParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // query parameter
+            {{#queryParams}}
+            if ({{paramName}} != null) localVarQueryParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // query parameter
             {{/queryParams}}
-            {{#headerParams}}if ({{paramName}} != null) localVarHeaderParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // header parameter
+            {{#headerParams}}
+            if ({{paramName}} != null) localVarHeaderParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // header parameter
             {{/headerParams}}
-            {{#formParams}}if ({{paramName}} != null) {{#isFile}}localVarFileParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToFile("{{baseName}}", {{paramName}}));{{/isFile}}{{^isFile}}localVarFormParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // form parameter{{/isFile}}
+            {{#formParams}}
+            if ({{paramName}} != null) {{#isFile}}localVarFileParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToFile("{{baseName}}", {{paramName}}));{{/isFile}}{{^isFile}}localVarFormParams.Add("{{baseName}}", Configuration.ApiClient.ParameterToString({{paramName}})); // form parameter{{/isFile}}
             {{/formParams}}
-            {{#bodyParam}}if ({{paramName}}.GetType() != typeof(byte[]))
+            {{#bodyParam}}
+            if ({{paramName}}.GetType() != typeof(byte[]))
             {
                 localVarPostBody = Configuration.ApiClient.Serialize({{paramName}}); // http body (model) parameter
             }
             else
             {
                 localVarPostBody = {{paramName}}; // byte array
-            }{{/bodyParam}}
+            }
+            {{/bodyParam}}
 
             {{#authMethods}}
             // authentication ({{name}}) required
-            {{#isApiKey}}{{#isKeyInHeader}}
+            {{#isApiKey}}
+            {{#isKeyInHeader}}
             if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("{{keyParamName}}")))
             {
                 localVarHeaderParams["{{keyParamName}}"] = Configuration.GetApiKeyWithPrefix("{{keyParamName}}");
-            }{{/isKeyInHeader}}{{#isKeyInQuery}}
+            }
+            {{/isKeyInHeader}}
+            {{#isKeyInQuery}}
             if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("{{keyParamName}}")))
             {
                 localVarQueryParams["{{keyParamName}}"] = Configuration.GetApiKeyWithPrefix("{{keyParamName}}");
-            }{{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}
+            }
+            {{/isKeyInQuery}}
+            {{/isApiKey}}
+            {{#isBasic}}
             // http basic authentication required
             if (!String.IsNullOrEmpty(Configuration.Username) || !String.IsNullOrEmpty(Configuration.Password))
             {
                 localVarHeaderParams["Authorization"] = "Basic " + ApiClient.Base64Encode(Configuration.Username + ":" + Configuration.Password);
-            }{{/isBasic}}{{#isOAuth}}
+            }
+            {{/isBasic}}
+            {{#isOAuth}}
             // oauth required
             if (!String.IsNullOrEmpty(Configuration.AccessToken))
             {
                 localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
-            }{{/isOAuth}}
+            }
+            {{/isOAuth}}
             {{/authMethods}}
 
             // make the HTTP request
@@ -379,7 +420,9 @@ namespace {{packageName}}.Api
             {{^returnType}}return new ApiResponse<Object>(localVarStatusCode,
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);{{/returnType}}
-        }{{/supportsAsync}}
+        }
+
+        {{/supportsAsync}}
         {{/operation}}
     }
     {{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/csharp/api_doc.mustache b/modules/swagger-codegen/src/main/resources/csharp/api_doc.mustache
new file mode 100644
index 00000000000..f1b3c15e616
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/csharp/api_doc.mustache
@@ -0,0 +1,96 @@
+# {{packageName}}.Api.{{classname}}{{#description}}
+{{description}}{{/description}}
+
+All URIs are relative to *{{basePath}}*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+{{#operations}}{{#operation}}[**{{operationId}}**]({{classname}}.md#{{operationIdLowerCase}}) | **{{httpMethod}}** {{path}} | {{#summary}}{{summary}}{{/summary}}
+{{/operation}}{{/operations}}
+
+{{#operations}}
+{{#operation}}
+# **{{{operationId}}}**
+> {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{operationId}} ({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = null{{/optionalMethodArgument}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
+
+{{{summary}}}{{#notes}}
+
+{{{notes}}}{{/notes}}
+
+### Example 
+```csharp
+using System;
+using System.Diagnostics;
+using {{packageName}}.Api;
+using {{packageName}}.Client;
+using {{packageName}}.Model;
+
+namespace Example
+{
+    public class {{operationId}}Example
+    {
+        public void main()
+        {
+            {{#hasAuthMethods}}{{#authMethods}}{{#isBasic}}
+            // Configure HTTP basic authorization: {{{name}}}
+            Configuration.Default.Username = 'YOUR_USERNAME';
+            Configuration.Default.Password = 'YOUR_PASSWORD';{{/isBasic}}{{#isApiKey}}
+            // Configure API key authorization: {{{name}}}
+            Configuration.Default.ApiKey.Add('{{{keyParamName}}}', 'YOUR_API_KEY');
+            // Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+            // Configuration.Default.ApiKeyPrefix.Add('{{{keyParamName}}}', 'BEARER');{{/isApiKey}}{{#isOAuth}}
+            // Configure OAuth2 access token for authorization: {{{name}}}
+            Configuration.Default.AccessToken = 'YOUR_ACCESS_TOKEN';{{/isOAuth}}{{/authMethods}}
+            {{/hasAuthMethods}}
+
+            var apiInstance = new {{classname}}();
+            {{#allParams}}
+            {{#isPrimitiveType}}
+            var {{paramName}} = {{example}};  // {{{dataType}}} | {{{description}}}{{^required}} (optional) {{/required}}{{#defaultValue}} (default to {{{.}}}){{/defaultValue}}
+            {{/isPrimitiveType}}
+            {{^isPrimitiveType}}
+            var {{paramName}} = new {{{dataType}}}(); // {{{dataType}}} | {{{description}}}{{^required}} (optional) {{/required}}{{#defaultValue}} (default to {{{.}}}){{/defaultValue}}
+            {{/isPrimitiveType}}
+            {{/allParams}}
+
+            try
+            {
+                {{#summary}}
+                // {{{.}}}
+                {{/summary}}
+                {{#returnType}}{{returnType}} result = {{/returnType}}apiInstance.{{{operationId}}}({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{#returnType}}
+                Debug.WriteLine(result);{{/returnType}}
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling {{classname}}.{{operationId}}: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+{{^allParams}}This endpoint does not need any parameter.{{/allParams}}{{#allParams}}{{#-last}}
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------{{/-last}}{{/allParams}}
+{{#allParams}} **{{paramName}}** | {{#isFile}}**{{{dataType}}}**{{/isFile}}{{#isPrimitiveType}}**{{{dataType}}}**{{/isPrimitiveType}}{{^isPrimitiveType}}{{^isFile}}[**{{{dataType}}}**]({{baseType}}.md){{/isFile}}{{/isPrimitiveType}}| {{description}} | {{^required}}[optional] {{/required}}{{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}
+{{/allParams}}
+
+### Return type
+
+{{#returnType}}{{#returnTypeIsPrimitive}}**{{{returnType}}}**{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}[**{{{returnType}}}**]({{returnBaseType}}.md){{/returnTypeIsPrimitive}}{{/returnType}}{{^returnType}}void (empty response body){{/returnType}}
+
+### Authorization
+
+{{^authMethods}}No authorization required{{/authMethods}}{{#authMethods}}[{{{name}}}](../README.md#{{{name}}}){{^-last}}, {{/-last}}{{/authMethods}}
+
+### HTTP request headers
+
+ - **Content-Type**: {{#consumes}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/consumes}}{{^consumes}}Not defined{{/consumes}}
+ - **Accept**: {{#produces}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/produces}}{{^produces}}Not defined{{/produces}}
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+{{/operation}}
+{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/csharp/api_test.mustache b/modules/swagger-codegen/src/main/resources/csharp/api_test.mustache
index 5f5a03aa612..cb345a93cc4 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/api_test.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/api_test.mustache
@@ -61,7 +61,8 @@ namespace {{packageName}}.Test
         public void {{operationId}}Test()
         {
             // TODO: add unit test for the method '{{operationId}}'
-            {{#allParams}}{{{dataType}}} {{paramName}} = null; // TODO: replace null with proper value
+            {{#allParams}}
+            {{{dataType}}} {{paramName}} = null; // TODO: replace null with proper value
             {{/allParams}}
             {{#returnType}}var response = {{/returnType}}instance.{{operationId}}({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
             {{#returnType}}Assert.IsInstanceOf<{{{returnType}}}> (response, "response is {{{returnType}}}");{{/returnType}}
diff --git a/modules/swagger-codegen/src/main/resources/csharp/model.mustache b/modules/swagger-codegen/src/main/resources/csharp/model.mustache
index a3c289cdbb3..3626da0f1c4 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/model.mustache
@@ -81,8 +81,9 @@ namespace {{packageName}}.Model
         {
             var sb = new StringBuilder();
             sb.Append("class {{classname}} {\n");
-            {{#vars}}sb.Append("  {{name}}: ").Append({{name}}).Append("\n");
-            {{/vars}}
+{{#vars}}
+            sb.Append("  {{name}}: ").Append({{name}}).Append("\n");
+{{/vars}}
             sb.Append("}\n");
             return sb.ToString();
         }
diff --git a/modules/swagger-codegen/src/main/resources/csharp/model_doc.mustache b/modules/swagger-codegen/src/main/resources/csharp/model_doc.mustache
new file mode 100644
index 00000000000..aff3e7e0d1e
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/csharp/model_doc.mustache
@@ -0,0 +1,14 @@
+{{#models}}
+{{#model}}
+# {{{packageName}}}.Model.{{{classname}}}
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{datatype}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{datatype}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
+{{/vars}}
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+{{/model}}
+{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/dart/api.mustache b/modules/swagger-codegen/src/main/resources/dart/api.mustache
index 51216a11c95..d8ee98569c1 100644
--- a/modules/swagger-codegen/src/main/resources/dart/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/dart/api.mustache
@@ -18,11 +18,11 @@ class {{classname}} {
   /// {{notes}}
   {{#returnType}}Future<{{{returnType}}}> {{/returnType}}{{^returnType}}Future {{/returnType}}{{nickname}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {
     Object postBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
-    {{#requiredParamCount}}
+    {{#allParams}}
     // verify required params are set
-    if({{/requiredParamCount}}{{#requiredParams}} {{paramName}} == null {{#hasMore}}|| {{/hasMore}}{{/requiredParams}}{{#requiredParamCount}}) {
+    if({{/allParams}}{{#required}} {{paramName}} == null {{#hasMore}}|| {{/hasMore}}{{/required}}{{#allParams}}) {
        throw new ApiException(400, "missing required params");
-    }{{/requiredParamCount}}
+    }{{/allParams}}
 
     // create path and map variables
     String path = "{{path}}".replaceAll("{format}","json"){{#pathParams}}.replaceAll("{" + "{{paramName}}" + "}", {{{paramName}}}.toString()){{/pathParams}};
diff --git a/modules/swagger-codegen/src/main/resources/flash/api.mustache b/modules/swagger-codegen/src/main/resources/flash/api.mustache
index 2f5ccfe0dbb..b1312a339d4 100644
--- a/modules/swagger-codegen/src/main/resources/flash/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/flash/api.mustache
@@ -42,12 +42,12 @@ public class {{classname}} extends SwaggerApi {
         var queryParams: Dictionary = new Dictionary();
         var headerParams: Dictionary = new Dictionary();
 
-        {{#requiredParamCount}}
+        {{#allParams}}
         // verify required params are set
-        if({{/requiredParamCount}}{{#requiredParams}} {{paramName}} == null {{#hasMore}}|| {{/hasMore}}{{/requiredParams}}{{#requiredParamCount}}) {
+        if({{/allParams}}{{#required}} {{paramName}} == null {{#hasMore}}|| {{/hasMore}}{{/required}}{{#allParams}}) {
             throw new ApiError(400, "missing required params");
         }
-        {{/requiredParamCount}}
+        {{/allParams}}
 
         {{#queryParams}}if("null" != String({{paramName}}))
             queryParams["{{paramName}}"] = toPathValue({{paramName}});
diff --git a/modules/swagger-codegen/src/main/resources/flash/git_push.sh.mustache b/modules/swagger-codegen/src/main/resources/flash/git_push.sh.mustache
new file mode 100755
index 00000000000..e153ce23ecf
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/flash/git_push.sh.mustache
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="{{{gitUserId}}}"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="{{{gitRepoId}}}"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="{{{releaseNote}}}"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/modules/swagger-codegen/src/main/resources/flash/gitignore.mustache b/modules/swagger-codegen/src/main/resources/flash/gitignore.mustache
new file mode 100644
index 00000000000..f112f7fb78f
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/flash/gitignore.mustache
@@ -0,0 +1,11 @@
+# Build and Release Folders
+bin/
+bin-debug/
+bin-release/
+
+# Other files and folders
+.settings/
+
+# Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties`
+# should NOT be excluded as they contain compiler settings and other important
+# information for Eclipse / Flash Builder.
diff --git a/modules/swagger-codegen/src/main/resources/flaskConnexion/__init__.mustache b/modules/swagger-codegen/src/main/resources/flaskConnexion/__init__.mustache
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/modules/swagger-codegen/src/main/resources/flaskConnexion/controller.mustache b/modules/swagger-codegen/src/main/resources/flaskConnexion/controller.mustache
index 06b3c63fdb0..e9167e5bfe8 100644
--- a/modules/swagger-codegen/src/main/resources/flaskConnexion/controller.mustache
+++ b/modules/swagger-codegen/src/main/resources/flaskConnexion/controller.mustache
@@ -3,9 +3,9 @@
 {{#operations}}
 {{#operation}}
 
-def {{operationId}}({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> str:
+def {{operationId}}({{#allParams}}{{paramName}}{{^required}} = None{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}){{^supportPython2}} -> str{{/supportPython2}}:
     return 'do some magic!'
 {{/operation}}
 {{/operations}}
 {{/apis}}
-{{/apiInfo}}
\ No newline at end of file
+{{/apiInfo}}
diff --git a/modules/swagger-codegen/src/main/resources/go/README.mustache b/modules/swagger-codegen/src/main/resources/go/README.mustache
index 586b35ed3f5..026d0648ea6 100644
--- a/modules/swagger-codegen/src/main/resources/go/README.mustache
+++ b/modules/swagger-codegen/src/main/resources/go/README.mustache
@@ -1,8 +1,19 @@
 # Go API client for {{packageName}}
 
+{{#appDescription}}
+{{{appDescription}}}
+{{/appDescription}}
+
 ## Overview
 This API client was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project.  By using the [swagger-spec](https://github.com/swagger-api/swagger-spec) from a remote server, you can easily generate an API client.
 
+- API version: {{appVersion}}
+- Package version: {{packageVersion}}
+- Build date: {{generatedDate}}
+- Build package: {{generatorClass}}
+{{#infoUrl}}
+For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})
+{{/infoUrl}}
 
 ## Installation
 Put the package under your project folder and add the following in import:
@@ -10,3 +21,43 @@ Put the package under your project folder and add the following in import:
     "./{{packageName}}"
 ```
 
+## Documentation for API Endpoints
+
+All URIs are relative to *{{basePath}}*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+{{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}*{{classname}}* | [**{{operationId}}**]({{apiDocPath}}{{classname}}.md#{{operationIdLowerCase}}) | **{{httpMethod}}** {{path}} | {{#summary}}{{summary}}{{/summary}}
+{{/operation}}{{/operations}}{{/apis}}{{/apiInfo}}
+
+## Documentation For Models
+
+{{#models}}{{#model}} - [{{{classname}}}]({{modelDocPath}}{{{classname}}}.md)
+{{/model}}{{/models}}
+
+## Documentation For Authorization
+
+{{^authMethods}} All endpoints do not require authorization.
+{{/authMethods}}{{#authMethods}}{{#last}} Authentication schemes defined for the API:{{/last}}{{/authMethods}}
+{{#authMethods}}## {{{name}}}
+
+{{#isApiKey}}- **Type**: API key 
+- **API key parameter name**: {{{keyParamName}}}
+- **Location**: {{#isKeyInQuery}}URL query string{{/isKeyInQuery}}{{#isKeyInHeader}}HTTP header{{/isKeyInHeader}}
+{{/isApiKey}}
+{{#isBasic}}- **Type**: HTTP basic authentication
+{{/isBasic}}
+{{#isOAuth}}- **Type**: OAuth
+- **Flow**: {{{flow}}}
+- **Authorizatoin URL**: {{{authorizationUrl}}}
+- **Scopes**: {{^scopes}}N/A{{/scopes}}
+{{#scopes}} - **{{{scope}}}**: {{{description}}}
+{{/scopes}}
+{{/isOAuth}}
+
+{{/authMethods}}
+
+## Author
+
+{{#apiInfo}}{{#apis}}{{^hasMore}}{{infoEmail}}
+{{/hasMore}}{{/apis}}{{/apiInfo}}
diff --git a/modules/swagger-codegen/src/main/resources/go/api.mustache b/modules/swagger-codegen/src/main/resources/go/api.mustache
index d1cf877cd43..35ed984929d 100644
--- a/modules/swagger-codegen/src/main/resources/go/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/go/api.mustache
@@ -38,11 +38,43 @@ func New{{classname}}WithBasePath(basePath string) *{{classname}}{
 {{#allParams}} * @param {{paramName}} {{description}}
 {{/allParams}} * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
  */
-//func (a {{classname}}) {{nickname}} ({{#allParams}}{{paramName}} {{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) ({{#returnType}}{{{returnType}}}, {{/returnType}}error) {
 func (a {{classname}}) {{nickname}} ({{#allParams}}{{paramName}} {{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) ({{#returnType}}{{{returnType}}}, {{/returnType}}error) {
-
+    {{#allParams}}
+    {{#required}}
+    // verify the required parameter '{{paramName}}' is set
+    if &{{paramName}} == nil {
+        return {{#returnType}}*new({{{returnType}}}), {{/returnType}}errors.New("Missing required parameter '{{paramName}}' when calling {{classname}}->{{operationId}}")
+    }
+    {{/required}}
+    {{/allParams}}
     _sling := sling.New().{{httpMethod}}(a.Configuration.BasePath)
 
+    {{#authMethods}}// authentication ({{name}}) required
+    {{#isApiKey}}{{#isKeyInHeader}}
+    // set key with prefix in header
+    _sling.Set("{{keyParamName}}", a.Configuration.GetApiKeyWithPrefix("{{keyParamName}}"))
+    {{/isKeyInHeader}}{{#isKeyInQuery}}
+    // set key with prefix in querystring
+    {{#hasKeyParamName}}    type KeyQueryParams struct {
+            {{keyParamName}}    string `url:"{{keyParamName}},omitempty"`
+    }
+    _sling = _sling.QueryStruct(&KeyQueryParams{ {{keyParamName}}: a.Configuration.GetApiKeyWithPrefix("{{keyParamName}}") })
+    {{/hasKeyParamName}}
+    {{/isKeyInQuery}}{{/isApiKey}}    
+    {{#isBasic}}
+    // http basic authentication required
+    if a.Configuration.Username != "" || a.Configuration.Password != ""{
+        _sling.Set("Authorization",  "Basic " + a.Configuration.GetBasicAuthEncodedString())
+    }
+    {{/isBasic}}
+    {{#isOAuth}}
+    // oauth required
+    if a.Configuration.AccessToken != ""{
+        _sling.Set("Authorization", "Bearer " +  a.Configuration.AccessToken)
+    }
+    {{/isOAuth}}    
+    {{/authMethods}}
+
     // create path and map variables
     path := "{{basePathWithoutHost}}{{path}}"
 {{#pathParams}}    path = strings.Replace(path, "{" + "{{baseName}}" + "}", fmt.Sprintf("%v", {{paramName}}), -1)
@@ -50,26 +82,49 @@ func (a {{classname}}) {{nickname}} ({{#allParams}}{{paramName}} {{{dataType}}}{
 
     _sling = _sling.Path(path)
 
+    // add default headers if any
+    for key := range a.Configuration.DefaultHeader {
+      _sling = _sling.Set(key, a.Configuration.DefaultHeader[key])
+    }
+    
 {{#hasQueryParams}}    type QueryParams struct {
-        {{#queryParams}}{{paramName}}    {{dataType}} `url:"{{baseName}},omitempty"`
+        {{#queryParams}}{{vendorExtensions.x-exportParamName}}    {{dataType}} `url:"{{baseName}},omitempty"`
         {{/queryParams}}
 }
-    _sling = _sling.QueryStruct(&QueryParams{ {{#queryParams}}{{paramName}}: {{paramName}}{{#hasMore}},{{/hasMore}}{{/queryParams}} })
+    _sling = _sling.QueryStruct(&QueryParams{ {{#queryParams}}{{vendorExtensions.x-exportParamName}}: {{paramName}}{{#hasMore}},{{/hasMore}}{{/queryParams}} })
 {{/hasQueryParams}}
-    // accept header
-    accepts := []string { {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }
-    for key := range accepts {
-        _sling = _sling.Set("Accept", accepts[key])
-        break // only use the first Accept
+
+    // to determine the Content-Type header
+    localVarHttpContentTypes := []string {
+        {{#consumes}}
+        "{{mediaType}}", 
+        {{/consumes}}
+    }
+    //set Content-Type header
+    localVarHttpContentType := a.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes)
+    if localVarHttpContentType != "" {    
+      _sling = _sling.Set("Content-Type", localVarHttpContentType)
+    }
+
+    // to determine the Accept header
+    localVarHttpHeaderAccepts := []string {
+        {{#produces}}
+        "{{mediaType}}", 
+        {{/produces}}
+    }
+    //set Accept header
+    localVarHttpHeaderAccept := a.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+    if localVarHttpHeaderAccept != "" {  
+        _sling = _sling.Set("Accept", localVarHttpHeaderAccept)
     }
 {{#hasHeaderParams}}{{#headerParams}}    // header params "{{baseName}}"
     _sling = _sling.Set("{{baseName}}", {{paramName}})
 {{/headerParams}}{{/hasHeaderParams}}
 {{#hasFormParams}}    type FormParams struct {
-{{#formParams}}        {{paramName}}    {{dataType}} `url:"{{baseName}},omitempty"`
+{{#formParams}}        {{vendorExtensions.x-exportParamName}}    {{dataType}} `url:"{{baseName}},omitempty"`
 {{/formParams}}
     }
-    _sling = _sling.BodyForm(&FormParams{ {{#formParams}}{{paramName}}: {{paramName}}{{#hasMore}},{{/hasMore}}{{/formParams}} })
+    _sling = _sling.BodyForm(&FormParams{ {{#formParams}}{{vendorExtensions.x-exportParamName}}: {{paramName}}{{#hasMore}},{{/hasMore}}{{/formParams}} })
 {{/hasFormParams}}
 {{#hasBodyParam}}{{#bodyParams}}// body params
     _sling = _sling.BodyJSON({{paramName}})
diff --git a/modules/swagger-codegen/src/main/resources/go/api_client.mustache b/modules/swagger-codegen/src/main/resources/go/api_client.mustache
new file mode 100644
index 00000000000..06470ba06d6
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/go/api_client.mustache
@@ -0,0 +1,41 @@
+package {{packageName}}
+
+import (
+    "strings"
+)
+
+type ApiClient struct {
+
+}
+
+func (c *ApiClient) SelectHeaderContentType(contentTypes []string) string {
+    if (len(contentTypes) == 0){
+        return ""
+    }
+    if contains(contentTypes,"application/json") {
+        return "application/json"
+    }
+
+    return contentTypes[0] // use the first content type specified in 'consumes'
+}
+
+func (c *ApiClient) SelectHeaderAccept(accepts []string) string {
+    if (len(accepts) == 0){        
+        return ""
+    }
+
+    if contains(accepts,"application/json"){        
+        return "application/json"
+    }
+
+    return strings.Join(accepts,",")
+}
+
+func contains(source []string, containvalue string) bool {
+    for _, a := range source {
+        if strings.ToLower(a) == strings.ToLower(containvalue) {
+            return true
+        }
+    }
+    return false
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/go/api_doc.mustache b/modules/swagger-codegen/src/main/resources/go/api_doc.mustache
new file mode 100644
index 00000000000..e91082ffc99
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/go/api_doc.mustache
@@ -0,0 +1,44 @@
+# {{invokerPackage}}\{{classname}}{{#description}}
+{{description}}{{/description}}
+
+All URIs are relative to *{{basePath}}*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+{{#operations}}{{#operation}}[**{{operationId}}**]({{classname}}.md#{{operationId}}) | **{{httpMethod}}** {{path}} | {{#summary}}{{summary}}{{/summary}}
+{{/operation}}{{/operations}}
+
+{{#operations}}
+{{#operation}}
+# **{{{operationId}}}**
+> {{#returnType}}{{{returnType}}} {{/returnType}}{{{operationId}}}({{#allParams}}${{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
+
+{{{summary}}}{{#notes}}
+
+{{{notes}}}{{/notes}}
+
+
+### Parameters
+{{^allParams}}This endpoint does not need any parameter.{{/allParams}}{{#allParams}}{{#-last}}
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------{{/-last}}{{/allParams}}
+{{#allParams}} **{{paramName}}** | {{#isFile}}**{{dataType}}**{{/isFile}}{{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}{{^isFile}}[**{{dataType}}**]({{baseType}}.md){{/isFile}}{{/isPrimitiveType}}| {{description}} | {{^required}}[optional] {{/required}}{{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}
+{{/allParams}}
+
+### Return type
+
+{{#returnType}}{{#returnTypeIsPrimitive}}**{{{returnType}}}**{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}[**{{{returnType}}}**]({{returnBaseType}}.md){{/returnTypeIsPrimitive}}{{/returnType}}{{^returnType}}void (empty response body){{/returnType}}
+
+### Authorization
+
+{{^authMethods}}No authorization required{{/authMethods}}{{#authMethods}}[{{{name}}}](../README.md#{{{name}}}){{^-last}}, {{/-last}}{{/authMethods}}
+
+### HTTP request headers
+
+ - **Content-Type**: {{#consumes}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/consumes}}{{^consumes}}Not defined{{/consumes}}
+ - **Accept**: {{#produces}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/produces}}{{^produces}}Not defined{{/produces}}
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+{{/operation}}
+{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/go/configuration.mustache b/modules/swagger-codegen/src/main/resources/go/configuration.mustache
index bf3a8f92bed..154ceb9ffc6 100644
--- a/modules/swagger-codegen/src/main/resources/go/configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/go/configuration.mustache
@@ -1,12 +1,14 @@
 package {{packageName}}
 
 import (
-
+    "encoding/base64"
 )
 
 type Configuration struct {
     UserName  string  `json:"userName,omitempty"`
-    ApiKey  string  `json:"apiKey,omitempty"`
+    Password  string  `json:"password,omitempty"`
+    ApiKeyPrefix map[string] string `json:"apiKeyPrefix,omitempty"`
+    ApiKey map[string] string  `json:"apiKey,omitempty"`
     Debug  bool  `json:"debug,omitempty"`
     DebugFile  string  `json:"debugFile,omitempty"`
     OAuthToken  string  `json:"oAuthToken,omitempty"`
@@ -14,6 +16,10 @@ type Configuration struct {
     BasePath  string  `json:"basePath,omitempty"`
     Host  string  `json:"host,omitempty"`
     Scheme  string  `json:"scheme,omitempty"`
+    AccessToken string `json:"accessToken,omitempty"`
+    DefaultHeader map[string]string `json:"defaultHeader,omitempty"`
+    UserAgent string `json:"userAgent,omitempty"`
+    ApiClient ApiClient `json:"apiClient,omitempty"`
 }
 
 func NewConfiguration() *Configuration {
@@ -21,5 +27,25 @@ func NewConfiguration() *Configuration {
         BasePath: "{{basePath}}",
         UserName: "",
         Debug: false,
+        DefaultHeader: make(map[string]string),
+        ApiKey: make(map[string]string),
+        ApiKeyPrefix: make(map[string]string),
+        UserAgent: "{{#httpUserAgent}}{{{.}}}{{/httpUserAgent}}{{^httpUserAgent}}Swagger-Codegen/{{{packageVersion}}}/go{{/httpUserAgent}}",
         }
+}
+
+func (c *Configuration) GetBasicAuthEncodedString() string {
+    return base64.StdEncoding.EncodeToString([]byte(c.UserName  + ":" + c.Password))
+}
+
+func (c *Configuration) AddDefaultHeader(key string, value string) {
+    c.DefaultHeader[key] = value
+}
+
+func (c *Configuration) GetApiKeyWithPrefix(apiKeyIdentifier string) string {
+    if c.ApiKeyPrefix[apiKeyIdentifier] != ""{
+        return c.ApiKeyPrefix[apiKeyIdentifier] + " " + c.ApiKey[apiKeyIdentifier]
+    }
+        
+    return c.ApiKey[apiKeyIdentifier]
 }
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/go/model.mustache b/modules/swagger-codegen/src/main/resources/go/model.mustache
index 83ba416883d..4102299c5e9 100644
--- a/modules/swagger-codegen/src/main/resources/go/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/go/model.mustache
@@ -7,8 +7,11 @@ import (
 )
 
 {{#model}}
+{{#description}}// {{{description}}}{{/description}}
 type {{classname}} struct {
-    {{#vars}}{{name}}  {{{datatype}}}  `json:"{{baseName}},omitempty"`
+    {{#vars}}
+    {{#description}}// {{{description}}}{{/description}}
+    {{name}}  {{{datatype}}}  `json:"{{baseName}},omitempty"`
     {{/vars}}
 }
 {{/model}}
diff --git a/modules/swagger-codegen/src/main/resources/go/model_doc.mustache b/modules/swagger-codegen/src/main/resources/go/model_doc.mustache
new file mode 100644
index 00000000000..569550df372
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/go/model_doc.mustache
@@ -0,0 +1,11 @@
+{{#models}}{{#model}}# {{classname}}
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{datatype}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{datatype}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
+{{/vars}}
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+{{/model}}{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/go/pom.mustache b/modules/swagger-codegen/src/main/resources/go/pom.mustache
new file mode 100644
index 00000000000..5cfbc0428c3
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/go/pom.mustache
@@ -0,0 +1,75 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.wordnik</groupId>
+    <artifactId>Go{{packageName}}</artifactId>
+    <packaging>pom</packaging>
+    <version>{{packageVersion}}</version>
+    <name>Go{{packageName}}</name>
+ <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <id>go-get-testify</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>go</executable>
+                            <arguments>
+                                <argument>get</argument>
+                                <argument>github.com/stretchr/testify/assert</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>go-get-sling</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>go</executable>
+                            <arguments>
+                                <argument>get</argument>
+                                <argument>github.com/dghubble/sling</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>go-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>go</executable>
+                            <arguments>
+                                <argument>test</argument>
+                                <argument>-v</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/haskell-servant/API.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/API.mustache
new file mode 100644
index 00000000000..82cc63c8055
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/haskell-servant/API.mustache
@@ -0,0 +1,185 @@
+{-# LANGUAGE DataKinds, TypeFamilies, TypeOperators, FlexibleInstances, OverloadedStrings, ViewPatterns #-}
+{-# LANGUAGE RecordWildCards, GeneralizedNewtypeDeriving, DeriveTraversable, FlexibleContexts, DeriveGeneric #-}
+{-# OPTIONS_GHC -fno-warn-unused-binds -fno-warn-unused-imports -fcontext-stack={{contextStackLimit}} #-}
+module {{title}}.API (
+  -- * Client and Server
+  ServerConfig(..),
+  {{title}}Backend,
+  create{{title}}Client,
+  run{{title}}Server,
+  run{{title}}Client,
+  run{{title}}ClientWithManager,
+  {{title}}Client,
+  -- ** Servant
+  {{title}}API,
+  ) where
+
+import {{title}}.Types
+
+import Data.Aeson (Value)
+import Data.Coerce (coerce)
+import Servant.API
+import Servant (serve, ServantErr)
+import Web.HttpApiData
+import qualified Network.Wai.Handler.Warp as Warp
+import qualified Data.Text as T
+import Data.Text (Text)
+import Servant.Common.BaseUrl(BaseUrl(..))
+import Servant.Client (ServantError, client, Scheme(Http))
+import Data.Proxy (Proxy(..))
+import Control.Monad.IO.Class
+import Data.Function ((&))
+import GHC.Exts (IsString(..))
+import qualified Data.Map as Map
+import GHC.Generics (Generic)
+import Data.Monoid ((<>))
+import Servant.API.Verbs (Verb, StdMethod(..))
+import Control.Monad.Except (ExceptT)
+import Network.HTTP.Client (Manager, newManager, defaultManagerSettings)
+import Network.HTTP.Types.Method (methodOptions)
+
+instance ReflectMethod 'OPTIONS where
+  reflectMethod _ = methodOptions
+
+
+{{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}{{#hasFormParams}}
+data {{vendorExtensions.x-formName}} = {{vendorExtensions.x-formName}}
+    { {{#formParams}}{{vendorExtensions.x-formPrefix}}{{vendorExtensions.x-formParamName}} :: {{dataType}}{{#hasMore}}
+    , {{/hasMore}}{{/formParams}}
+    } deriving (Show, Eq, Generic)
+
+instance FromFormUrlEncoded {{vendorExtensions.x-formName}} where
+    fromFormUrlEncoded inputs = {{vendorExtensions.x-formName}} <$> {{#formParams}} lookupEither "{{baseName}}" inputs{{#hasMore}} <*> {{/hasMore}}{{/formParams}}
+instance ToFormUrlEncoded {{vendorExtensions.x-formName}} where
+    toFormUrlEncoded value = [{{#formParams}}("{{baseName}}", toQueryParam $ {{vendorExtensions.x-formPrefix}}{{vendorExtensions.x-formParamName}} value){{#hasMore}}, {{/hasMore}}{{/formParams}}]
+{{/hasFormParams}}{{/operation}}{{/operations}}{{/apis}}{{/apiInfo}}
+
+-- For the form data code generation.
+lookupEither :: FromHttpApiData b => Text -> [(Text, Text)] -> Either Text b
+lookupEither key assocs =
+  case lookup key assocs of
+    Nothing -> Left $ "Could not find parameter " <> key <> " in form data"
+    Just value -> parseQueryParam value
+
+{{#apiInfo}}
+-- | Servant type-level API, generated from the Swagger spec for {{title}}.
+type {{title}}API
+    =    {{#apis}}{{#operations}}{{#operation}}{{& vendorExtensions.x-routeType}} -- '{{operationId}}' route{{#hasMore}}
+    :<|> {{/hasMore}}{{/operation}}{{/operations}}{{#hasMore}}
+    :<|> {{/hasMore}}{{/apis}}
+{{/apiInfo}}
+
+-- | Server or client configuration, specifying the host and port to query or serve on.
+data ServerConfig = ServerConfig {
+    configHost :: String,  -- ^ Hostname to serve on, e.g. "127.0.0.1"
+    configPort :: Int      -- ^ Port to serve on, e.g. 8080
+  } deriving (Eq, Ord, Show, Read)
+
+-- | List of elements parsed from a query.
+newtype QueryList (p :: CollectionFormat) a = QueryList { fromQueryList :: [a] }
+  deriving (Functor, Applicative, Monad, Foldable, Traversable)
+
+-- | Formats in which a list can be encoded into a HTTP path.
+data CollectionFormat = CommaSeparated -- ^ CSV format for multiple parameters.
+                      | SpaceSeparated -- ^ Also called "SSV"
+                      | TabSeparated -- ^ Also called "TSV"
+                      | PipeSeparated -- ^ `value1|value2|value2`
+                      | MultiParamArray -- ^ Using multiple GET parameters, e.g. `foo=bar&foo=baz`. Only for GET params.
+
+instance FromHttpApiData a => FromHttpApiData (QueryList 'CommaSeparated a) where
+    parseQueryParam = parseSeparatedQueryList ','
+
+instance FromHttpApiData a => FromHttpApiData (QueryList 'TabSeparated a) where
+    parseQueryParam = parseSeparatedQueryList '\t'
+
+instance FromHttpApiData a => FromHttpApiData (QueryList 'SpaceSeparated a) where
+    parseQueryParam = parseSeparatedQueryList ' '
+
+instance FromHttpApiData a => FromHttpApiData (QueryList 'PipeSeparated a) where
+    parseQueryParam = parseSeparatedQueryList '|'
+
+instance FromHttpApiData a => FromHttpApiData (QueryList 'MultiParamArray a) where
+    parseQueryParam = error "unimplemented FromHttpApiData for MultiParamArray collection format"
+
+parseSeparatedQueryList :: FromHttpApiData a => Char -> Text -> Either Text (QueryList p a)
+parseSeparatedQueryList char = fmap QueryList . mapM parseQueryParam . T.split (== char)
+
+instance ToHttpApiData a => ToHttpApiData (QueryList 'CommaSeparated a) where
+    toQueryParam = formatSeparatedQueryList ','
+
+instance ToHttpApiData a => ToHttpApiData (QueryList 'TabSeparated a) where
+    toQueryParam = formatSeparatedQueryList '\t'
+
+instance ToHttpApiData a => ToHttpApiData (QueryList 'SpaceSeparated a) where
+    toQueryParam = formatSeparatedQueryList ' '
+
+instance ToHttpApiData a => ToHttpApiData (QueryList 'PipeSeparated a) where
+    toQueryParam = formatSeparatedQueryList '|'
+
+instance ToHttpApiData a => ToHttpApiData (QueryList 'MultiParamArray a) where
+    toQueryParam = error "unimplemented ToHttpApiData for MultiParamArray collection format"
+
+formatSeparatedQueryList :: ToHttpApiData a => Char ->  QueryList p a -> Text
+formatSeparatedQueryList char = T.intercalate (T.singleton char) . map toQueryParam . fromQueryList
+
+
+{{#apiInfo}}
+-- | Backend for {{title}}.
+-- The backend can be used both for the client and the server. The client generated from the {{title}} Swagger spec
+-- is a backend that executes actions by sending HTTP requests (see @create{{title}}Client@). Alternatively, provided
+-- a backend, the API can be served using @run{{title}}Server@.
+data {{title}}Backend m = {{title}}Backend {
+    {{#apis}}{{#operations}}{{#operation}}{{operationId}} :: {{& vendorExtensions.x-clientType}}{- ^ {{& notes}} -}{{#hasMore}},
+    {{/hasMore}}{{/operation}}{{/operations}}{{#hasMore}},
+    {{/hasMore}}{{/apis}}
+  }
+
+newtype {{title}}Client a = {{title}}Client { runClient :: Manager -> BaseUrl -> ExceptT ServantError IO a }
+    deriving Functor
+
+instance Applicative {{title}}Client where
+    pure x = {{title}}Client (\_ _ -> pure x)
+    ({{title}}Client f) <*> ({{title}}Client x) = {{title}}Client (\manager url -> f manager url <*> x manager url)
+
+instance Monad {{title}}Client where
+    ({{title}}Client a) >>= f = {{title}}Client (\manager url -> do
+        value <- a manager url
+        runClient (f value) manager url)
+
+instance MonadIO {{title}}Client where
+    liftIO io = {{title}}Client (\_ _ -> liftIO io)
+{{/apiInfo}}
+
+{{#apiInfo}}
+create{{title}}Client :: {{title}}Backend {{title}}Client
+create{{title}}Client = {{title}}Backend{..}
+  where
+    ({{#apis}}{{#operations}}{{#operation}}(coerce -> {{operationId}}){{#hasMore}} :<|>
+     {{/hasMore}}{{/operation}}{{/operations}}{{#hasMore}} :<|>
+     {{/hasMore}}{{/apis}}) = client (Proxy :: Proxy {{title}}API)
+
+-- | Run requests in the {{title}}Client monad.
+run{{title}}Client :: ServerConfig -> {{title}}Client a -> ExceptT ServantError IO a
+run{{title}}Client clientConfig cl = do
+  manager <- liftIO $ newManager defaultManagerSettings
+  run{{title}}ClientWithManager manager clientConfig cl
+
+-- | Run requests in the {{title}}Client monad using a custom manager.
+run{{title}}ClientWithManager :: Manager -> ServerConfig -> {{title}}Client a -> ExceptT ServantError IO a
+run{{title}}ClientWithManager manager clientConfig cl =
+  runClient cl manager $ BaseUrl Http (configHost clientConfig) (configPort clientConfig) ""
+{{/apiInfo}}
+
+{{#apiInfo}}
+-- | Run the {{title}} server at the provided host and port.
+run{{title}}Server :: MonadIO m => ServerConfig -> {{title}}Backend (ExceptT ServantErr IO)  -> m ()
+run{{title}}Server ServerConfig{..} backend =
+  liftIO $ Warp.runSettings warpSettings $ serve (Proxy :: Proxy {{title}}API) (serverFromBackend backend)
+
+  where
+    warpSettings = Warp.defaultSettings & Warp.setPort configPort & Warp.setHost (fromString configHost)
+    serverFromBackend {{title}}Backend{..} =
+      ({{#apis}}{{#operations}}{{#operation}}coerce {{operationId}}{{#hasMore}} :<|>
+       {{/hasMore}}{{/operation}}{{/operations}}{{#hasMore}} :<|>
+       {{/hasMore}}{{/apis}})
+{{/apiInfo}}
diff --git a/modules/swagger-codegen/src/main/resources/haskell-servant/Apis.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/Apis.mustache
deleted file mode 100644
index 3b60afafec6..00000000000
--- a/modules/swagger-codegen/src/main/resources/haskell-servant/Apis.mustache
+++ /dev/null
@@ -1,26 +0,0 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE TypeOperators #-}
-{-# LANGUAGE FlexibleInstances #-}
-module Apis (
-      api
-    , API
-    ) where
-
-{{#apiInfo}}
-{{#apis}}
-import {{package}}.{{classname}} ({{classname}})
-{{/apis}}
-{{/apiInfo}}
-
-import Data.Proxy
-import Servant.API
-import Test.QuickCheck
-import qualified Data.Map as Map
-import Utils
-
-type API = {{#apiInfo}}{{#apis}}{{classname}}{{#hasMore}} :<|> {{/hasMore}}{{/apis}}{{/apiInfo}}
-
-api :: Proxy API
-api = Proxy
diff --git a/modules/swagger-codegen/src/main/resources/haskell-servant/Client.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/Client.mustache
deleted file mode 100644
index ab48bcbc43e..00000000000
--- a/modules/swagger-codegen/src/main/resources/haskell-servant/Client.mustache
+++ /dev/null
@@ -1,35 +0,0 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE TypeOperators #-}
-
-module Main where
-
-import Control.Monad (void)
-import Control.Monad.Trans.Either
-import Control.Monad.IO.Class
-import Servant.API
-import Servant.Client
-
-import Data.List.Split (splitOn)
-import Network.URI (URI (..), URIAuth (..), parseURI)
-import Data.Maybe (fromMaybe)
-import Test.QuickCheck
-import Control.Monad
-{{#models}}
-import {{importPath}}
-{{/models}}
-{{#apiInfo}}
-{{#apis}}
-import {{package}}.{{classname}}
-{{/apis}}
-{{/apiInfo}}
-
--- userClient :: IO ()
--- userClient = do 
---     users <- sample' (arbitrary :: Gen String)
---     let user = last users
---     void . runEitherT $ do
---         getUserByName user >>= (liftIO . putStrLn . show)
-
-main :: IO ()
-main = putStrLn "Hello Server!"
diff --git a/modules/swagger-codegen/src/main/resources/haskell-servant/LICENSE b/modules/swagger-codegen/src/main/resources/haskell-servant/LICENSE
deleted file mode 100644
index b0033f5f837..00000000000
--- a/modules/swagger-codegen/src/main/resources/haskell-servant/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2015 Masahiro Yamauchi
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/modules/swagger-codegen/src/main/resources/haskell-servant/README.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/README.mustache
index c8f4b4bbb9d..67068d96ccd 100644
--- a/modules/swagger-codegen/src/main/resources/haskell-servant/README.mustache
+++ b/modules/swagger-codegen/src/main/resources/haskell-servant/README.mustache
@@ -1,7 +1,79 @@
-# Generated Servant Codes
+# Auto-Generated Swagger Bindings to `{{title}}`
 
-## How to use
+The library in `lib` provides auto-generated-from-Swagger bindings to the {{title}} API.
 
-0. Install haskell-stack
-1. stack build
-2. stack exec client
+## Installation
+
+Installation follows the standard approach to installing Stack-based projects.
+
+1. Install the [Haskell `stack` tool](http://docs.haskellstack.org/en/stable/README).
+2. Run `stack install` to install this package.
+
+## Main Interface
+
+The main interface to this library is in the `{{title}}.API` module, which exports the {{title}}Backend type. The {{title}}Backend
+type can be used to create and define servers and clients for the API.
+
+## Creating a Client
+
+A client can be created via the `create{{title}}Client` function, which, if provided with a hostname and a port, will generate
+a client that can be used to access the API if it is being served at that hostname / port combination. For example, if
+`localhost:8080` is serving the {{title}} API, you can write:
+
+```haskell
+{-# LANGUAGE RecordWildCards #-}
+
+import {{title}}.API
+
+main :: IO ()
+main = do
+  {{title}}Backend{..} <- create{{title}}Client (ServerConfig "localhost" 8080)
+  -- Any {{title}} API call can go here.
+  return ()
+```
+
+## Creating a Server
+
+In order to create a server, you must use the `run{{title}}Server` function. However, you unlike the client, in which case you *got* a `{{title}}Backend`
+from the library, you must instead *provide* a `{{title}}Backend`. For example, if you have defined handler functions for all the
+functions in `{{title}}.Handlers`, you can write:
+
+```haskell
+{-# LANGUAGE RecordWildCards #-}
+
+import {{title}}.API
+
+-- A module you wrote yourself, containing all handlers needed for the {{title}}Backend type.
+import {{title}}.Handlers
+
+-- Run a {{title}} server on localhost:8080
+main :: IO ()
+main = do
+  let server = {{title}}Backend{..}
+  run{{title}}Server (ServerConfig "localhost" 8080) server
+```
+
+You could use `optparse-applicative` or a similar library to read the host and port from command-line arguments:
+```
+{-# LANGUAGE RecordWildCards #-}
+
+module Main (main) where
+
+import {{title}}.API (run{{title}}Server, {{title}}Backend(..), ServerConfig(..))
+
+import Control.Applicative ((<$>), (<*>))
+import Options.Applicative (execParser, option, str, auto, long, metavar, help)
+
+main :: IO ()
+main = do
+  config <- parseArguments
+  run{{title}}Server config {{title}}Backend{}
+
+-- | Parse host and port from the command line arguments.
+parseArguments :: IO ServerConfig
+parseArguments =
+  execParser $
+    ServerConfig
+      <$> option str  (long "host" <> metavar "HOST" <> help "Host to serve on")
+      <*> option auto (long "port" <> metavar "PORT" <> help "Port to serve on")
+```
diff --git a/modules/swagger-codegen/src/main/resources/haskell-servant/Server.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/Server.mustache
deleted file mode 100644
index 68b4ff6ce33..00000000000
--- a/modules/swagger-codegen/src/main/resources/haskell-servant/Server.mustache
+++ /dev/null
@@ -1,13 +0,0 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE TypeOperators #-}
-
-module Main where
-
-import Apis
-import Servant
-import Servant.Mock
-import qualified Network.Wai.Handler.Warp as Warp
-
-main :: IO ()
-main = Warp.run 8080 $ serve api (mock api)
diff --git a/modules/swagger-codegen/src/main/resources/haskell-servant/Types.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/Types.mustache
new file mode 100644
index 00000000000..1ee62c02e1c
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/haskell-servant/Types.mustache
@@ -0,0 +1,65 @@
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# OPTIONS_GHC -fno-warn-unused-binds -fno-warn-unused-imports #-}
+
+module {{title}}.Types (
+{{#models}}
+{{#model}}
+    {{classname}} (..),
+{{/model}}
+{{/models}}
+    ) where
+
+import Data.List (stripPrefix)
+import Data.Maybe (fromMaybe)
+import Data.Aeson (Value, FromJSON(..), ToJSON(..), genericToJSON, genericParseJSON)
+import Data.Aeson.Types (Options(..), defaultOptions)
+import Data.Text (Text)
+import qualified Data.Text as T
+import qualified Data.Map as Map
+import GHC.Generics (Generic)
+import Data.Function ((&))
+{{#imports}}import {{import}}
+{{/imports}}
+
+{{#models}}
+{{#model}}
+
+-- | {{description}}
+{{^vendorExtensions.x-customNewtype}}
+{{^parent}}
+{{vendorExtensions.x-data}} {{classname}} = {{classname}}
+    { {{#vars}}{{& name}} :: {{datatype}} -- ^ {{& description}}{{#hasMore}}
+    , {{/hasMore}}{{/vars}}
+    } deriving (Show, Eq, Generic)
+
+instance FromJSON {{classname}} where
+  parseJSON  = genericParseJSON  (removeFieldLabelPrefix True "{{vendorExtensions.x-prefix}}")
+instance ToJSON {{classname}} where
+  toJSON     = genericToJSON     (removeFieldLabelPrefix False "{{vendorExtensions.x-prefix}}")
+{{/parent}}
+{{#parent}}
+newtype {{classname}} = {{classname}} { un{{classname}} :: {{parent}} }
+  deriving (Show, Eq, FromJSON, ToJSON, Generic)
+{{/parent}}
+{{/vendorExtensions.x-customNewtype}}
+{{#vendorExtensions.x-customNewtype}}
+newtype {{classname}} = {{classname}} {{vendorExtensions.x-customNewtype}} deriving (Show, Eq, FromJSON, ToJSON, Generic)
+{{/vendorExtensions.x-customNewtype}}
+{{/model}}
+{{/models}}
+
+-- Remove a field label prefix during JSON parsing.
+-- Also perform any replacements for special characters.
+removeFieldLabelPrefix :: Bool -> String -> Options
+removeFieldLabelPrefix forParsing prefix =
+  defaultOptions
+    { fieldLabelModifier = fromMaybe (error ("did not find prefix " ++ prefix)) . stripPrefix prefix . replaceSpecialChars
+    }
+  where
+    replaceSpecialChars field = foldl (&) field (map mkCharReplacement specialChars)
+    specialChars = [{{#specialCharReplacements}}("{{&char}}", "{{&replacement}}"){{#hasMore}}, {{/hasMore}}{{/specialCharReplacements}}]
+    mkCharReplacement (replaceStr, searchStr) = T.unpack . replacer (T.pack searchStr) (T.pack replaceStr) . T.pack
+    replacer = if forParsing then flip T.replace else T.replace
+
+
diff --git a/modules/swagger-codegen/src/main/resources/haskell-servant/Utils.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/Utils.mustache
deleted file mode 100644
index f6db2602ce8..00000000000
--- a/modules/swagger-codegen/src/main/resources/haskell-servant/Utils.mustache
+++ /dev/null
@@ -1,27 +0,0 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE TypeOperators #-}
-{-# LANGUAGE FlexibleInstances #-}
-module Utils where
-
-import GHC.Generics
-import Servant.API
-import Data.List (intercalate)
-import Data.List.Split (splitOn)
-import qualified Data.Map as Map
-import qualified Data.Text as T
-import Test.QuickCheck
-
-instance FromText [String] where
-    fromText = Just . splitOn "," . T.unpack
-
-instance ToText [String] where
-    toText = T.pack . intercalate ","
-
-lkp inputs l = case lookup l inputs of
-        Nothing -> Left $ "label " ++ T.unpack l ++ " not found"
-        Just v  -> Right $ read (T.unpack v)
-
-instance (Ord k, Arbitrary k, Arbitrary v) => Arbitrary (Map.Map k v) where
-    arbitrary = Map.fromList <$> arbitrary
diff --git a/modules/swagger-codegen/src/main/resources/haskell-servant/api.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/api.mustache
deleted file mode 100644
index c49fcd5eff8..00000000000
--- a/modules/swagger-codegen/src/main/resources/haskell-servant/api.mustache
+++ /dev/null
@@ -1,82 +0,0 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE TypeOperators #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE OverloadedStrings #-}
-
-{{#operations}}
-module {{package}}.{{classname}} (
-      {{#operation}}{{operationId}}{{#hasMore}}
-    , {{/hasMore}}{{/operation}}
-    , proxy{{classname}}
-    , {{classname}}
-    ) where
-{{/operations}}
-
-import GHC.Generics
-import Data.Proxy
-import Servant.API
-import Servant.Client
-import Network.URI (URI (..), URIAuth (..), parseURI)
-import Data.Maybe (fromMaybe)
-import Servant.Common.Text
-import Data.List (intercalate)
-import qualified Data.Text as T
-import Utils
-import Test.QuickCheck
-{{#imports}}import {{import}}
-{{/imports}}
-
-{{#operations}}
-{{#operation}}
-{{#hasFormParams}}
-data Form{{#formParams}}{{baseName}}{{/formParams}} = Form{{#formParams}}{{baseName}}{{/formParams}}
-    { {{#formParams}}{{baseName}} :: {{dataType}}{{#hasMore}}
-    , {{/hasMore}}{{/formParams}}
-    } deriving (Show, Eq, Generic)
-
-instance FromFormUrlEncoded Form{{#formParams}}{{baseName}}{{/formParams}} where
-    fromFormUrlEncoded inputs = Form{{#formParams}}{{baseName}}{{/formParams}} <$> {{#formParams}} lkp inputs "{{baseName}}"{{#hasMore}} <*> {{/hasMore}}{{/formParams}}
-instance ToFormUrlEncoded Form{{#formParams}}{{baseName}}{{/formParams}} where
-    toFormUrlEncoded x = [({{#formParams}}(T.pack $ show $ {{package}}.{{classname}}.{{baseName}} x){{#hasMore}}, {{/hasMore}}{{/formParams}})]
-instance Arbitrary Form{{#formParams}}{{baseName}}{{/formParams}} where
-    arbitrary = Form{{#formParams}}{{baseName}}{{/formParams}} <$> {{#formParams}}arbitrary{{#hasMore}} <*> {{/hasMore}}{{/formParams}}
-{{/hasFormParams}}
-
-{{/operation}}
-{{/operations}}
-
-{{#operations}}
-type {{classname}} = {{#operation}}{{& nickname}} -- {{operationId}}{{#hasMore}}
-    :<|> {{/hasMore}}{{/operation}}
-{{/operations}}
-
-proxy{{classname}} :: Proxy {{classname}}
-proxy{{classname}} = Proxy
-
-{{#operations}}
-
-serverPath :: String
-serverPath = "{{basePath}}"
-
-parseHostPort :: String -> (String, Int)
-parseHostPort path = (host,port)
-    where
-        authority = case parseURI path of
-            Just x -> uriAuthority x
-            _      -> Nothing
-        (host, port) = case authority of
-            Just y -> (uriRegName y, (getPort . uriPort) y)
-            _      -> ("localhost", 8080)
-        getPort p = case (length p) of
-            0 -> 80
-            _ -> (read . drop 1) p
-
-(host, port) = parseHostPort serverPath
-
-{{#operation}}
-{{operationId}}{{#hasMore}}
-    :<|> {{/hasMore}}{{/operation}}
-    = client proxy{{classname}} $ BaseUrl Http host port
-{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/haskell-servant/haskell-servant-codegen.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/haskell-servant-codegen.mustache
index 8b7d7fc54b2..18a29c87db1 100644
--- a/modules/swagger-codegen/src/main/resources/haskell-servant/haskell-servant-codegen.mustache
+++ b/modules/swagger-codegen/src/main/resources/haskell-servant/haskell-servant-codegen.mustache
@@ -1,62 +1,33 @@
-name:                haskell-servant-codegen
+name:                {{package}}
 version:             0.1.0.0
-synopsis:            Swagger-codegen example for Haskell servant
+synopsis:            Auto-generated API bindings for {{package}}
 description:         Please see README.md
 homepage:            https://github.com/swagger-api/swagger-codegen#readme
-license:             Apache-2.0
-license-file:        LICENSE
-author:              Masahiro Yamauchi
-maintainer:          sgt.yamauchi@gmail.com
-copyright:           2015- Masahiro Yamauchi
+author:              Author Name Here
+maintainer:          author.name@email.com
+copyright:           YEAR - AUTHOR
 category:            Web
 build-type:          Simple
--- extra-source-files:
 cabal-version:       >=1.10
 
 library
   hs-source-dirs:      lib
-  exposed-modules:     Utils{{#models}}{{#model}}
-                     , {{importPath}}{{/model}}{{/models}}
-{{#apiInfo}}
-{{#apis}}
-                     , {{package}}.{{classname}}
-{{/apis}}
-{{/apiInfo}}
-                     , Apis
+  exposed-modules:     {{title}}.API
+                     , {{title}}.Types
   ghc-options:         -Wall
   build-depends:       base
                      , aeson
                      , text
-                     , split
                      , containers
                      , network-uri
-                     , QuickCheck
                      , servant
+                     , http-api-data
                      , servant-client
-  default-language:    Haskell2010
-
-executable client
-  hs-source-dirs:      client
-  main-is:             Main.hs
-  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
-  build-depends:       base
-                     , either
-                     , transformers
-                     , split
-                     , network-uri
-                     , QuickCheck
-                     , servant
-                     , servant-client
-                     , haskell-servant-codegen
-  default-language:    Haskell2010
-
-executable server
-  hs-source-dirs:      server
-  main-is:             Main.hs
-  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
-  build-depends:       base
-                     , warp
                      , servant-server
-                     , servant-mock
-                     , haskell-servant-codegen
+                     , servant
+                     , warp
+                     , transformers
+                     , mtl
+                     , http-client
+                     , http-types
   default-language:    Haskell2010
diff --git a/modules/swagger-codegen/src/main/resources/haskell-servant/model.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/model.mustache
deleted file mode 100644
index 1f76c197ae2..00000000000
--- a/modules/swagger-codegen/src/main/resources/haskell-servant/model.mustache
+++ /dev/null
@@ -1,34 +0,0 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE TypeOperators #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-
-{{#models}}
-{{#model}}
-module {{package}}.{{classname}}
-    ( {{classname}} (..)
-    ) where
-{{/model}}
-{{/models}}
-
-import Data.Aeson
-import GHC.Generics
-import Test.QuickCheck
-{{#imports}}import {{import}}
-{{/imports}}
-
-{{#models}}
-{{#model}}
-
-data {{classname}} = {{classname}}
-    { {{#vars}}{{& name}} :: {{datatype}}{{#hasMore}}
-    , {{/hasMore}}{{/vars}}
-    } deriving (Show, Eq, Generic)
-
-instance FromJSON {{classname}}
-instance ToJSON {{classname}}
-instance Arbitrary {{classname}} where
-    arbitrary = {{classname}} <$> {{#vars}}arbitrary{{#hasMore}} <*> {{/hasMore}}{{/vars}}
-{{/model}}
-{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/haskell-servant/stack.mustache b/modules/swagger-codegen/src/main/resources/haskell-servant/stack.mustache
index 00448df3e95..bed581391ca 100644
--- a/modules/swagger-codegen/src/main/resources/haskell-servant/stack.mustache
+++ b/modules/swagger-codegen/src/main/resources/haskell-servant/stack.mustache
@@ -1,33 +1,8 @@
-# For more information, see: https://github.com/commercialhaskell/stack/blob/release/doc/yaml_configuration.md
-
-# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
-resolver: lts-3.17
-
-# Local packages, usually specified by relative directory name
+resolver: lts-5.11
+extra-deps:
+- servant-0.6
+- servant-client-0.6
+- servant-server-0.6
+- http-api-data-0.2.2
 packages:
 - '.'
-
-# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
-extra-deps:
-- servant-mock-0.4.4.6
-
-# Override default flag values for local packages and extra-deps
-flags: {}
-
-# Extra package databases containing global packages
-extra-package-dbs: []
-
-# Control whether we use the GHC we find on the path
-# system-ghc: true
-
-# Require a specific version of stack, using version ranges
-# require-stack-version: -any # Default
-# require-stack-version: >= 0.1.10.0
-
-# Override the architecture used by stack, especially useful on Windows
-# arch: i386
-# arch: x86_64
-
-# Extra directories used by stack for building
-# extra-include-dirs: [/path/to/dir]
-# extra-lib-dirs: [/path/to/dir]
diff --git a/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache b/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache
index 83cd24e72d0..fa0e662b67f 100644
--- a/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache
+++ b/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache
@@ -158,7 +158,7 @@
   <div class="model">
     <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}}<div class="param">{{name}} {{^required}}(optional){{/required}}</div><div class="param-desc"><span class="param-type">{{datatype}}</span> {{description}}</div>
       {{#isEnum}}
         <div class="param-enum-header">Enum:</div>
         {{#_enum}}<div class="param-enum">{{this}}</div>{{/_enum}}
diff --git a/modules/swagger-codegen/src/main/resources/objc/README.mustache b/modules/swagger-codegen/src/main/resources/objc/README.mustache
index 2e6ffe2f060..c0bc1178b0b 100644
--- a/modules/swagger-codegen/src/main/resources/objc/README.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/README.mustache
@@ -135,7 +135,7 @@ Class | Method | HTTP request | Description
 {{/isBasic}}
 {{#isOAuth}}- **Type**: OAuth
 - **Flow**: {{{flow}}}
-- **Authorizatoin URL**: {{{authorizationUrl}}}
+- **Authorization URL**: {{{authorizationUrl}}}
 - **Scopes**: {{^scopes}}N/A{{/scopes}}
 {{#scopes}} - **{{{scope}}}**: {{{description}}}
 {{/scopes}}
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 fdf6726dac8..7c5a9d335cf 100644
--- a/modules/swagger-codegen/src/main/resources/objc/api-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/api-header.mustache
@@ -27,7 +27,7 @@
 /// {{{summary}}}
 /// {{#notes}}{{{notes}}}{{/notes}}
 ///
-/// {{#allParams}}@param {{paramName}} {{description}}
+/// {{#allParams}}@param {{paramName}} {{description}}{{^required}} (optional){{/required}}{{#defaultValue}} (default to {{{.}}}){{/defaultValue}}
 /// {{/allParams}}
 ///
 /// @return {{{returnType}}}
diff --git a/modules/swagger-codegen/src/main/resources/objc/api_doc.mustache b/modules/swagger-codegen/src/main/resources/objc/api_doc.mustache
index 109128c1ca1..3400300c8dc 100644
--- a/modules/swagger-codegen/src/main/resources/objc/api_doc.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/api_doc.mustache
@@ -82,7 +82,7 @@ Name | Type | Description  | Notes
 
 {{^authMethods}}No authorization required{{/authMethods}}{{#authMethods}}[{{{name}}}](../README.md#{{{name}}}){{^-last}}, {{/-last}}{{/authMethods}}
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: {{#consumes}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/consumes}}{{^consumes}}Not defined{{/consumes}}
  - **Accept**: {{#produces}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/produces}}{{^produces}}Not defined{{/produces}}
diff --git a/modules/swagger-codegen/src/main/resources/perl/README.mustache b/modules/swagger-codegen/src/main/resources/perl/README.mustache
index 630a0a5979b..b312193f1cc 100644
--- a/modules/swagger-codegen/src/main/resources/perl/README.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/README.mustache
@@ -303,7 +303,7 @@ Class | Method | HTTP request | Description
 {{/isBasic}}
 {{#isOAuth}}- **Type**: OAuth
 - **Flow**: {{{flow}}}
-- **Authorizatoin URL**: {{{authorizationUrl}}}
+- **Authorization URL**: {{{authorizationUrl}}}
 - **Scopes**: {{^scopes}}N/A{{/scopes}}
 {{#scopes}}  - **{{{scope}}}**: {{{description}}}
 {{/scopes}}
diff --git a/modules/swagger-codegen/src/main/resources/perl/api.mustache b/modules/swagger-codegen/src/main/resources/perl/api.mustache
index 7e0770f332f..d96a2302a8a 100644
--- a/modules/swagger-codegen/src/main/resources/perl/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/api.mustache
@@ -81,13 +81,15 @@ sub new {
 sub {{operationId}} {
     my ($self, %args) = @_;
 
-    {{#allParams}}{{#required}}
+    {{#allParams}}
+    {{#required}}
     # verify the required parameter '{{paramName}}' is set
     unless (exists $args{'{{paramName}}'}) {
       croak("Missing the required parameter '{{paramName}}' when calling {{operationId}}");
     }
-    {{/required}}{{/allParams}}
 
+    {{/required}}
+    {{/allParams}}
     # parse inputs
     my $_resource_path = '{{path}}';
     $_resource_path =~ s/{format}/json/; # default format to json
@@ -104,54 +106,70 @@ sub {{operationId}} {
     }
     $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type({{#consumes}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/consumes}});
 
-    {{#queryParams}}# query params
+    {{#queryParams}}
+    # query params
     if ( exists $args{'{{paramName}}'}) {
         $query_params->{'{{baseName}}'} = $self->{api_client}->to_query_value($args{'{{paramName}}'});
-    }{{/queryParams}}
-    {{#headerParams}}# header params
+    }
+
+    {{/queryParams}}
+    {{#headerParams}}
+    # header params
     if ( exists $args{'{{paramName}}'}) {
         $header_params->{'{{baseName}}'} = $self->{api_client}->to_header_value($args{'{{paramName}}'});
-    }{{/headerParams}}
-    {{#pathParams}}# path params
+    }
+
+    {{/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
+    }
+
+    {{/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}}
+    }
+    
+    {{/formParams}}
     my $_body_data;
-    {{#bodyParams}}# body params
+    {{#bodyParams}}
+    # body params
     if ( exists $args{'{{paramName}}'}) {
         $_body_data = $args{'{{paramName}}'};
-    }{{/bodyParams}}
+    }
 
+    {{/bodyParams}}
     # authentication setting, if any
     my $auth_settings = [qw({{#authMethods}}{{name}} {{/authMethods}})];
 
     # make the API Call
-    {{#returnType}}my $response = $self->{api_client}->call_api($_resource_path, $_method,
+    {{#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,
+    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}}
 
 1;
diff --git a/modules/swagger-codegen/src/main/resources/perl/api_doc.mustache b/modules/swagger-codegen/src/main/resources/perl/api_doc.mustache
index eb270b7e216..c68934ece2a 100644
--- a/modules/swagger-codegen/src/main/resources/perl/api_doc.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/api_doc.mustache
@@ -65,7 +65,7 @@ Name | Type | Description  | Notes
 
 {{^authMethods}}No authorization required{{/authMethods}}{{#authMethods}}[{{{name}}}](../README.md#{{{name}}}){{^-last}}, {{/-last}}{{/authMethods}}
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: {{#consumes}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/consumes}}{{^consumes}}Not defined{{/consumes}}
  - **Accept**: {{#produces}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/produces}}{{^produces}}Not defined{{/produces}}
diff --git a/modules/swagger-codegen/src/main/resources/perl/object.mustache b/modules/swagger-codegen/src/main/resources/perl/object.mustache
index 79c59cebaf3..126c6409c7f 100644
--- a/modules/swagger-codegen/src/main/resources/perl/object.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/object.mustache
@@ -30,14 +30,15 @@ __PACKAGE__->class_documentation({description => '{{description}}',
 }                                 );
 
 __PACKAGE__->method_documentation({
-    {{#vars}}'{{name}}' => {
+{{#vars}}
+    '{{name}}' => {
     	datatype => '{{datatype}}',
     	base_name => '{{baseName}}',
     	description => '{{description}}',
     	format => '{{format}}',
     	read_only => '{{readOnly}}',
     		},
-    {{/vars}}
+{{/vars}}
 });
 
 __PACKAGE__->swagger_types( {
diff --git a/modules/swagger-codegen/src/main/resources/php/README.mustache b/modules/swagger-codegen/src/main/resources/php/README.mustache
index 8275c4c9d7c..e64b0bf22c6 100644
--- a/modules/swagger-codegen/src/main/resources/php/README.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/README.mustache
@@ -116,7 +116,7 @@ Class | Method | HTTP request | Description
 {{/isBasic}}
 {{#isOAuth}}- **Type**: OAuth
 - **Flow**: {{{flow}}}
-- **Authorizatoin URL**: {{{authorizationUrl}}}
+- **Authorization URL**: {{{authorizationUrl}}}
 - **Scopes**: {{^scopes}}N/A{{/scopes}}
 {{#scopes}} - **{{{scope}}}**: {{{description}}}
 {{/scopes}}
diff --git a/modules/swagger-codegen/src/main/resources/php/api_doc.mustache b/modules/swagger-codegen/src/main/resources/php/api_doc.mustache
index bb55e80604c..ba3529e969c 100644
--- a/modules/swagger-codegen/src/main/resources/php/api_doc.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/api_doc.mustache
@@ -61,7 +61,7 @@ Name | Type | Description  | Notes
 
 {{^authMethods}}No authorization required{{/authMethods}}{{#authMethods}}[{{{name}}}](../README.md#{{{name}}}){{^-last}}, {{/-last}}{{/authMethods}}
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: {{#consumes}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/consumes}}{{^consumes}}Not defined{{/consumes}}
  - **Accept**: {{#produces}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/produces}}{{^produces}}Not defined{{/produces}}
diff --git a/modules/swagger-codegen/src/main/resources/php/model.mustache b/modules/swagger-codegen/src/main/resources/php/model.mustache
index f19787f50b0..6f292e854af 100644
--- a/modules/swagger-codegen/src/main/resources/php/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/model.mustache
@@ -48,6 +48,12 @@ use \ArrayAccess;
  */
 class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}implements ArrayAccess
 {
+    /**
+      * The original name of the model.
+      * @var string
+      */
+    static $swaggerModelName = '{{name}}';
+
     /**
       * Array of property to type mappings. Used for (de)serialization 
       * @var string[]
@@ -115,6 +121,11 @@ class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}implements ArrayA
     public function __construct(array $data = null)
     {
         {{#parent}}parent::__construct($data);{{/parent}}
+        {{#discriminator}}// Initialize discriminator property with the model name.
+        $discrimintor = array_search('{{discriminator}}', self::$attributeMap);
+        $this->{$discrimintor} = static::$swaggerModelName;
+        {{/discriminator}}
+
         if ($data != null) {
             {{#vars}}$this->{{name}} = $data["{{name}}"];{{#hasMore}}
             {{/hasMore}}{{/vars}}
diff --git a/modules/swagger-codegen/src/main/resources/python/README.mustache b/modules/swagger-codegen/src/main/resources/python/README.mustache
index a1ba2f0d298..8fe1045f661 100644
--- a/modules/swagger-codegen/src/main/resources/python/README.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/README.mustache
@@ -108,7 +108,7 @@ Class | Method | HTTP request | Description
 {{/isBasic}}
 {{#isOAuth}}- **Type**: OAuth
 - **Flow**: {{{flow}}}
-- **Authorizatoin URL**: {{{authorizationUrl}}}
+- **Authorization URL**: {{{authorizationUrl}}}
 - **Scopes**: {{^scopes}}N/A{{/scopes}}
 {{#scopes}} - **{{{scope}}}**: {{{description}}}
 {{/scopes}}
diff --git a/modules/swagger-codegen/src/main/resources/python/api_doc.mustache b/modules/swagger-codegen/src/main/resources/python/api_doc.mustache
index b4f921fa870..99a05f8c43d 100644
--- a/modules/swagger-codegen/src/main/resources/python/api_doc.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/api_doc.mustache
@@ -63,7 +63,7 @@ Name | Type | Description  | Notes
 
 {{^authMethods}}No authorization required{{/authMethods}}{{#authMethods}}[{{{name}}}](../README.md#{{{name}}}){{^-last}}, {{/-last}}{{/authMethods}}
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: {{#consumes}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/consumes}}{{^consumes}}Not defined{{/consumes}}
  - **Accept**: {{#produces}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/produces}}{{^produces}}Not defined{{/produces}}
diff --git a/modules/swagger-codegen/src/main/resources/ruby/README.mustache b/modules/swagger-codegen/src/main/resources/ruby/README.mustache
index 164285e1533..7f54eef9e69 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/README.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/README.mustache
@@ -119,7 +119,7 @@ Class | Method | HTTP request | Description
 {{/isBasic}}
 {{#isOAuth}}- **Type**: OAuth
 - **Flow**: {{flow}}
-- **Authorizatoin URL**: {{authorizationUrl}}
+- **Authorization URL**: {{authorizationUrl}}
 - **Scopes**: {{^scopes}}N/A{{/scopes}}
 {{#scopes}}  - {{scope}}: {{description}}
 {{/scopes}}
diff --git a/modules/swagger-codegen/src/main/resources/ruby/api_doc.mustache b/modules/swagger-codegen/src/main/resources/ruby/api_doc.mustache
index 6d36e7dfe89..169920a4bc3 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/api_doc.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/api_doc.mustache
@@ -68,7 +68,7 @@ Name | Type | Description  | Notes
 
 {{^authMethods}}No authorization required{{/authMethods}}{{#authMethods}}[{{name}}](../README.md#{{name}}){{^-last}}, {{/-last}}{{/authMethods}}
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: {{#consumes}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/consumes}}{{^consumes}}Not defined{{/consumes}}
  - **Accept**: {{#produces}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/produces}}{{^produces}}Not defined{{/produces}}
diff --git a/modules/swagger-codegen/src/main/resources/ruby/model.mustache b/modules/swagger-codegen/src/main/resources/ruby/model.mustache
index 373a0634be2..5b7b617481f 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/model.mustache
@@ -23,7 +23,8 @@ module {{moduleName}}{{#models}}{{#model}}{{#description}}
     # Attribute type mapping.
     def self.swagger_types
       {
-        {{#vars}}:'{{{name}}}' => :'{{{datatype}}}'{{#hasMore}},{{/hasMore}}
+        {{#vars}}
+        :'{{{name}}}' => :'{{{datatype}}}'{{#hasMore}},{{/hasMore}}
         {{/vars}}
       }
     end
diff --git a/modules/swagger-codegen/src/main/resources/scala/api.mustache b/modules/swagger-codegen/src/main/resources/scala/api.mustache
index 41b58374dea..6345cd876c8 100644
--- a/modules/swagger-codegen/src/main/resources/scala/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/scala/api.mustache
@@ -44,14 +44,14 @@ class {{classname}}(val defBasePath: String = "{{basePath}}",
     val headerParams = new HashMap[String, String]
     val formParams = new HashMap[String, String]
 
-    {{#requiredParamCount}}
-    // verify required params are set
-    (List({{/requiredParamCount}}{{#requiredParams}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/requiredParams}}{{#requiredParamCount}}).filter(_ != null)).size match {
-       case {{requiredParamCount}} => // all required values set
-       case _ => throw new Exception("missing required params")
-    }
-    {{/requiredParamCount}}
+    {{#allParams}}
+    {{#required}}
+    {{^isPrimitiveType}}
+    if ({{paramName}} == null) throw new Exception("Missing required parameter '{{paramName}}' when calling {{classname}}->{{operationId}}")
 
+    {{/isPrimitiveType}}
+    {{/required}}
+    {{/allParams}}
     {{#queryParams}}if(String.valueOf({{paramName}}) != "null") queryParams += "{{baseName}}" -> {{paramName}}.toString
     {{/queryParams}}
     
@@ -71,7 +71,8 @@ class {{classname}}(val defBasePath: String = "{{basePath}}",
       postBody = mp
     }
     else {
-      {{#formParams}}{{#notFile}}formParams += "{{baseName}}" -> {{paramName}}.toString(){{/notFile}}
+      {{#formParams}}
+      {{#notFile}}formParams += "{{baseName}}" -> {{paramName}}.toString(){{/notFile}}
       {{/formParams}}
     }
 
@@ -87,6 +88,7 @@ class {{classname}}(val defBasePath: String = "{{basePath}}",
       case ex: ApiException => throw ex
     }
   }
+
   {{/operation}}
 }
 {{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/scalatra/model.mustache b/modules/swagger-codegen/src/main/resources/scalatra/model.mustache
index 8c5d1954662..e9dac65dd79 100644
--- a/modules/swagger-codegen/src/main/resources/scalatra/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/scalatra/model.mustache
@@ -7,9 +7,8 @@ package {{package}}
 
 {{#model}}
 case class {{classname}} (
-  {{#vars}}{{name}}: {{#isNotRequired}}Option[{{/isNotRequired}}{{datatype}}{{#isNotRequired}}] {{#description}}  // {{description}}{{/description}}
-  {{/isNotRequired}}{{#hasMore}},
-  {{/hasMore}}{{/vars}}
+  {{#vars}}{{name}}: {{^required}}Option[{{/required}}{{datatype}}{{^required}}]{{/required}}{{#hasMore}},{{/hasMore}}{{#description}}  // {{description}}{{/description}}
+  {{/vars}}
 )
 {{/model}}
-{{/models}}
\ No newline at end of file
+{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/swift/AlamofireImplementations.mustache b/modules/swagger-codegen/src/main/resources/swift/AlamofireImplementations.mustache
index 6b4d36f9410..2faa0a6f24d 100644
--- a/modules/swagger-codegen/src/main/resources/swift/AlamofireImplementations.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift/AlamofireImplementations.mustache
@@ -75,7 +75,7 @@ class AlamofireRequestBuilder<T>: RequestBuilder<T> {
             request.authenticate(usingCredential: credential)
         }
 
-        request.responseJSON(options: .AllowFragments) { response in
+        request.validate().responseJSON(options: .AllowFragments) { response in
             managerStore.removeValueForKey(managerId)
 
             if response.result.isFailure {
diff --git a/modules/swagger-codegen/src/main/resources/swift/Models.mustache b/modules/swagger-codegen/src/main/resources/swift/Models.mustache
index 31cb4a2e219..795fdd3d5e7 100644
--- a/modules/swagger-codegen/src/main/resources/swift/Models.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift/Models.mustache
@@ -130,11 +130,11 @@ class Decoders {
                 fatalError("formatter failed to parse \(source)")
             } {{#models}}{{#model}}
 
-			// Decoder for [{{{classname}}}]
+            // Decoder for [{{{classname}}}]
             Decoders.addDecoder(clazz: [{{{classname}}}].self) { (source: AnyObject) -> [{{{classname}}}] in
                 return Decoders.decode(clazz: [{{{classname}}}].self, source: source)
             }
-			// Decoder for {{{classname}}}
+            // Decoder for {{{classname}}}
             Decoders.addDecoder(clazz: {{{classname}}}.self) { (source: AnyObject) -> {{{classname}}} in
                 let sourceDictionary = source as! [NSObject:AnyObject]
                 let instance = {{classname}}(){{#vars}}{{#isEnum}}
diff --git a/modules/swagger-codegen/src/main/resources/swift/api.mustache b/modules/swagger-codegen/src/main/resources/swift/api.mustache
index ada4ec90d36..195fb88aeed 100644
--- a/modules/swagger-codegen/src/main/resources/swift/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift/api.mustache
@@ -23,7 +23,7 @@ public class {{classname}}: APIBase {
      - parameter {{paramName}}: ({{#isFormParam}}form{{/isFormParam}}{{#isQueryParam}}query{{/isQueryParam}}{{#isPathParam}}path{{/isPathParam}}{{#isHeaderParam}}header{{/isHeaderParam}}{{#isBodyParam}}body{{/isBodyParam}}) {{description}} {{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{/allParams}}
      - parameter completion: completion handler to receive the data and the error objects
      */
-    public class func {{operationId}}({{#allParams}}{{^secondaryParam}}{{paramName}} {{/secondaryParam}}{{paramName}}: {{{dataType}}}{{^required}}?{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{#hasParams}}, {{/hasParams}}completion: (({{#returnType}}data: {{{returnType}}}?, {{/returnType}}error: ErrorType?) -> Void)) {
+    public class func {{operationId}}({{#allParams}}{{^secondaryParam}}{{paramName}} {{/secondaryParam}}{{paramName}}: {{{dataType}}}{{^required}}? = nil{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{#hasParams}}, {{/hasParams}}completion: (({{#returnType}}data: {{{returnType}}}?, {{/returnType}}error: ErrorType?) -> Void)) {
         {{operationId}}WithRequestBuilder({{#allParams}}{{paramName}}: {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}).execute { (response, error) -> Void in
             completion({{#returnType}}data: response?.body, {{/returnType}}error: error);
         }
@@ -37,7 +37,7 @@ public class {{classname}}: APIBase {
      - parameter {{paramName}}: ({{#isFormParam}}form{{/isFormParam}}{{#isQueryParam}}query{{/isQueryParam}}{{#isPathParam}}path{{/isPathParam}}{{#isHeaderParam}}header{{/isHeaderParam}}{{#isBodyParam}}body{{/isBodyParam}}) {{description}} {{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{/allParams}}
      - returns: Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}>
      */
-    public class func {{operationId}}({{#allParams}}{{^secondaryParam}}{{paramName}} {{/secondaryParam}}{{paramName}}: {{{dataType}}}{{^required}}?{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {
+    public class func {{operationId}}({{#allParams}}{{^secondaryParam}}{{paramName}} {{/secondaryParam}}{{paramName}}: {{{dataType}}}{{^required}}? = nil{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {
         let deferred = Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}>.pendingPromise()
         {{operationId}}({{#allParams}}{{paramName}}: {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) { {{#returnType}}data, {{/returnType}}error in
             if let error = error {
@@ -69,7 +69,7 @@ public class {{classname}}: APIBase {
 
      - returns: RequestBuilder<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{description}}
      */
-    public class func {{operationId}}WithRequestBuilder({{#allParams}}{{^secondaryParam}}{{paramName}} {{/secondaryParam}}{{paramName}}: {{{dataType}}}{{^required}}?{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> RequestBuilder<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {
+    public class func {{operationId}}WithRequestBuilder({{#allParams}}{{^secondaryParam}}{{paramName}} {{/secondaryParam}}{{paramName}}: {{{dataType}}}{{^required}}? = nil{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> RequestBuilder<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {
         {{^pathParams}}let{{/pathParams}}{{#pathParams}}{{^secondaryParam}}var{{/secondaryParam}}{{/pathParams}} path = "{{path}}"{{#pathParams}}
         path = path.stringByReplacingOccurrencesOfString("{{=<% %>=}}{<%paramName%>}<%={{ }}=%>", withString: "\({{paramName}})", options: .LiteralSearch, range: nil){{/pathParams}}
         let URLString = {{projectName}}API.basePath + path
diff --git a/modules/swagger-codegen/src/main/resources/swift/model.mustache b/modules/swagger-codegen/src/main/resources/swift/model.mustache
index 7e2f99a9de8..3c0a47c2987 100644
--- a/modules/swagger-codegen/src/main/resources/swift/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift/model.mustache
@@ -11,15 +11,23 @@ import Foundation
 
 /** {{description}} */{{/description}}
 public class {{classname}}: JSONEncodable {
-{{#vars}}{{#isEnum}}
+{{#vars}}
+{{#isEnum}}
     public enum {{datatypeWithEnum}}: String { {{#allowableValues}}{{#values}}
         case {{enum}} = "{{raw}}"{{/values}}{{/allowableValues}}
     }
-    {{/isEnum}}{{/vars}}
-    {{#vars}}{{#isEnum}}{{#description}}/** {{description}} */
-    {{/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}}
+{{/isEnum}}
+{{/vars}}
+{{#vars}}
+{{#isEnum}}
+    {{#description}}/** {{description}} */
+    {{/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}}
 
     public init() {}
 
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/CodegenTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/CodegenTest.java
index 4b422bb3c63..bd0fcc168cd 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/CodegenTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/CodegenTest.java
@@ -102,16 +102,18 @@ public class CodegenTest {
     public void enumQueryParameterTest() {
         final Swagger model = parseAndPrepareSwagger("src/test/resources/2_0/petstore.json");
         final DefaultCodegen codegen = new DefaultCodegen();
-        final String path = "/store/findByStatus";
+        final String path = "/pet/findByStatus";
         final Operation p = model.getPaths().get(path).getGet();
         final CodegenOperation op = codegen.fromOperation(path, "get", p, model.getDefinitions());
 
         Assert.assertEquals(op.queryParams.size(), 1);
 
         final CodegenParameter statusParam = op.queryParams.get(0);
-        Assert.assertEquals(statusParam.datatypeWithEnum, "StatusEnum");
-        Assert.assertTrue(statusParam.isEnum);
-        Assert.assertEquals(statusParam._enum.size(), 3);
+        Assert.assertEquals(statusParam.datatypeWithEnum, "List");
+        Assert.assertEquals(statusParam.baseType, "String");
+        // currently there's no way to tell if the inner type of a list is a enum
+        //Assert.assertTrue(statusParam.isEnum);
+        //Assert.assertEquals(statusParam._enum.size(), 3);
     }
 
 
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/go/GoClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/go/GoClientOptionsTest.java
new file mode 100644
index 00000000000..528666c58e5
--- /dev/null
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/go/GoClientOptionsTest.java
@@ -0,0 +1,35 @@
+package io.swagger.codegen.Go;
+
+import io.swagger.codegen.AbstractOptionsTest;
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.languages.GoClientCodegen;
+import io.swagger.codegen.options.GoClientOptionsProvider;
+
+import mockit.Expectations;
+import mockit.Tested;
+
+public class GoClientOptionsTest extends AbstractOptionsTest {
+
+    @Tested
+    private GoClientCodegen clientCodegen;
+
+    public GoClientOptionsTest() {
+        super(new GoClientOptionsProvider());
+    }
+
+    @Override
+    protected CodegenConfig getCodegenConfig() {
+        return clientCodegen;
+    }
+
+    @SuppressWarnings("unused")
+    @Override
+    protected void setExpectations() {
+        new Expectations(clientCodegen) {{
+            clientCodegen.setPackageVersion(GoClientOptionsProvider.PACKAGE_VERSION_VALUE);
+            times = 1;
+            clientCodegen.setPackageName(GoClientOptionsProvider.PACKAGE_NAME_VALUE);
+            times = 1;                        
+        }};
+    }
+}
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/go/GoModelTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/go/GoModelTest.java
new file mode 100644
index 00000000000..83fa8d6437e
--- /dev/null
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/go/GoModelTest.java
@@ -0,0 +1,268 @@
+package io.swagger.codegen.Go;
+
+import io.swagger.codegen.CodegenModel;
+import io.swagger.codegen.CodegenProperty;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.languages.GoClientCodegen;
+import io.swagger.models.ArrayModel;
+import io.swagger.models.Model;
+import io.swagger.models.ModelImpl;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.DateTimeProperty;
+import io.swagger.models.properties.LongProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.RefProperty;
+import io.swagger.models.properties.StringProperty;
+
+import com.google.common.collect.Sets;
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+@SuppressWarnings("static-method")
+public class GoModelTest {
+
+    @Test(description = "convert a simple Go model")
+    public void simpleModelTest() {
+        final Model model = new ModelImpl()
+                .description("a sample model")
+                .property("id", new LongProperty())
+                .property("name", new StringProperty())
+                .property("createdAt", new DateTimeProperty())
+                .required("id")
+                .required("name");
+        final DefaultCodegen codegen = new GoClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "a sample model");
+        Assert.assertEquals(cm.vars.size(), 3);
+        Assert.assertEquals(cm.imports.size(), 1);
+
+        final CodegenProperty property1 = cm.vars.get(0);
+        Assert.assertEquals(property1.baseName, "id");
+        Assert.assertEquals(property1.datatype, "int64");
+        Assert.assertEquals(property1.name, "Id");
+        Assert.assertEquals(property1.defaultValue, "null");
+        Assert.assertEquals(property1.baseType, "int64");
+        Assert.assertTrue(property1.hasMore);
+        Assert.assertTrue(property1.required);
+        Assert.assertTrue(property1.isPrimitiveType);
+        Assert.assertTrue(property1.isNotContainer);
+
+        final CodegenProperty property2 = cm.vars.get(1);
+        Assert.assertEquals(property2.baseName, "name");
+        Assert.assertEquals(property2.datatype, "string");
+        Assert.assertEquals(property2.name, "Name");
+        Assert.assertEquals(property2.defaultValue, "null");
+        Assert.assertEquals(property2.baseType, "string");
+        Assert.assertTrue(property2.hasMore);
+        Assert.assertTrue(property2.required);
+        Assert.assertTrue(property2.isPrimitiveType);
+        Assert.assertTrue(property2.isNotContainer);
+
+        final CodegenProperty property3 = cm.vars.get(2);
+        Assert.assertEquals(property3.baseName, "createdAt");
+        Assert.assertEquals(property3.complexType, "time.Time");
+        Assert.assertEquals(property3.datatype, "time.Time");
+        Assert.assertEquals(property3.name, "CreatedAt");
+        Assert.assertEquals(property3.defaultValue, "null");
+        Assert.assertEquals(property3.baseType, "time.Time");
+        Assert.assertNull(property3.hasMore);
+        Assert.assertNull(property3.required);
+        Assert.assertTrue(property3.isNotContainer);
+    }
+
+    @Test(description = "convert a model with list property")
+    public void listPropertyTest() {
+        final Model model = new ModelImpl()
+                .description("a sample model")
+                .property("id", new LongProperty())
+                .property("urls", new ArrayProperty()
+                        .items(new StringProperty()))
+                .required("id");
+        final DefaultCodegen codegen = new GoClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "a sample model");
+        Assert.assertEquals(cm.vars.size(), 2);
+
+        final CodegenProperty property1 = cm.vars.get(0);
+        Assert.assertEquals(property1.baseName, "id");
+        Assert.assertEquals(property1.datatype, "int64");
+        Assert.assertEquals(property1.name, "Id");
+        Assert.assertEquals(property1.defaultValue, "null");
+        Assert.assertEquals(property1.baseType, "int64");
+        Assert.assertTrue(property1.hasMore);
+        Assert.assertTrue(property1.required);
+        Assert.assertTrue(property1.isPrimitiveType);
+        Assert.assertTrue(property1.isNotContainer);
+
+        final CodegenProperty property2 = cm.vars.get(1);
+        Assert.assertEquals(property2.baseName, "urls");
+        Assert.assertEquals(property2.datatype, "[]string");
+        Assert.assertEquals(property2.name, "Urls");
+        Assert.assertEquals(property2.baseType, "array");
+        Assert.assertNull(property2.hasMore);
+        Assert.assertEquals(property2.containerType, "array");
+        Assert.assertNull(property2.required);
+        Assert.assertTrue(property2.isPrimitiveType);
+        Assert.assertTrue(property2.isContainer);
+    }
+
+    @Test(description = "convert a model with a map property")
+    public void mapPropertyTest() {
+        final Model model = new ModelImpl()
+                .description("a sample model")
+                .property("translations", new MapProperty()
+                        .additionalProperties(new StringProperty()))
+                .required("id");
+        final DefaultCodegen codegen = new GoClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "a sample model");
+        Assert.assertEquals(cm.vars.size(), 1);
+
+        final CodegenProperty property1 = cm.vars.get(0);
+        Assert.assertEquals(property1.baseName, "translations");
+        Assert.assertEquals(property1.datatype, "map[string]string");
+        Assert.assertEquals(property1.name, "Translations");
+        Assert.assertEquals(property1.baseType, "map");
+        Assert.assertEquals(property1.containerType, "map");
+        Assert.assertNull(property1.required);
+        Assert.assertTrue(property1.isContainer);
+        Assert.assertTrue(property1.isPrimitiveType);
+    }
+
+    @Test(description = "convert a model with complex property")
+    public void complexPropertyTest() {
+        final Model model = new ModelImpl()
+                .description("a sample model")
+                .property("children", new RefProperty("#/definitions/Children"));
+        final DefaultCodegen codegen = new GoClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "a sample model");
+        Assert.assertEquals(cm.vars.size(), 1);
+
+        final CodegenProperty property1 = cm.vars.get(0);
+        Assert.assertEquals(property1.baseName, "children");
+        Assert.assertEquals(property1.datatype, "Children");
+        Assert.assertEquals(property1.name, "Children");
+        Assert.assertEquals(property1.baseType, "Children");
+        Assert.assertNull(property1.required);
+        Assert.assertTrue(property1.isNotContainer);
+    }
+
+    @Test(description = "convert a model with complex list property")
+    public void complexListProperty() {
+        final Model model = new ModelImpl()
+                .description("a sample model")
+                .property("children", new ArrayProperty()
+                        .items(new RefProperty("#/definitions/Children")));
+        final DefaultCodegen codegen = new GoClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "a sample model");
+        Assert.assertEquals(cm.vars.size(), 1);
+
+        final CodegenProperty property1 = cm.vars.get(0);
+        Assert.assertEquals(property1.baseName, "children");
+        Assert.assertEquals(property1.datatype, "[]Children");
+        Assert.assertEquals(property1.name, "Children");
+        Assert.assertEquals(property1.baseType, "array");
+        Assert.assertEquals(property1.containerType, "array");
+        Assert.assertNull(property1.required);
+        Assert.assertTrue(property1.isContainer);
+    }
+
+    @Test(description = "convert a model with complex map property")
+    public void complexMapProperty() {
+        final Model model = new ModelImpl()
+                .description("a sample model")
+                .property("children", new MapProperty()
+                        .additionalProperties(new RefProperty("#/definitions/Children")));
+        final DefaultCodegen codegen = new GoClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "a sample model");
+        Assert.assertEquals(cm.vars.size(), 1);
+        Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("Children")).size(), 1);
+
+        final CodegenProperty property1 = cm.vars.get(0);
+        Assert.assertEquals(property1.baseName, "children");
+        Assert.assertEquals(property1.complexType, "Children");
+        Assert.assertEquals(property1.datatype, "map[string]Children");
+        Assert.assertEquals(property1.name, "Children");
+        Assert.assertEquals(property1.baseType, "map");
+        Assert.assertEquals(property1.containerType, "map");
+        Assert.assertNull(property1.required);
+        Assert.assertTrue(property1.isContainer);
+        Assert.assertNull(property1.isNotContainer);
+    }
+
+    @Test(description = "convert an array model")
+    public void arrayModelTest() {
+        final Model model = new ArrayModel()
+                .description("an array model")
+                .items(new RefProperty("#/definitions/Children"));
+        final DefaultCodegen codegen = new GoClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "an array model");
+        Assert.assertEquals(cm.vars.size(), 0);
+        Assert.assertEquals(cm.imports.size(), 1);
+    }
+
+    @Test(description = "convert an map model")
+    public void mapModelTest() {
+        final Model model = new ModelImpl()
+                .description("a map model")
+                .additionalProperties(new RefProperty("#/definitions/Children"));
+        final DefaultCodegen codegen = new GoClientCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Assert.assertEquals(cm.name, "sample");
+        Assert.assertEquals(cm.classname, "Sample");
+        Assert.assertEquals(cm.description, "a map model");
+        Assert.assertEquals(cm.vars.size(), 0);
+        Assert.assertEquals(cm.imports.size(), 1);
+        Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("Children")).size(), 1);
+    }
+
+    @DataProvider(name = "modelNames")
+    public static Object[][] primeNumbers() {
+        return new Object[][] {
+            {"sample", "Sample"},
+            {"sample_name", "SampleName"},
+            {"sample__name", "SampleName"},
+            {"/sample", "Sample"},
+            {"\\sample", "Sample"},
+            {"sample.name", "SampleName"},
+            {"_sample", "Sample"},
+        };
+    }
+
+    @Test(dataProvider = "modelNames", description = "avoid inner class")
+    public void modelNameTest(String name, String expectedName) {
+        final Model model = new ModelImpl();
+        final DefaultCodegen codegen = new GoClientCodegen();
+        final CodegenModel cm = codegen.fromModel(name, model);
+
+        Assert.assertEquals(cm.name, name);
+        Assert.assertEquals(cm.classname, expectedName);
+    }
+}
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/GoClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/GoClientOptionsProvider.java
new file mode 100644
index 00000000000..304d8acf457
--- /dev/null
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/GoClientOptionsProvider.java
@@ -0,0 +1,33 @@
+package io.swagger.codegen.options;
+
+import io.swagger.codegen.CodegenConstants;
+import io.swagger.codegen.languages.GoClientCodegen;
+
+import com.google.common.collect.ImmutableMap;
+
+import java.util.Map;
+
+public class GoClientOptionsProvider implements OptionsProvider {
+
+    public static final String PACKAGE_VERSION_VALUE = "1.0.0";
+    public static final String PACKAGE_NAME_VALUE = "Go";
+
+    @Override
+    public String getLanguage() {
+        return "go";
+    }
+
+    @Override
+    public Map<String, String> createOptions() {
+        ImmutableMap.Builder<String, String> builder = new ImmutableMap.Builder<String, String>();
+        return builder
+                .put(CodegenConstants.PACKAGE_VERSION, PACKAGE_VERSION_VALUE)
+                .put(CodegenConstants.PACKAGE_NAME, PACKAGE_NAME_VALUE)
+                .build();
+    }
+
+    @Override
+    public boolean isServer() {
+        return false;
+    }
+}
diff --git a/modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
new file mode 100644
index 00000000000..bf84cf9c38c
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
@@ -0,0 +1,792 @@
+swagger: '2.0'
+info:
+  description: 'This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.'
+  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
+tags:
+  - name: pet
+    description: Everything about your Pets
+    externalDocs:
+      description: Find out more
+      url: 'http://swagger.io'
+  - name: store
+    description: Access to Petstore orders
+  - name: user
+    description: Operations about user
+    externalDocs:
+      description: Find out more about our store
+      url: 'http://swagger.io'
+schemes:
+  - http
+paths:
+  /pet:
+    post:
+      tags:
+        - pet
+      summary: Add a new pet to the store
+      description: ''
+      operationId: addPet
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - in: body
+          name: body
+          description: Pet object that needs to be added to the store
+          required: true
+          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/xml
+        - application/json
+      parameters:
+        - in: body
+          name: body
+          description: Pet object that needs to be added to the store
+          required: true
+          schema:
+            $ref: '#/definitions/Pet'
+      responses:
+        '400':
+          description: Invalid ID supplied
+        '404':
+          description: Pet not found
+        '405':
+          description: Validation exception
+      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 separated strings
+      operationId: findPetsByStatus
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - name: status
+          in: query
+          description: Status values that need to be considered for filter
+          required: true
+          type: array
+          items:
+            type: string
+            enum:
+              - available
+              - pending
+              - sold
+            default: available
+          collectionFormat: csv
+      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: 'Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.'
+      operationId: findPetsByTags
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - name: tags
+          in: query
+          description: Tags to filter by
+          required: true
+          type: array
+          items:
+            type: string
+          collectionFormat: csv
+      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 single pet
+      operationId: getPetById
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - name: petId
+          in: path
+          description: ID of pet to return
+          required: true
+          type: integer
+          format: int64
+      responses:
+        '200':
+          description: successful operation
+          schema:
+            $ref: '#/definitions/Pet'
+        '400':
+          description: Invalid ID supplied
+        '404':
+          description: Pet not found
+      security:
+        - api_key: []
+    post:
+      tags:
+        - pet
+      summary: Updates a pet in the store with form data
+      description: ''
+      operationId: updatePetWithForm
+      consumes:
+        - application/x-www-form-urlencoded
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - name: petId
+          in: path
+          description: ID of pet that needs to be updated
+          required: true
+          type: integer
+          format: int64
+        - 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/xml
+        - application/json
+      parameters:
+        - name: api_key
+          in: header
+          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
+      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:
+        '200':
+          description: successful operation
+          schema:
+            $ref: '#/definitions/ApiResponse'
+      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
+      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/xml
+        - application/json
+      parameters:
+        - in: body
+          name: body
+          description: order placed for purchasing the pet
+          required: true
+          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/xml
+        - application/json
+      parameters:
+        - name: orderId
+          in: path
+          description: ID of pet that needs to be fetched
+          required: true
+          type: integer
+          maximum: 5
+          minimum: 1
+          format: int64
+      responses:
+        '200':
+          description: successful operation
+          schema:
+            $ref: '#/definitions/Order'
+        '400':
+          description: Invalid ID supplied
+        '404':
+          description: Order not found
+    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/xml
+        - application/json
+      parameters:
+        - name: orderId
+          in: path
+          description: ID of the order that needs to be deleted
+          required: true
+          type: string
+          minimum: 1
+      responses:
+        '400':
+          description: Invalid ID supplied
+        '404':
+          description: Order not found
+  /user:
+    post:
+      tags:
+        - user
+      summary: Create user
+      description: This can only be done by the logged in user.
+      operationId: createUser
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - in: body
+          name: body
+          description: Created user object
+          required: true
+          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/xml
+        - application/json
+      parameters:
+        - in: body
+          name: body
+          description: List of user object
+          required: true
+          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/xml
+        - application/json
+      parameters:
+        - in: body
+          name: body
+          description: List of user object
+          required: true
+          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/xml
+        - application/json
+      parameters:
+        - name: username
+          in: query
+          description: The user name for login
+          required: true
+          type: string
+        - name: password
+          in: query
+          description: The password for login in clear text
+          required: true
+          type: string
+      responses:
+        '200':
+          description: successful operation
+          schema:
+            type: string
+          headers:
+            X-Rate-Limit:
+              type: integer
+              format: int32
+              description: calls per hour allowed by the user
+            X-Expires-After:
+              type: string
+              format: date-time
+              description: date in UTC when toekn expires
+        '400':
+          description: Invalid username/password supplied
+  /user/logout:
+    get:
+      tags:
+        - user
+      summary: Logs out current logged in user session
+      description: ''
+      operationId: logoutUser
+      produces:
+        - application/xml
+        - application/json
+      parameters: []
+      responses:
+        default:
+          description: successful operation
+  '/user/{username}':
+    get:
+      tags:
+        - user
+      summary: Get user by user name
+      description: ''
+      operationId: getUserByName
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - name: username
+          in: path
+          description: 'The name that needs to be fetched. Use user1 for testing. '
+          required: true
+          type: string
+      responses:
+        '200':
+          description: successful operation
+          schema:
+            $ref: '#/definitions/User'
+        '400':
+          description: Invalid username supplied
+        '404':
+          description: User not found
+    put:
+      tags:
+        - user
+      summary: Updated user
+      description: This can only be done by the logged in user.
+      operationId: updateUser
+      produces:
+        - application/xml
+        - application/json
+      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: true
+          schema:
+            $ref: '#/definitions/User'
+      responses:
+        '400':
+          description: Invalid user supplied
+        '404':
+          description: User not found
+    delete:
+      tags:
+        - user
+      summary: Delete user
+      description: This can only be done by the logged in user.
+      operationId: deleteUser
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - name: username
+          in: path
+          description: The name that needs to be deleted
+          required: true
+          type: string
+      responses:
+        '400':
+          description: Invalid username supplied
+        '404':
+          description: User not found
+securityDefinitions:
+  petstore_auth:
+    type: oauth2
+    authorizationUrl: 'http://petstore.swagger.io/api/oauth/dialog'
+    flow: implicit
+    scopes:
+      'write:pets': modify pets in your account
+      'read:pets': read your pets
+  api_key:
+    type: apiKey
+    name: api_key
+    in: header
+definitions:
+  Order:
+    type: object
+    properties:
+      id:
+        type: integer
+        format: int64
+      petId:
+        type: integer
+        format: int64
+      quantity:
+        type: integer
+        format: int32
+      shipDate:
+        type: string
+        format: date-time
+      status:
+        type: string
+        description: Order Status
+        enum:
+          - placed
+          - approved
+          - delivered
+      complete:
+        type: boolean
+        default: false
+    xml:
+      name: Order
+  Category:
+    type: object
+    properties:
+      id:
+        type: integer
+        format: int64
+      name:
+        type: string
+    xml:
+      name: Category
+  User:
+    type: object
+    properties:
+      id:
+        type: integer
+        format: int64
+      username:
+        type: string
+      firstName:
+        type: string
+      lastName:
+        type: string
+      email:
+        type: string
+      password:
+        type: string
+      phone:
+        type: string
+      userStatus:
+        type: integer
+        format: int32
+        description: User Status
+    xml:
+      name: User
+  Tag:
+    type: object
+    properties:
+      id:
+        type: integer
+        format: int64
+      name:
+        type: string
+    xml:
+      name: Tag
+  Pet:
+    type: object
+    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
+  ApiResponse:
+    type: object
+    properties:
+      code:
+        type: integer
+        format: int32
+      type:
+        type: string
+      message:
+        type: string
+  '$special[model.name]':
+    properties:
+      '$special[property.name]':
+        type: integer
+        format: int64
+    xml:
+      name: '$special[model.name]'
+  Return:
+    description: Model for testing reserved words
+    properties:
+      return:
+        type: integer
+        format: int32
+    xml:
+      name: Return
+  Name:
+    description: Model for testing model name same as property name
+    required:
+      - name
+    properties:
+      name:
+        type: integer
+        format: int32
+      snake_case:
+        readOnly: true
+        type: integer
+        format: int32
+    xml:
+      name: Name
+  200_response:
+    description: Model for testing model name starting with number
+    properties:
+      name:
+        type: integer
+        format: int32
+    xml:
+      name: Name
+  Dog:
+    allOf:
+      - $ref: '#/definitions/Animal'
+      - type: object
+        properties:
+          breed:
+            type: string
+  Cat:
+    allOf:
+      - $ref: '#/definitions/Animal'
+      - type: object
+        properties:
+          declawed:
+            type: boolean
+  Animal:
+    type: object
+    discriminator: className
+    required:
+      - className
+    properties:
+      className:
+        type: string
+  format_test:
+    type: object
+    required:
+      - number
+    properties:
+      integer:
+        type: integer
+      int32:
+        type: integer
+        format: int32
+      int64:
+        type: integer
+        format: int64
+      number:
+        type: number
+      float:
+        type: number
+        format: float
+      double:
+        type: number
+        format: double
+      string:
+        type: string
+      byte:
+        type: string
+        format: byte
+      binary:
+        type: string
+        format: binary
+      date:
+        type: string
+        format: date
+      dateTime:
+        type: string
+        format: date-time
+      password:
+        type: string
+        format: password
+externalDocs:
+  description: Find out more about Swagger
+  url: 'http://swagger.io'
diff --git a/modules/swagger-codegen/src/test/resources/2_0/petstore.json b/modules/swagger-codegen/src/test/resources/2_0/petstore.json
index 64b56377393..838b3c8b2da 100644
--- a/modules/swagger-codegen/src/test/resources/2_0/petstore.json
+++ b/modules/swagger-codegen/src/test/resources/2_0/petstore.json
@@ -4,9 +4,9 @@
     "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/",
+    "termsOfService": "http://helloreverb.com/terms/",
     "contact": {
-      "email": "apiteam@swagger.io"
+      "email": "apiteam@wordnik.com"
     },
     "license": {
       "name": "Apache 2.0",
@@ -19,49 +19,6 @@
     "http"
   ],
   "paths": {
-    "/pet?testing_byte_array=true": {
-      "post": {
-        "tags": [
-          "pet"
-        ],
-        "summary": "Fake endpoint to test byte array in body parameter for adding a new pet to the store",
-        "description": "",
-        "operationId": "addPetUsingByteArray",
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "in": "body",
-            "name": "body",
-            "description": "Pet object in the form of byte array",
-            "required": false,
-            "schema": {
-              "type": "string",
-              "format": "binary"
-            }
-          }
-        ],
-        "responses": {
-          "405": {
-            "description": "Invalid input"
-          }
-        },
-        "security": [
-          {
-            "petstore_auth": [
-              "write:pets",
-              "read:pets"
-            ]
-          }
-        ]
-      }
-    },
     "/pet": {
       "post": {
         "tags": [
@@ -156,7 +113,7 @@
           "pet"
         ],
         "summary": "Finds Pets by status",
-        "description": "Multiple status values can be provided with comma separated strings",
+        "description": "Multiple status values can be provided with comma seperated strings",
         "operationId": "findPetsByStatus",
         "produces": [
           "application/json",
@@ -166,23 +123,14 @@
           {
             "name": "status",
             "in": "query",
-            "description": "Status values that need to be considered for query",
+            "description": "Status values that need to be considered for filter",
             "required": false,
             "type": "array",
             "items": {
               "type": "string",
-              "enum": [
-                "available",
-                "pending",
-                "sold"
-              ]
+              "enum": ["available", "pending", "sold"]
             },
             "collectionFormat": "multi",
-            "enum": [
-              "available",
-              "pending",
-              "sold"
-            ],
             "default": "available"
           }
         ],
@@ -194,6 +142,15 @@
               "items": {
                 "$ref": "#/definitions/Pet"
               }
+            },
+            "examples": {
+              "application/json": {
+                "name": "Puma",
+                "type": "Dog",
+                "color": "Black",
+                "gender": "Female",
+                "breed": "Mixed"
+              }
             }
           },
           "400": {
@@ -259,150 +216,6 @@
         ]
       }
     },
-    "/pet/{petId}?testing_byte_array=true": {
-      "get": {
-        "tags": [
-          "pet"
-        ],
-        "summary": "Fake endpoint to test byte array return by 'Find pet by ID'",
-        "description": "Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions",
-        "operationId": "",
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "name": "petId",
-            "in": "path",
-            "description": "ID of pet that needs to be fetched",
-            "required": true,
-            "type": "integer",
-            "format": "int64"
-          }
-        ],
-        "responses": {
-          "404": {
-            "description": "Pet not found"
-          },
-          "200": {
-            "description": "successful operation",
-            "schema": {
-              "type": "string",
-              "format": "binary"
-            }
-          },
-          "400": {
-            "description": "Invalid ID supplied"
-          }
-        },
-        "security": [
-          {
-            "api_key": []
-          },
-          {
-            "petstore_auth": [
-              "write:pets",
-              "read:pets"
-            ]
-          }
-        ]
-      }
-    },
-    "/pet/{petId}?response=inline_arbitrary_object": {
-      "get": {
-        "tags": [
-          "pet"
-        ],
-        "summary": "Fake endpoint to test inline arbitrary object return by 'Find pet by ID'",
-        "description": "Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions",
-        "operationId": "getPetByIdInObject",
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "name": "petId",
-            "in": "path",
-            "description": "ID of pet that needs to be fetched",
-            "required": true,
-            "type": "integer",
-            "format": "int64"
-          }
-        ],
-        "responses": {
-          "404": {
-            "description": "Pet not found"
-          },
-          "200": {
-            "description": "successful operation",
-            "schema": {
-              "type": "object",
-              "required": [
-                "id"
-              ],
-              "properties": {
-                "id": {
-                  "type": "integer",
-                  "format": "int64"
-                },
-                "category": {
-                  "type": "object"
-                },
-                "name": {
-                  "type": "string",
-                  "example": "doggie"
-                },
-                "photoUrls": {
-                    "type": "array",
-                    "xml": {
-                        "name": "photoUrl",
-                        "wrapped": true
-                    },
-                    "items": {
-                        "type": "string"
-                    }
-                },
-                "tags": {
-                    "type": "array",
-                    "xml": {
-                        "name": "tag",
-                        "wrapped": true
-                    },
-                    "items": {
-                        "$ref": "#/definitions/Tag"
-                    }
-                },
-                "status": {
-                    "type": "string",
-                    "description": "pet status in the store",
-                    "enum": [
-                        "available",
-                    "pending",
-                    "sold"
-                        ]
-                }
-              }
-            }
-          },
-          "400": {
-            "description": "Invalid ID supplied"
-          }
-        },
-        "security": [
-          {
-            "api_key": []
-          },
-          {
-            "petstore_auth": [
-              "write:pets",
-              "read:pets"
-            ]
-          }
-        ]
-      }
-    },
     "/pet/{petId}": {
       "get": {
         "tags": [
@@ -630,33 +443,6 @@
         ]
       }
     },
-    "/store/inventory?response=arbitrary_object": {
-      "get": {
-        "tags": [
-          "store"
-        ],
-        "summary": "Fake endpoint to test arbitrary object return by 'Get inventory'",
-        "description": "Returns an arbitrary object which is actually a map of status codes to quantities",
-        "operationId": "getInventoryInObject",
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "responses": {
-          "200": {
-            "description": "successful operation",
-            "schema": {
-              "type": "object"
-            }
-          }
-        },
-        "security": [
-          {
-            "api_key": []
-          }
-        ]
-      }
-    },
     "/store/order": {
       "post": {
         "tags": [
@@ -690,62 +476,7 @@
           "400": {
             "description": "Invalid Order"
           }
-        },
-        "security": [
-          {
-            "test_api_client_id": [],
-            "test_api_client_secret": []
-          }
-        ]
-      }
-    },
-     "/store/findByStatus": {
-      "get": {
-        "tags": [
-          "store"
-        ],
-        "summary": "Finds orders by status",
-        "description": "A single status value can be provided as a string",
-        "operationId": "findOrdersByStatus",
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "name": "status",
-            "in": "query",
-            "description": "Status value that needs to be considered for query",
-            "required": false,
-            "type": "string",
-            "enum": [
-              "placed",
-              "approved",
-              "delivered"
-            ],
-            "default": "placed"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "successful operation",
-            "schema": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/Order"
-              }
-            }
-          },
-          "400": {
-            "description": "Invalid status value"
-          }
-        },
-        "security": [
-          {
-            "test_api_client_id": [],
-            "test_api_client_secret": []
-          }
-        ]
+        }
       }
     },
     "/store/order/{orderId}": {
@@ -782,15 +513,7 @@
           "400": {
             "description": "Invalid ID supplied"
           }
-        },
-        "security": [
-          {
-            "test_api_key_header": []
-          },
-          {
-            "test_api_key_query": []
-          }
-        ]
+        }
       },
       "delete": {
         "tags": [
@@ -1007,18 +730,6 @@
             "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": {
@@ -1091,12 +802,7 @@
           "400": {
             "description": "Invalid username supplied"
           }
-        },
-        "security": [
-          {
-            "test_http_basic": []
-          }
-        ]
+        }
       }
     }
   },
@@ -1114,29 +820,6 @@
         "write:pets": "modify pets in your account",
         "read:pets": "read your pets"
       }
-    },
-    "test_api_client_id": {
-      "type": "apiKey",
-      "name": "x-test_api_client_id",
-      "in": "header"
-    },
-    "test_api_client_secret": {
-      "type": "apiKey",
-      "name": "x-test_api_client_secret",
-      "in": "header"
-    },
-    "test_api_key_header": {
-      "type": "apiKey",
-      "name": "test_api_key_header",
-      "in": "header"
-    },
-    "test_api_key_query": {
-      "type": "apiKey",
-      "name": "test_api_key_query",
-      "in": "query"
-    },
-    "test_http_basic": {
-      "type": "basic"
     }
   },
   "definitions": {
@@ -1257,8 +940,7 @@
       "properties": {
         "id": {
           "type": "integer",
-          "format": "int64",
-          "readOnly": true
+          "format": "int64"
         },
         "petId": {
           "type": "integer",
@@ -1288,150 +970,6 @@
       "xml": {
         "name": "Order"
       }
-    },
-    "$special[model.name]": {
-      "properties": {
-        "$special[property.name]": {
-          "type": "integer",
-          "format": "int64"
-        }
-      },
-      "xml": {
-        "name": "$special[model.name]"
-      }
-    },
-    "Return": {
-      "description": "Model for testing reserved words",
-      "properties": {
-        "return": {
-          "type": "integer",
-          "format": "int32"
-        }
-      },
-      "xml": {
-        "name": "Return"
-      }
-    },
-    "Name": {
-      "description": "Model for testing model name same as property name",
-      "required": [
-        "name"
-      ],
-      "properties": {
-        "name": {
-          "type": "integer",
-          "format": "int32"
-        },
-        "snake_case": {
-          "readOnly": true,
-          "type": "integer",
-          "format": "int32"
-        }
-      },
-      "xml": {
-        "name": "Name"
-      }
-    },
-    "200_response": {
-      "description": "Model for testing model name starting with number",
-      "properties": {
-        "name": {
-          "type": "integer",
-          "format": "int32"
-        }
-      },
-      "xml": {
-        "name": "Name"
-      }
-    },
-    "Dog" : {
-      "allOf" : [ {
-        "$ref" : "#/definitions/Animal"
-      }, {
-        "type" : "object",
-        "properties" : {
-          "breed" : {
-            "type" : "string"
-          }
-        }
-      } ]
-    },
-    "Cat" : {
-      "allOf" : [ {
-        "$ref" : "#/definitions/Animal"
-      }, {
-        "type" : "object",
-        "properties" : {
-          "declawed" : {
-            "type" : "boolean"
-          }
-        }
-      } ]
-    },
-    "Animal" : {
-      "type" : "object",
-      "discriminator": "className",
-      "required": [
-        "className"
-      ],
-      "properties" : {
-        "className" : {
-          "type" : "string"
-        }
-      }
-    },
-    "format_test" : {
-      "type" : "object",
-      "required": [
-        "number"
-      ],
-      "properties" : {
-        "integer" : {
-          "type": "integer"
-        },
-        "int32" : {
-          "type": "integer",
-          "format": "int32"
-        },
-        "int64" : {
-          "type": "integer",
-          "format": "int64"
-        },
-        "number" : {
-          "type": "number"
-        },
-        "float" : {
-          "type": "number",
-          "format": "float"
-        },
-        "double" : {
-          "type": "number",
-          "format": "double"
-        },
-        "string" : {
-          "type": "string"
-        },
-        "byte" : {
-          "type": "string",
-          "format": "byte"
-        },
-        "binary" : {
-          "type": "string",
-          "format": "binary"
-        },
-        "date" : {
-          "type": "string",
-          "format": "date"
-        },
-        "dateTime" : {
-          "type": "string",
-          "format": "date-time"
-        },
-        "dateTime" : {
-          "type": "string",
-          "format": "password"
-        }
-      }
     }
   }
 }
diff --git a/samples/client/petstore/akka-scala/pom.xml b/samples/client/petstore/akka-scala/pom.xml
index fa88207507e..b625621f58c 100644
--- a/samples/client/petstore/akka-scala/pom.xml
+++ b/samples/client/petstore/akka-scala/pom.xml
@@ -217,7 +217,7 @@
         <akka-version>2.3.9</akka-version>
         <joda-version>1.2</joda-version>
         <joda-time-version>2.2</joda-time-version>
-        <swagger-core-version>1.5.7</swagger-core-version>
+        <swagger-core-version>1.5.8</swagger-core-version>
         <maven-plugin.version>1.0.0</maven-plugin.version>
 
         <junit-version>4.8.1</junit-version>
diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/EnumsSerializers.scala b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/EnumsSerializers.scala
index c8c0d2454e4..6703ffa4837 100644
--- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/EnumsSerializers.scala
+++ b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/EnumsSerializers.scala
@@ -1,3 +1,8 @@
+/**
+ * NOTE: This class is auto generated by the akka-scala (beta) swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * For any issue or feedback, please open a ticket via https://github.com/swagger-api/swagger-codegen/issues/new
+ */
 package io.swagger.client.api
 
 import io.swagger.client.model._
@@ -7,8 +12,8 @@ import scala.reflect.ClassTag
 object EnumsSerializers {
 
   def all = Seq[Serializer[_]]() :+
-    new EnumNameSerializer(PetEnums.Status) :+
-    new EnumNameSerializer(OrderEnums.Status)
+    new EnumNameSerializer(OrderEnums.Status) :+
+    new EnumNameSerializer(PetEnums.Status)
 
 
 
@@ -40,4 +45,4 @@ object EnumsSerializers {
     }
   }
 
-}
\ No newline at end of file
+}
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 7decd51b03c..b59e7f912b4 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
@@ -1,6 +1,12 @@
+/**
+ * NOTE: This class is auto generated by the akka-scala (beta) swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * For any issue or feedback, please open a ticket via https://github.com/swagger-api/swagger-codegen/issues/new
+ */
 package io.swagger.client.api
 
 import io.swagger.client.model.Pet
+import io.swagger.client.model.ApiResponse
 import java.io.File
 import io.swagger.client.core._
 import io.swagger.client.core.CollectionFormats._
@@ -8,22 +14,6 @@ import io.swagger.client.core.ApiKeyLocations._
 
 object PetApi {
 
-  /**
-   * 
-   * Expected answers:
-   *   code 400 :  (Invalid ID supplied)
-   *   code 404 :  (Pet not found)
-   *   code 405 :  (Validation exception)
-   * 
-   * @param body Pet object that needs to be added to the store
-   */
-  def updatePet(body: Option[Pet] = None): ApiRequest[Unit] =
-    ApiRequest[Unit](ApiMethods.PUT, "http://petstore.swagger.io/v2", "/pet", "application/json")
-      .withBody(body)
-      .withErrorResponse[Unit](400)
-      .withErrorResponse[Unit](404)
-      .withErrorResponse[Unit](405)
-      
   /**
    * 
    * Expected answers:
@@ -31,79 +21,11 @@ object PetApi {
    * 
    * @param body Pet object that needs to be added to the store
    */
-  def addPet(body: Option[Pet] = None): ApiRequest[Unit] =
+  def addPet(body: Pet): ApiRequest[Unit] =
     ApiRequest[Unit](ApiMethods.POST, "http://petstore.swagger.io/v2", "/pet", "application/json")
       .withBody(body)
       .withErrorResponse[Unit](405)
-      
-  /**
-   * Multiple status values can be provided with comma seperated strings
-   * 
-   * Expected answers:
-   *   code 200 : Seq[Pet] (successful operation)
-   *   code 400 :  (Invalid status value)
-   * 
-   * @param status Status values that need to be considered for filter
-   */
-  def findPetsByStatus(status: Seq[String]): ApiRequest[Seq[Pet]] =
-    ApiRequest[Seq[Pet]](ApiMethods.GET, "http://petstore.swagger.io/v2", "/pet/findByStatus", "application/json")
-      .withQueryParam("status", ArrayValues(status, MULTI))
-      .withSuccessResponse[Seq[Pet]](200)
-      .withErrorResponse[Unit](400)
-      
-  /**
-   * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-   * 
-   * Expected answers:
-   *   code 200 : Seq[Pet] (successful operation)
-   *   code 400 :  (Invalid tag value)
-   * 
-   * @param tags Tags to filter by
-   */
-  def findPetsByTags(tags: Seq[String]): ApiRequest[Seq[Pet]] =
-    ApiRequest[Seq[Pet]](ApiMethods.GET, "http://petstore.swagger.io/v2", "/pet/findByTags", "application/json")
-      .withQueryParam("tags", ArrayValues(tags, MULTI))
-      .withSuccessResponse[Seq[Pet]](200)
-      .withErrorResponse[Unit](400)
-      
-  /**
-   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-   * 
-   * Expected answers:
-   *   code 200 : Pet (successful operation)
-   *   code 400 :  (Invalid ID supplied)
-   *   code 404 :  (Pet not found)
-   * 
-   * Available security schemes:
-   *   api_key (apiKey)
-   * 
-   * @param petId ID of pet that needs to be fetched
-   */
-  def getPetById(petId: Long)(implicit apiKey: ApiKeyValue): ApiRequest[Pet] =
-    ApiRequest[Pet](ApiMethods.GET, "http://petstore.swagger.io/v2", "/pet/{petId}", "application/json")
-      .withApiKey(apiKey, "api_key", HEADER)
-      .withPathParam("petId", petId)
-      .withSuccessResponse[Pet](200)
-      .withErrorResponse[Unit](400)
-      .withErrorResponse[Unit](404)
-      
-  /**
-   * 
-   * Expected answers:
-   *   code 405 :  (Invalid input)
-   * 
-   * @param petId ID of pet that needs to be updated
-   * @param name Updated name of the pet
-   * @param status Updated status of the pet
-   */
-  def updatePetWithForm(petId: String, name: Option[String] = None, status: Option[String] = None): ApiRequest[Unit] =
-    ApiRequest[Unit](ApiMethods.POST, "http://petstore.swagger.io/v2", "/pet/{petId}", "application/x-www-form-urlencoded")
-      .withFormParam("name", name)
-      .withFormParam("status", status)
-      .withPathParam("petId", petId)
-      .withErrorResponse[Unit](405)
-      
-  /**
+        /**
    * 
    * Expected answers:
    *   code 400 :  (Invalid pet value)
@@ -116,24 +38,100 @@ object PetApi {
       .withPathParam("petId", petId)
       .withHeaderParam("api_key", apiKey)
       .withErrorResponse[Unit](400)
-      
-  /**
+        /**
+   * Multiple status values can be provided with comma separated strings
    * 
    * Expected answers:
-   *   code 0 :  (successful operation)
+   *   code 200 : Seq[Pet] (successful operation)
+   *   code 400 :  (Invalid status value)
+   * 
+   * @param status Status values that need to be considered for filter
+   */
+  def findPetsByStatus(status: Seq[String]): ApiRequest[Seq[Pet]] =
+    ApiRequest[Seq[Pet]](ApiMethods.GET, "http://petstore.swagger.io/v2", "/pet/findByStatus", "application/json")
+      .withQueryParam("status", ArrayValues(status, CSV))
+      .withSuccessResponse[Seq[Pet]](200)
+      .withErrorResponse[Unit](400)
+        /**
+   * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+   * 
+   * Expected answers:
+   *   code 200 : Seq[Pet] (successful operation)
+   *   code 400 :  (Invalid tag value)
+   * 
+   * @param tags Tags to filter by
+   */
+  def findPetsByTags(tags: Seq[String]): ApiRequest[Seq[Pet]] =
+    ApiRequest[Seq[Pet]](ApiMethods.GET, "http://petstore.swagger.io/v2", "/pet/findByTags", "application/json")
+      .withQueryParam("tags", ArrayValues(tags, CSV))
+      .withSuccessResponse[Seq[Pet]](200)
+      .withErrorResponse[Unit](400)
+        /**
+   * Returns a single pet
+   * 
+   * Expected answers:
+   *   code 200 : Pet (successful operation)
+   *   code 400 :  (Invalid ID supplied)
+   *   code 404 :  (Pet not found)
+   * 
+   * Available security schemes:
+   *   api_key (apiKey)
+   * 
+   * @param petId ID of pet to return
+   */
+  def getPetById(petId: Long)(implicit apiKey: ApiKeyValue): ApiRequest[Pet] =
+    ApiRequest[Pet](ApiMethods.GET, "http://petstore.swagger.io/v2", "/pet/{petId}", "application/json")
+      .withApiKey(apiKey, "api_key", HEADER)
+      .withPathParam("petId", petId)
+      .withSuccessResponse[Pet](200)
+      .withErrorResponse[Unit](400)
+      .withErrorResponse[Unit](404)
+        /**
+   * 
+   * Expected answers:
+   *   code 400 :  (Invalid ID supplied)
+   *   code 404 :  (Pet not found)
+   *   code 405 :  (Validation exception)
+   * 
+   * @param body Pet object that needs to be added to the store
+   */
+  def updatePet(body: Pet): ApiRequest[Unit] =
+    ApiRequest[Unit](ApiMethods.PUT, "http://petstore.swagger.io/v2", "/pet", "application/json")
+      .withBody(body)
+      .withErrorResponse[Unit](400)
+      .withErrorResponse[Unit](404)
+      .withErrorResponse[Unit](405)
+        /**
+   * 
+   * Expected answers:
+   *   code 405 :  (Invalid input)
+   * 
+   * @param petId ID of pet that needs to be updated
+   * @param name Updated name of the pet
+   * @param status Updated status of the pet
+   */
+  def updatePetWithForm(petId: Long, name: Option[String] = None, status: Option[String] = None): ApiRequest[Unit] =
+    ApiRequest[Unit](ApiMethods.POST, "http://petstore.swagger.io/v2", "/pet/{petId}", "application/x-www-form-urlencoded")
+      .withFormParam("name", name)
+      .withFormParam("status", status)
+      .withPathParam("petId", petId)
+      .withErrorResponse[Unit](405)
+        /**
+   * 
+   * Expected answers:
+   *   code 200 : ApiResponse (successful operation)
    * 
    * @param petId ID of pet to update
    * @param additionalMetadata Additional data to pass to server
    * @param file file to upload
    */
-  def uploadFile(petId: Long, additionalMetadata: Option[String] = None, file: Option[File] = None): ApiRequest[Unit] =
-    ApiRequest[Unit](ApiMethods.POST, "http://petstore.swagger.io/v2", "/pet/{petId}/uploadImage", "multipart/form-data")
+  def uploadFile(petId: Long, additionalMetadata: Option[String] = None, file: Option[File] = None): ApiRequest[ApiResponse] =
+    ApiRequest[ApiResponse](ApiMethods.POST, "http://petstore.swagger.io/v2", "/pet/{petId}/uploadImage", "multipart/form-data")
       .withFormParam("additionalMetadata", additionalMetadata)
       .withFormParam("file", file)
       .withPathParam("petId", petId)
-      .withDefaultSuccessResponse[Unit]
+      .withSuccessResponse[ApiResponse](200)
       
 
-
 }
 
diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/StoreApi.scala b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/StoreApi.scala
index f3ab28da05f..3ecb7ad9dae 100644
--- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/StoreApi.scala
+++ b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/StoreApi.scala
@@ -1,3 +1,8 @@
+/**
+ * NOTE: This class is auto generated by the akka-scala (beta) swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * For any issue or feedback, please open a ticket via https://github.com/swagger-api/swagger-codegen/issues/new
+ */
 package io.swagger.client.api
 
 import io.swagger.client.model.Order
@@ -7,51 +12,6 @@ import io.swagger.client.core.ApiKeyLocations._
 
 object StoreApi {
 
-  /**
-   * Returns a map of status codes to quantities
-   * 
-   * Expected answers:
-   *   code 200 : Map[String, Int] (successful operation)
-   * 
-   * Available security schemes:
-   *   api_key (apiKey)
-   */
-  def getInventory()(implicit apiKey: ApiKeyValue): ApiRequest[Map[String, Int]] =
-    ApiRequest[Map[String, Int]](ApiMethods.GET, "http://petstore.swagger.io/v2", "/store/inventory", "application/json")
-      .withApiKey(apiKey, "api_key", HEADER)
-      .withSuccessResponse[Map[String, Int]](200)
-      
-  /**
-   * 
-   * Expected answers:
-   *   code 200 : Order (successful operation)
-   *   code 400 :  (Invalid Order)
-   * 
-   * @param body order placed for purchasing the pet
-   */
-  def placeOrder(body: Option[Order] = None): ApiRequest[Order] =
-    ApiRequest[Order](ApiMethods.POST, "http://petstore.swagger.io/v2", "/store/order", "application/json")
-      .withBody(body)
-      .withSuccessResponse[Order](200)
-      .withErrorResponse[Unit](400)
-      
-  /**
-   * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-   * 
-   * Expected answers:
-   *   code 200 : Order (successful operation)
-   *   code 400 :  (Invalid ID supplied)
-   *   code 404 :  (Order not found)
-   * 
-   * @param orderId ID of pet that needs to be fetched
-   */
-  def getOrderById(orderId: String): ApiRequest[Order] =
-    ApiRequest[Order](ApiMethods.GET, "http://petstore.swagger.io/v2", "/store/order/{orderId}", "application/json")
-      .withPathParam("orderId", orderId)
-      .withSuccessResponse[Order](200)
-      .withErrorResponse[Unit](400)
-      .withErrorResponse[Unit](404)
-      
   /**
    * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
    * 
@@ -66,8 +26,49 @@ object StoreApi {
       .withPathParam("orderId", orderId)
       .withErrorResponse[Unit](400)
       .withErrorResponse[Unit](404)
+        /**
+   * Returns a map of status codes to quantities
+   * 
+   * Expected answers:
+   *   code 200 : Map[String, Int] (successful operation)
+   * 
+   * Available security schemes:
+   *   api_key (apiKey)
+   */
+  def getInventory()(implicit apiKey: ApiKeyValue): ApiRequest[Map[String, Int]] =
+    ApiRequest[Map[String, Int]](ApiMethods.GET, "http://petstore.swagger.io/v2", "/store/inventory", "application/json")
+      .withApiKey(apiKey, "api_key", HEADER)
+      .withSuccessResponse[Map[String, Int]](200)
+        /**
+   * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+   * 
+   * Expected answers:
+   *   code 200 : Order (successful operation)
+   *   code 400 :  (Invalid ID supplied)
+   *   code 404 :  (Order not found)
+   * 
+   * @param orderId ID of pet that needs to be fetched
+   */
+  def getOrderById(orderId: Long): ApiRequest[Order] =
+    ApiRequest[Order](ApiMethods.GET, "http://petstore.swagger.io/v2", "/store/order/{orderId}", "application/json")
+      .withPathParam("orderId", orderId)
+      .withSuccessResponse[Order](200)
+      .withErrorResponse[Unit](400)
+      .withErrorResponse[Unit](404)
+        /**
+   * 
+   * Expected answers:
+   *   code 200 : Order (successful operation)
+   *   code 400 :  (Invalid Order)
+   * 
+   * @param body order placed for purchasing the pet
+   */
+  def placeOrder(body: Order): ApiRequest[Order] =
+    ApiRequest[Order](ApiMethods.POST, "http://petstore.swagger.io/v2", "/store/order", "application/json")
+      .withBody(body)
+      .withSuccessResponse[Order](200)
+      .withErrorResponse[Unit](400)
       
 
-
 }
 
diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/UserApi.scala b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/UserApi.scala
index b759a799e3d..642c76b8d8c 100644
--- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/UserApi.scala
+++ b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/UserApi.scala
@@ -1,3 +1,8 @@
+/**
+ * NOTE: This class is auto generated by the akka-scala (beta) swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * For any issue or feedback, please open a ticket via https://github.com/swagger-api/swagger-codegen/issues/new
+ */
 package io.swagger.client.api
 
 import io.swagger.client.model.User
@@ -15,12 +20,11 @@ object UserApi {
    * 
    * @param body Created user object
    */
-  def createUser(body: Option[User] = None): ApiRequest[Unit] =
+  def createUser(body: User): ApiRequest[Unit] =
     ApiRequest[Unit](ApiMethods.POST, "http://petstore.swagger.io/v2", "/user", "application/json")
       .withBody(body)
       .withDefaultSuccessResponse[Unit]
-      
-  /**
+        /**
    * 
    * Expected answers:
    *   code 0 :  (successful operation)
@@ -31,8 +35,7 @@ object UserApi {
     ApiRequest[Unit](ApiMethods.POST, "http://petstore.swagger.io/v2", "/user/createWithArray", "application/json")
       .withBody(body)
       .withDefaultSuccessResponse[Unit]
-      
-  /**
+        /**
    * 
    * Expected answers:
    *   code 0 :  (successful operation)
@@ -43,66 +46,7 @@ object UserApi {
     ApiRequest[Unit](ApiMethods.POST, "http://petstore.swagger.io/v2", "/user/createWithList", "application/json")
       .withBody(body)
       .withDefaultSuccessResponse[Unit]
-      
-  /**
-   * 
-   * Expected answers:
-   *   code 200 : String (successful operation)
-   *   code 400 :  (Invalid username/password supplied)
-   * 
-   * @param username The user name for login
-   * @param password The password for login in clear text
-   */
-  def loginUser(username: Option[String] = None, password: Option[String] = None): ApiRequest[String] =
-    ApiRequest[String](ApiMethods.GET, "http://petstore.swagger.io/v2", "/user/login", "application/json")
-      .withQueryParam("username", username)
-      .withQueryParam("password", password)
-      .withSuccessResponse[String](200)
-      .withErrorResponse[Unit](400)
-      
-  /**
-   * 
-   * Expected answers:
-   *   code 0 :  (successful operation)
-   */
-  def logoutUser(): ApiRequest[Unit] =
-    ApiRequest[Unit](ApiMethods.GET, "http://petstore.swagger.io/v2", "/user/logout", "application/json")
-      .withDefaultSuccessResponse[Unit]
-      
-  /**
-   * 
-   * Expected answers:
-   *   code 200 : User (successful operation)
-   *   code 400 :  (Invalid username supplied)
-   *   code 404 :  (User not found)
-   * 
-   * @param username The name that needs to be fetched. Use user1 for testing.
-   */
-  def getUserByName(username: String): ApiRequest[User] =
-    ApiRequest[User](ApiMethods.GET, "http://petstore.swagger.io/v2", "/user/{username}", "application/json")
-      .withPathParam("username", username)
-      .withSuccessResponse[User](200)
-      .withErrorResponse[Unit](400)
-      .withErrorResponse[Unit](404)
-      
-  /**
-   * This can only be done by the logged in user.
-   * 
-   * Expected answers:
-   *   code 400 :  (Invalid user supplied)
-   *   code 404 :  (User not found)
-   * 
-   * @param username name that need to be deleted
-   * @param body Updated user object
-   */
-  def updateUser(username: String, body: Option[User] = None): ApiRequest[Unit] =
-    ApiRequest[Unit](ApiMethods.PUT, "http://petstore.swagger.io/v2", "/user/{username}", "application/json")
-      .withBody(body)
-      .withPathParam("username", username)
-      .withErrorResponse[Unit](400)
-      .withErrorResponse[Unit](404)
-      
-  /**
+        /**
    * This can only be done by the logged in user.
    * 
    * Expected answers:
@@ -116,8 +60,69 @@ object UserApi {
       .withPathParam("username", username)
       .withErrorResponse[Unit](400)
       .withErrorResponse[Unit](404)
+        /**
+   * 
+   * Expected answers:
+   *   code 200 : User (successful operation)
+   *   code 400 :  (Invalid username supplied)
+   *   code 404 :  (User not found)
+   * 
+   * @param username The name that needs to be fetched. Use user1 for testing. 
+   */
+  def getUserByName(username: String): ApiRequest[User] =
+    ApiRequest[User](ApiMethods.GET, "http://petstore.swagger.io/v2", "/user/{username}", "application/json")
+      .withPathParam("username", username)
+      .withSuccessResponse[User](200)
+      .withErrorResponse[Unit](400)
+      .withErrorResponse[Unit](404)
+        /**
+   * 
+   * Expected answers:
+   *   code 200 : String (successful operation)
+   *              Headers :
+   *                X-Rate-Limit - calls per hour allowed by the user
+   *                X-Expires-After - date in UTC when toekn expires
+   *   code 400 :  (Invalid username/password supplied)
+   * 
+   * @param username The user name for login
+   * @param password The password for login in clear text
+   */
+  def loginUser(username: String, password: String): ApiRequest[String] =
+    ApiRequest[String](ApiMethods.GET, "http://petstore.swagger.io/v2", "/user/login", "application/json")
+      .withQueryParam("username", username)
+      .withQueryParam("password", password)
+      .withSuccessResponse[String](200)
+      .withErrorResponse[Unit](400)
+      
+  object LoginUserHeaders { 
+    def `x-Rate-Limit`(r: ApiReturnWithHeaders) = r.getIntHeader("X-Rate-Limit")
+    def `x-Expires-After`(r: ApiReturnWithHeaders) = r.getDateTimeHeader("X-Expires-After")
+  }
+  /**
+   * 
+   * Expected answers:
+   *   code 0 :  (successful operation)
+   */
+  def logoutUser(): ApiRequest[Unit] =
+    ApiRequest[Unit](ApiMethods.GET, "http://petstore.swagger.io/v2", "/user/logout", "application/json")
+      .withDefaultSuccessResponse[Unit]
+        /**
+   * This can only be done by the logged in user.
+   * 
+   * Expected answers:
+   *   code 400 :  (Invalid user supplied)
+   *   code 404 :  (User not found)
+   * 
+   * @param username name that need to be deleted
+   * @param body Updated user object
+   */
+  def updateUser(username: String, body: User): ApiRequest[Unit] =
+    ApiRequest[Unit](ApiMethods.PUT, "http://petstore.swagger.io/v2", "/user/{username}", "application/json")
+      .withBody(body)
+      .withPathParam("username", username)
+      .withErrorResponse[Unit](400)
+      .withErrorResponse[Unit](404)
       
-
 
 }
 
diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/ApiInvoker.scala b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/ApiInvoker.scala
index 3b11d866017..18505facbd8 100644
--- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/ApiInvoker.scala
+++ b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/ApiInvoker.scala
@@ -1,3 +1,9 @@
+/**
+ * NOTE: This class is auto generated by the akka-scala (beta) swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * For any issue or feedback, please open a ticket via https://github.com/swagger-api/swagger-codegen/issues/new
+ */
+
 package io.swagger.client.core
 
 import java.io.File
diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/ApiRequest.scala b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/ApiRequest.scala
index 0588193cfbe..dd424e55fca 100644
--- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/ApiRequest.scala
+++ b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/ApiRequest.scala
@@ -1,3 +1,8 @@
+/**
+ * NOTE: This class is auto generated by the akka-scala (beta) swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * For any issue or feedback, please open a ticket via https://github.com/swagger-api/swagger-codegen/issues/new
+ */
 package io.swagger.client.core
 
 sealed trait ResponseState
diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/ApiSettings.scala b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/ApiSettings.scala
index 3162fb9f6be..7f7b6c0d965 100644
--- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/ApiSettings.scala
+++ b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/ApiSettings.scala
@@ -1,3 +1,8 @@
+/**
+ * NOTE: This class is auto generated by the akka-scala (beta) swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * For any issue or feedback, please open a ticket via https://github.com/swagger-api/swagger-codegen/issues/new
+ */
 package io.swagger.client.core
 
 import java.util.concurrent.TimeUnit
diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/requests.scala b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/requests.scala
index a096a994ea3..22db882ea8b 100644
--- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/requests.scala
+++ b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/requests.scala
@@ -1,3 +1,8 @@
+/**
+ * NOTE: This class is auto generated by the akka-scala (beta) swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * For any issue or feedback, please open a ticket via https://github.com/swagger-api/swagger-codegen/issues/new
+ */
 package io.swagger.client.core
 
 import java.io.File
@@ -8,6 +13,8 @@ sealed trait ApiReturnWithHeaders {
   def headers: Map[String, String]
   def header(name: String): Option[String] = headers.get(name)
   def getStringHeader(name: String) = header(name)
+  // workaround: return date time header in string instead of datetime object
+  def getDateTimeHeader(name: String) = header(name)
   def getIntHeader(name: String) = castedHeader(name, java.lang.Integer.parseInt)
   def getLongHeader(name: String) = castedHeader(name, java.lang.Long.parseLong)
   def getFloatHeader(name: String) = castedHeader(name, java.lang.Float.parseFloat)
diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/ApiResponse.scala b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/ApiResponse.scala
new file mode 100644
index 00000000000..31a9325c6f8
--- /dev/null
+++ b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/ApiResponse.scala
@@ -0,0 +1,19 @@
+/**
+ * NOTE: This class is auto generated by the akka-scala (beta) swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * For any issue or feedback, please open a ticket via https://github.com/swagger-api/swagger-codegen/issues/new
+ */
+
+package io.swagger.client.model
+
+import io.swagger.client.core.ApiModel
+import org.joda.time.DateTime
+
+
+case class ApiResponse (
+  code: Option[Int],
+  `type`: Option[String],
+  message: Option[String])
+   extends ApiModel
+
+
diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Category.scala b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Category.scala
index af66bc14753..6d14fc12276 100644
--- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Category.scala
+++ b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Category.scala
@@ -1,3 +1,9 @@
+/**
+ * NOTE: This class is auto generated by the akka-scala (beta) swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * For any issue or feedback, please open a ticket via https://github.com/swagger-api/swagger-codegen/issues/new
+ */
+
 package io.swagger.client.model
 
 import io.swagger.client.core.ApiModel
diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Order.scala b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Order.scala
index 83a40fb55d3..7ed7ae6109c 100644
--- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Order.scala
+++ b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Order.scala
@@ -1,3 +1,9 @@
+/**
+ * NOTE: This class is auto generated by the akka-scala (beta) swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * For any issue or feedback, please open a ticket via https://github.com/swagger-api/swagger-codegen/issues/new
+ */
+
 package io.swagger.client.model
 
 import io.swagger.client.core.ApiModel
diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Pet.scala b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Pet.scala
index 8cd3c61cb60..0b8cf84d49a 100644
--- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Pet.scala
+++ b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Pet.scala
@@ -1,3 +1,9 @@
+/**
+ * NOTE: This class is auto generated by the akka-scala (beta) swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * For any issue or feedback, please open a ticket via https://github.com/swagger-api/swagger-codegen/issues/new
+ */
+
 package io.swagger.client.model
 
 import io.swagger.client.core.ApiModel
diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Tag.scala b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Tag.scala
index 58aabadabe0..5a4b2f412c7 100644
--- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Tag.scala
+++ b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Tag.scala
@@ -1,3 +1,9 @@
+/**
+ * NOTE: This class is auto generated by the akka-scala (beta) swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * For any issue or feedback, please open a ticket via https://github.com/swagger-api/swagger-codegen/issues/new
+ */
+
 package io.swagger.client.model
 
 import io.swagger.client.core.ApiModel
diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/User.scala b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/User.scala
index dd0bce1d8a7..2dc7325c465 100644
--- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/User.scala
+++ b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/User.scala
@@ -1,3 +1,9 @@
+/**
+ * NOTE: This class is auto generated by the akka-scala (beta) swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * For any issue or feedback, please open a ticket via https://github.com/swagger-api/swagger-codegen/issues/new
+ */
+
 package io.swagger.client.model
 
 import io.swagger.client.core.ApiModel
diff --git a/samples/client/petstore/android/default/pom.xml b/samples/client/petstore/android/default/pom.xml
index f9c620b7528..afedf8f3027 100644
--- a/samples/client/petstore/android/default/pom.xml
+++ b/samples/client/petstore/android/default/pom.xml
@@ -110,7 +110,7 @@
     <dependency>
       <groupId>io.swagger</groupId>
       <artifactId>swagger-annotations</artifactId>
-      <version>${swagger-annotations-version}</version>
+      <version>${swagger-core-version}</version>
     </dependency>
     <dependency>
         <groupId>com.google.code.gson</groupId>
@@ -145,7 +145,7 @@
     </repository>
   </repositories>
   <properties>
-    <swagger-annotations-version>1.5.4</swagger-annotations-version>
+    <swagger-core-version>1.5.8</swagger-core-version>
     <gson-version>2.3.1</gson-version>
     <junit-version>4.8.1</junit-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
diff --git a/samples/client/petstore/android/default/src/main/java/io/swagger/client/JsonUtil.java b/samples/client/petstore/android/default/src/main/java/io/swagger/client/JsonUtil.java
index 49ce07a07ae..17ff327a8aa 100644
--- a/samples/client/petstore/android/default/src/main/java/io/swagger/client/JsonUtil.java
+++ b/samples/client/petstore/android/default/src/main/java/io/swagger/client/JsonUtil.java
@@ -35,10 +35,22 @@ public class JsonUtil {
   public static Type getListTypeForDeserialization(Class cls) {
     String className = cls.getSimpleName();
     
+    if ("Animal".equalsIgnoreCase(className)) {
+      return new TypeToken<List<Animal>>(){}.getType();
+    }
+    
+    if ("Cat".equalsIgnoreCase(className)) {
+      return new TypeToken<List<Cat>>(){}.getType();
+    }
+    
     if ("Category".equalsIgnoreCase(className)) {
       return new TypeToken<List<Category>>(){}.getType();
     }
     
+    if ("Dog".equalsIgnoreCase(className)) {
+      return new TypeToken<List<Dog>>(){}.getType();
+    }
+    
     if ("InlineResponse200".equalsIgnoreCase(className)) {
       return new TypeToken<List<InlineResponse200>>(){}.getType();
     }
@@ -81,10 +93,22 @@ public class JsonUtil {
   public static Type getTypeForDeserialization(Class cls) {
     String className = cls.getSimpleName();
     
+    if ("Animal".equalsIgnoreCase(className)) {
+      return new TypeToken<Animal>(){}.getType();
+    }
+    
+    if ("Cat".equalsIgnoreCase(className)) {
+      return new TypeToken<Cat>(){}.getType();
+    }
+    
     if ("Category".equalsIgnoreCase(className)) {
       return new TypeToken<Category>(){}.getType();
     }
     
+    if ("Dog".equalsIgnoreCase(className)) {
+      return new TypeToken<Dog>(){}.getType();
+    }
+    
     if ("InlineResponse200".equalsIgnoreCase(className)) {
       return new TypeToken<InlineResponse200>(){}.getType();
     }
diff --git a/samples/client/petstore/android/default/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/android/default/src/main/java/io/swagger/client/api/UserApi.java
index a28410fd0a9..848f1d2a6cc 100644
--- a/samples/client/petstore/android/default/src/main/java/io/swagger/client/api/UserApi.java
+++ b/samples/client/petstore/android/default/src/main/java/io/swagger/client/api/UserApi.java
@@ -258,7 +258,7 @@ public class UserApi {
   /**
    * Get user by user name
    * 
-   * @param username The name that needs to be fetched. Use user1 for testing.
+   * @param username The name that needs to be fetched. Use user1 for testing. 
    * @return User
    */
   public User  getUserByName (String username) throws ApiException {
diff --git a/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Animal.java
new file mode 100644
index 00000000000..6f956f69f9e
--- /dev/null
+++ b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Animal.java
@@ -0,0 +1,36 @@
+package io.swagger.client.model;
+
+
+import io.swagger.annotations.*;
+import com.google.gson.annotations.SerializedName;
+
+
+@ApiModel(description = "")
+public class Animal  {
+  
+  @SerializedName("className")
+  private String className = null;
+
+  
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+  
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Animal {\n");
+    
+    sb.append("  className: ").append(className).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Cat.java
new file mode 100644
index 00000000000..b0cd7e96b43
--- /dev/null
+++ b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Cat.java
@@ -0,0 +1,51 @@
+package io.swagger.client.model;
+
+import io.swagger.client.model.Animal;
+
+import io.swagger.annotations.*;
+import com.google.gson.annotations.SerializedName;
+
+
+@ApiModel(description = "")
+public class Cat extends Animal {
+  
+  @SerializedName("className")
+  private String className = null;
+  @SerializedName("declawed")
+  private Boolean declawed = null;
+
+  
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Boolean getDeclawed() {
+    return declawed;
+  }
+  public void setDeclawed(Boolean declawed) {
+    this.declawed = declawed;
+  }
+
+  
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Cat {\n");
+    sb.append("  " + super.toString()).append("\n");
+    sb.append("  className: ").append(className).append("\n");
+    sb.append("  declawed: ").append(declawed).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Dog.java
new file mode 100644
index 00000000000..07b2df5488a
--- /dev/null
+++ b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Dog.java
@@ -0,0 +1,51 @@
+package io.swagger.client.model;
+
+import io.swagger.client.model.Animal;
+
+import io.swagger.annotations.*;
+import com.google.gson.annotations.SerializedName;
+
+
+@ApiModel(description = "")
+public class Dog extends Animal {
+  
+  @SerializedName("className")
+  private String className = null;
+  @SerializedName("breed")
+  private String breed = null;
+
+  
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getBreed() {
+    return breed;
+  }
+  public void setBreed(String breed) {
+    this.breed = breed;
+  }
+
+  
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Dog {\n");
+    sb.append("  " + super.toString()).append("\n");
+    sb.append("  className: ").append(className).append("\n");
+    sb.append("  breed: ").append(breed).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/InlineResponse200.java b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/InlineResponse200.java
index c4fd8ce357d..303d160d764 100644
--- a/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/InlineResponse200.java
+++ b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/InlineResponse200.java
@@ -10,31 +10,42 @@ import com.google.gson.annotations.SerializedName;
 @ApiModel(description = "")
 public class InlineResponse200  {
   
-  @SerializedName("tags")
-  private List<Tag> tags = null;
+  @SerializedName("photoUrls")
+  private List<String> photoUrls = null;
+  @SerializedName("name")
+  private String name = null;
   @SerializedName("id")
   private Long id = null;
   @SerializedName("category")
   private Object category = null;
+  @SerializedName("tags")
+  private List<Tag> tags = null;
   public enum StatusEnum {
      available,  pending,  sold, 
   };
   @SerializedName("status")
   private StatusEnum status = null;
-  @SerializedName("name")
-  private String name = null;
-  @SerializedName("photoUrls")
-  private List<String> photoUrls = null;
 
   
   /**
    **/
   @ApiModelProperty(value = "")
-  public List<Tag> getTags() {
-    return tags;
+  public List<String> getPhotoUrls() {
+    return photoUrls;
   }
-  public void setTags(List<Tag> tags) {
-    this.tags = tags;
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
   }
 
   
@@ -60,6 +71,17 @@ public class InlineResponse200  {
   }
 
   
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<Tag> getTags() {
+    return tags;
+  }
+  public void setTags(List<Tag> tags) {
+    this.tags = tags;
+  }
+
+  
   /**
    * pet status in the store
    **/
@@ -72,40 +94,18 @@ public class InlineResponse200  {
   }
 
   
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public String getName() {
-    return name;
-  }
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public List<String> getPhotoUrls() {
-    return photoUrls;
-  }
-  public void setPhotoUrls(List<String> photoUrls) {
-    this.photoUrls = photoUrls;
-  }
-
-  
 
   @Override
   public String toString()  {
     StringBuilder sb = new StringBuilder();
     sb.append("class InlineResponse200 {\n");
     
-    sb.append("  tags: ").append(tags).append("\n");
+    sb.append("  photoUrls: ").append(photoUrls).append("\n");
+    sb.append("  name: ").append(name).append("\n");
     sb.append("  id: ").append(id).append("\n");
     sb.append("  category: ").append(category).append("\n");
+    sb.append("  tags: ").append(tags).append("\n");
     sb.append("  status: ").append(status).append("\n");
-    sb.append("  name: ").append(name).append("\n");
-    sb.append("  photoUrls: ").append(photoUrls).append("\n");
     sb.append("}\n");
     return sb.toString();
   }
diff --git a/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Model200Response.java
index 4a6e58b2a5e..6d3c93d9799 100644
--- a/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Model200Response.java
+++ b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Model200Response.java
@@ -5,7 +5,10 @@ import io.swagger.annotations.*;
 import com.google.gson.annotations.SerializedName;
 
 
-@ApiModel(description = "")
+/**
+ * Model for testing model name starting with number
+ **/
+@ApiModel(description = "Model for testing model name starting with number")
 public class Model200Response  {
   
   @SerializedName("name")
diff --git a/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/ModelReturn.java
index 24763f3acb4..464b0cca25e 100644
--- a/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/ModelReturn.java
+++ b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -5,7 +5,10 @@ import io.swagger.annotations.*;
 import com.google.gson.annotations.SerializedName;
 
 
-@ApiModel(description = "")
+/**
+ * Model for testing reserved words
+ **/
+@ApiModel(description = "Model for testing reserved words")
 public class ModelReturn  {
   
   @SerializedName("return")
diff --git a/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Name.java
index 9763aca7b34..1b320fb26ea 100644
--- a/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Name.java
+++ b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Name.java
@@ -5,7 +5,10 @@ import io.swagger.annotations.*;
 import com.google.gson.annotations.SerializedName;
 
 
-@ApiModel(description = "")
+/**
+ * Model for testing model name same as property name
+ **/
+@ApiModel(description = "Model for testing model name same as property name")
 public class Name  {
   
   @SerializedName("name")
diff --git a/samples/client/petstore/android/volley/build.gradle b/samples/client/petstore/android/volley/build.gradle
index e678620cb00..f794267c737 100644
--- a/samples/client/petstore/android/volley/build.gradle
+++ b/samples/client/petstore/android/volley/build.gradle
@@ -6,10 +6,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
-        
+        classpath 'com.android.tools.build:gradle:1.5.+'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
-        
     }
 }
 
@@ -55,9 +53,10 @@ android {
 ext {
     swagger_annotations_version = "1.5.0"
     gson_version = "2.3.1"
-    httpclient_version = "4.3.3"
+    httpclient_version = "4.5.2"
+    httpcore_version = "4.4.4"
     volley_version = "1.0.19"
-    junit_version = "4.8.1"
+    junit_version = "4.12"
     robolectric_version = "3.0"
     concurrent_unit_version = "0.4.2"
 }
@@ -65,7 +64,7 @@ ext {
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "com.google.code.gson:gson:$gson_version"
-    compile "org.apache.httpcomponents:httpcore:$httpclient_version"
+    compile "org.apache.httpcomponents:httpcore:$httpcore_version"
     compile "org.apache.httpcomponents:httpmime:$httpclient_version"
     compile "com.mcxiaoke.volley:library:${volley_version}@aar"
     testCompile "junit:junit:$junit_version"
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/ApiInvoker.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/ApiInvoker.java
index 21ee5f36286..7ef69c6f0ab 100644
--- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/ApiInvoker.java
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/ApiInvoker.java
@@ -189,50 +189,14 @@ public class ApiInvoker {
 
      // Setup authentications (key: authentication name, value: authentication).
      INSTANCE.authentications = new HashMap<String, Authentication>();
-     
-     
-     INSTANCE.authentications.put("test_api_key_header", new ApiKeyAuth("header", "test_api_key_header"));
-     
-     
-     
-     
-     
-     INSTANCE.authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
-     
-     
-     
-     
-     
-     
-     INSTANCE.authentications.put("test_http_basic", new HttpBasicAuth());
-     
-     
-     
-     
-     INSTANCE.authentications.put("test_api_client_secret", new ApiKeyAuth("header", "x-test_api_client_secret"));
-     
-     
-     
-     
-     
-     INSTANCE.authentications.put("test_api_client_id", new ApiKeyAuth("header", "x-test_api_client_id"));
-     
-     
-     
-     
-     
-     INSTANCE.authentications.put("test_api_key_query", new ApiKeyAuth("query", "test_api_key_query"));
-     
-     
-     
-     
-     
-     
-     
      // TODO: comment out below as OAuth does not exist
      //INSTANCE.authentications.put("petstore_auth", new OAuth());
-     
-     
+     INSTANCE.authentications.put("test_api_client_id", new ApiKeyAuth("header", "x-test_api_client_id"));
+     INSTANCE.authentications.put("test_api_client_secret", new ApiKeyAuth("header", "x-test_api_client_secret"));
+     INSTANCE.authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
+     INSTANCE.authentications.put("test_http_basic", new HttpBasicAuth());
+     INSTANCE.authentications.put("test_api_key_query", new ApiKeyAuth("query", "test_api_key_query"));
+     INSTANCE.authentications.put("test_api_key_header", new ApiKeyAuth("header", "test_api_key_header"));
      // Prevent the authentications from being modified.
      INSTANCE.authentications = Collections.unmodifiableMap(INSTANCE.authentications);
   }
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/JsonUtil.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/JsonUtil.java
index 49ce07a07ae..318c23f957d 100644
--- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/JsonUtil.java
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/JsonUtil.java
@@ -35,10 +35,26 @@ public class JsonUtil {
   public static Type getListTypeForDeserialization(Class cls) {
     String className = cls.getSimpleName();
     
+    if ("Animal".equalsIgnoreCase(className)) {
+      return new TypeToken<List<Animal>>(){}.getType();
+    }
+    
+    if ("Cat".equalsIgnoreCase(className)) {
+      return new TypeToken<List<Cat>>(){}.getType();
+    }
+    
     if ("Category".equalsIgnoreCase(className)) {
       return new TypeToken<List<Category>>(){}.getType();
     }
     
+    if ("Dog".equalsIgnoreCase(className)) {
+      return new TypeToken<List<Dog>>(){}.getType();
+    }
+    
+    if ("FormatTest".equalsIgnoreCase(className)) {
+      return new TypeToken<List<FormatTest>>(){}.getType();
+    }
+    
     if ("InlineResponse200".equalsIgnoreCase(className)) {
       return new TypeToken<List<InlineResponse200>>(){}.getType();
     }
@@ -81,10 +97,26 @@ public class JsonUtil {
   public static Type getTypeForDeserialization(Class cls) {
     String className = cls.getSimpleName();
     
+    if ("Animal".equalsIgnoreCase(className)) {
+      return new TypeToken<Animal>(){}.getType();
+    }
+    
+    if ("Cat".equalsIgnoreCase(className)) {
+      return new TypeToken<Cat>(){}.getType();
+    }
+    
     if ("Category".equalsIgnoreCase(className)) {
       return new TypeToken<Category>(){}.getType();
     }
     
+    if ("Dog".equalsIgnoreCase(className)) {
+      return new TypeToken<Dog>(){}.getType();
+    }
+    
+    if ("FormatTest".equalsIgnoreCase(className)) {
+      return new TypeToken<FormatTest>(){}.getType();
+    }
+    
     if ("InlineResponse200".equalsIgnoreCase(className)) {
       return new TypeToken<InlineResponse200>(){}.getType();
     }
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/PetApi.java
index b0a72ab7d8a..2f39cf7cab1 100644
--- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/PetApi.java
@@ -45,7 +45,6 @@ public class PetApi {
     return basePath;
   }
 
-  
   /**
   * Add a new pet to the store
   * 
@@ -66,9 +65,7 @@ public class PetApi {
       // form params
       Map<String, String> formParams = new HashMap<String, String>();
 
-  
 
-  
 
       String[] contentTypes = {
   "application/json","application/xml"
@@ -84,8 +81,7 @@ public class PetApi {
       postBody = httpEntity;
       } else {
       // normal form params
-  
-      }
+        }
 
       String[] authNames = new String[] { "petstore_auth" };
 
@@ -102,7 +98,10 @@ public class PetApi {
          throw ex;
       } catch (ExecutionException ex) {
          if(ex.getCause() instanceof VolleyError) {
-            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+	    VolleyError volleyError = (VolleyError)ex.getCause();
+	    if (volleyError.networkResponse != null) {
+	       throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage());
+	    }
          }
          throw ex;
       } catch (TimeoutException ex) {
@@ -130,9 +129,7 @@ public class PetApi {
     // form params
     Map<String, String> formParams = new HashMap<String, String>();
 
-    
 
-    
 
     String[] contentTypes = {
       "application/json","application/xml"
@@ -148,8 +145,7 @@ public class PetApi {
       postBody = httpEntity;
     } else {
       // normal form params
-      
-    }
+          }
 
       String[] authNames = new String[] { "petstore_auth" };
 
@@ -158,11 +154,7 @@ public class PetApi {
         new Response.Listener<String>() {
           @Override
           public void onResponse(String localVarResponse) {
-            
-              
               responseListener.onResponse(localVarResponse);
-              
-            
           }
       }, new Response.ErrorListener() {
           @Override
@@ -174,7 +166,6 @@ public class PetApi {
       errorListener.onErrorResponse(new VolleyError(ex));
     }
   }
-  
   /**
   * Fake endpoint to test byte array in body parameter for adding a new pet to the store
   * 
@@ -186,7 +177,7 @@ public class PetApi {
   
 
   // create path and map variables
-  String path = "/pet?testing_byte_array=true".replaceAll("\\{format\\}","json");
+  String path = "/pet?testing_byte_array&#x3D;true".replaceAll("\\{format\\}","json");
 
   // query params
   List<Pair> queryParams = new ArrayList<Pair>();
@@ -195,9 +186,7 @@ public class PetApi {
       // form params
       Map<String, String> formParams = new HashMap<String, String>();
 
-  
 
-  
 
       String[] contentTypes = {
   "application/json","application/xml"
@@ -213,8 +202,7 @@ public class PetApi {
       postBody = httpEntity;
       } else {
       // normal form params
-  
-      }
+        }
 
       String[] authNames = new String[] { "petstore_auth" };
 
@@ -231,7 +219,10 @@ public class PetApi {
          throw ex;
       } catch (ExecutionException ex) {
          if(ex.getCause() instanceof VolleyError) {
-            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+	    VolleyError volleyError = (VolleyError)ex.getCause();
+	    if (volleyError.networkResponse != null) {
+	       throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage());
+	    }
          }
          throw ex;
       } catch (TimeoutException ex) {
@@ -250,7 +241,7 @@ public class PetApi {
   
 
     // create path and map variables
-    String path = "/pet?testing_byte_array=true".replaceAll("\\{format\\}","json");
+    String path = "/pet?testing_byte_array&#x3D;true".replaceAll("\\{format\\}","json");
 
     // query params
     List<Pair> queryParams = new ArrayList<Pair>();
@@ -259,9 +250,7 @@ public class PetApi {
     // form params
     Map<String, String> formParams = new HashMap<String, String>();
 
-    
 
-    
 
     String[] contentTypes = {
       "application/json","application/xml"
@@ -277,8 +266,7 @@ public class PetApi {
       postBody = httpEntity;
     } else {
       // normal form params
-      
-    }
+          }
 
       String[] authNames = new String[] { "petstore_auth" };
 
@@ -287,11 +275,7 @@ public class PetApi {
         new Response.Listener<String>() {
           @Override
           public void onResponse(String localVarResponse) {
-            
-              
               responseListener.onResponse(localVarResponse);
-              
-            
           }
       }, new Response.ErrorListener() {
           @Override
@@ -303,7 +287,6 @@ public class PetApi {
       errorListener.onErrorResponse(new VolleyError(ex));
     }
   }
-  
   /**
   * Deletes a pet
   * 
@@ -331,11 +314,8 @@ public class PetApi {
       // form params
       Map<String, String> formParams = new HashMap<String, String>();
 
-  
 
-  
           headerParams.put("api_key", ApiInvoker.parameterToString(apiKey));
-  
 
       String[] contentTypes = {
   
@@ -351,8 +331,7 @@ public class PetApi {
       postBody = httpEntity;
       } else {
       // normal form params
-  
-      }
+        }
 
       String[] authNames = new String[] { "petstore_auth" };
 
@@ -369,7 +348,10 @@ public class PetApi {
          throw ex;
       } catch (ExecutionException ex) {
          if(ex.getCause() instanceof VolleyError) {
-            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+	    VolleyError volleyError = (VolleyError)ex.getCause();
+	    if (volleyError.networkResponse != null) {
+	       throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage());
+	    }
          }
          throw ex;
       } catch (TimeoutException ex) {
@@ -403,11 +385,8 @@ public class PetApi {
     // form params
     Map<String, String> formParams = new HashMap<String, String>();
 
-    
 
-    
     headerParams.put("api_key", ApiInvoker.parameterToString(apiKey));
-    
 
     String[] contentTypes = {
       
@@ -423,8 +402,7 @@ public class PetApi {
       postBody = httpEntity;
     } else {
       // normal form params
-      
-    }
+          }
 
       String[] authNames = new String[] { "petstore_auth" };
 
@@ -433,11 +411,7 @@ public class PetApi {
         new Response.Listener<String>() {
           @Override
           public void onResponse(String localVarResponse) {
-            
-              
               responseListener.onResponse(localVarResponse);
-              
-            
           }
       }, new Response.ErrorListener() {
           @Override
@@ -449,7 +423,6 @@ public class PetApi {
       errorListener.onErrorResponse(new VolleyError(ex));
     }
   }
-  
   /**
   * Finds Pets by status
   * Multiple status values can be provided with comma separated strings
@@ -470,11 +443,8 @@ public class PetApi {
       // form params
       Map<String, String> formParams = new HashMap<String, String>();
 
-  
           queryParams.addAll(ApiInvoker.parameterToPairs("multi", "status", status));
-  
 
-  
 
       String[] contentTypes = {
   
@@ -490,8 +460,7 @@ public class PetApi {
       postBody = httpEntity;
       } else {
       // normal form params
-  
-      }
+        }
 
       String[] authNames = new String[] { "petstore_auth" };
 
@@ -508,7 +477,10 @@ public class PetApi {
          throw ex;
       } catch (ExecutionException ex) {
          if(ex.getCause() instanceof VolleyError) {
-            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+	    VolleyError volleyError = (VolleyError)ex.getCause();
+	    if (volleyError.networkResponse != null) {
+	       throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage());
+	    }
          }
          throw ex;
       } catch (TimeoutException ex) {
@@ -536,11 +508,8 @@ public class PetApi {
     // form params
     Map<String, String> formParams = new HashMap<String, String>();
 
-    
     queryParams.addAll(ApiInvoker.parameterToPairs("multi", "status", status));
-    
 
-    
 
     String[] contentTypes = {
       
@@ -556,8 +525,7 @@ public class PetApi {
       postBody = httpEntity;
     } else {
       // normal form params
-      
-    }
+          }
 
       String[] authNames = new String[] { "petstore_auth" };
 
@@ -566,16 +534,11 @@ public class PetApi {
         new Response.Listener<String>() {
           @Override
           public void onResponse(String localVarResponse) {
-            
             try {
               responseListener.onResponse((List<Pet>) ApiInvoker.deserialize(localVarResponse,  "array", Pet.class));
-              
-              
-            
             } catch (ApiException exception) {
                errorListener.onErrorResponse(new VolleyError(exception));
             }
-            
           }
       }, new Response.ErrorListener() {
           @Override
@@ -587,7 +550,6 @@ public class PetApi {
       errorListener.onErrorResponse(new VolleyError(ex));
     }
   }
-  
   /**
   * Finds Pets by tags
   * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
@@ -608,11 +570,8 @@ public class PetApi {
       // form params
       Map<String, String> formParams = new HashMap<String, String>();
 
-  
           queryParams.addAll(ApiInvoker.parameterToPairs("multi", "tags", tags));
-  
 
-  
 
       String[] contentTypes = {
   
@@ -628,8 +587,7 @@ public class PetApi {
       postBody = httpEntity;
       } else {
       // normal form params
-  
-      }
+        }
 
       String[] authNames = new String[] { "petstore_auth" };
 
@@ -646,7 +604,10 @@ public class PetApi {
          throw ex;
       } catch (ExecutionException ex) {
          if(ex.getCause() instanceof VolleyError) {
-            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+	    VolleyError volleyError = (VolleyError)ex.getCause();
+	    if (volleyError.networkResponse != null) {
+	       throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage());
+	    }
          }
          throw ex;
       } catch (TimeoutException ex) {
@@ -674,11 +635,8 @@ public class PetApi {
     // form params
     Map<String, String> formParams = new HashMap<String, String>();
 
-    
     queryParams.addAll(ApiInvoker.parameterToPairs("multi", "tags", tags));
-    
 
-    
 
     String[] contentTypes = {
       
@@ -694,8 +652,7 @@ public class PetApi {
       postBody = httpEntity;
     } else {
       // normal form params
-      
-    }
+          }
 
       String[] authNames = new String[] { "petstore_auth" };
 
@@ -704,16 +661,11 @@ public class PetApi {
         new Response.Listener<String>() {
           @Override
           public void onResponse(String localVarResponse) {
-            
             try {
               responseListener.onResponse((List<Pet>) ApiInvoker.deserialize(localVarResponse,  "array", Pet.class));
-              
-              
-            
             } catch (ApiException exception) {
                errorListener.onErrorResponse(new VolleyError(exception));
             }
-            
           }
       }, new Response.ErrorListener() {
           @Override
@@ -725,7 +677,6 @@ public class PetApi {
       errorListener.onErrorResponse(new VolleyError(ex));
     }
   }
-  
   /**
   * Find pet by ID
   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
@@ -752,9 +703,7 @@ public class PetApi {
       // form params
       Map<String, String> formParams = new HashMap<String, String>();
 
-  
 
-  
 
       String[] contentTypes = {
   
@@ -770,10 +719,9 @@ public class PetApi {
       postBody = httpEntity;
       } else {
       // normal form params
-  
-      }
+        }
 
-      String[] authNames = new String[] { "api_key", "petstore_auth" };
+      String[] authNames = new String[] { "petstore_auth", "api_key" };
 
       try {
         String localVarResponse = apiInvoker.invokeAPI (basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames);
@@ -788,7 +736,10 @@ public class PetApi {
          throw ex;
       } catch (ExecutionException ex) {
          if(ex.getCause() instanceof VolleyError) {
-            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+	    VolleyError volleyError = (VolleyError)ex.getCause();
+	    if (volleyError.networkResponse != null) {
+	       throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage());
+	    }
          }
          throw ex;
       } catch (TimeoutException ex) {
@@ -822,9 +773,7 @@ public class PetApi {
     // form params
     Map<String, String> formParams = new HashMap<String, String>();
 
-    
 
-    
 
     String[] contentTypes = {
       
@@ -840,26 +789,20 @@ public class PetApi {
       postBody = httpEntity;
     } else {
       // normal form params
-      
-    }
+          }
 
-      String[] authNames = new String[] { "api_key", "petstore_auth" };
+      String[] authNames = new String[] { "petstore_auth", "api_key" };
 
     try {
       apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames,
         new Response.Listener<String>() {
           @Override
           public void onResponse(String localVarResponse) {
-            
             try {
               responseListener.onResponse((Pet) ApiInvoker.deserialize(localVarResponse,  "", Pet.class));
-              
-              
-            
             } catch (ApiException exception) {
                errorListener.onErrorResponse(new VolleyError(exception));
             }
-            
           }
       }, new Response.ErrorListener() {
           @Override
@@ -871,7 +814,6 @@ public class PetApi {
       errorListener.onErrorResponse(new VolleyError(ex));
     }
   }
-  
   /**
   * Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
@@ -889,7 +831,7 @@ public class PetApi {
   
 
   // create path and map variables
-  String path = "/pet/{petId}?response=inline_arbitrary_object".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
+  String path = "/pet/{petId}?response&#x3D;inline_arbitrary_object".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
 
   // query params
   List<Pair> queryParams = new ArrayList<Pair>();
@@ -898,9 +840,7 @@ public class PetApi {
       // form params
       Map<String, String> formParams = new HashMap<String, String>();
 
-  
 
-  
 
       String[] contentTypes = {
   
@@ -916,10 +856,9 @@ public class PetApi {
       postBody = httpEntity;
       } else {
       // normal form params
-  
-      }
+        }
 
-      String[] authNames = new String[] { "api_key", "petstore_auth" };
+      String[] authNames = new String[] { "petstore_auth", "api_key" };
 
       try {
         String localVarResponse = apiInvoker.invokeAPI (basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames);
@@ -934,7 +873,10 @@ public class PetApi {
          throw ex;
       } catch (ExecutionException ex) {
          if(ex.getCause() instanceof VolleyError) {
-            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+	    VolleyError volleyError = (VolleyError)ex.getCause();
+	    if (volleyError.networkResponse != null) {
+	       throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage());
+	    }
          }
          throw ex;
       } catch (TimeoutException ex) {
@@ -959,7 +901,7 @@ public class PetApi {
     
 
     // create path and map variables
-    String path = "/pet/{petId}?response=inline_arbitrary_object".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
+    String path = "/pet/{petId}?response&#x3D;inline_arbitrary_object".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
 
     // query params
     List<Pair> queryParams = new ArrayList<Pair>();
@@ -968,9 +910,7 @@ public class PetApi {
     // form params
     Map<String, String> formParams = new HashMap<String, String>();
 
-    
 
-    
 
     String[] contentTypes = {
       
@@ -986,26 +926,20 @@ public class PetApi {
       postBody = httpEntity;
     } else {
       // normal form params
-      
-    }
+          }
 
-      String[] authNames = new String[] { "api_key", "petstore_auth" };
+      String[] authNames = new String[] { "petstore_auth", "api_key" };
 
     try {
       apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames,
         new Response.Listener<String>() {
           @Override
           public void onResponse(String localVarResponse) {
-            
             try {
               responseListener.onResponse((InlineResponse200) ApiInvoker.deserialize(localVarResponse,  "", InlineResponse200.class));
-              
-              
-            
             } catch (ApiException exception) {
                errorListener.onErrorResponse(new VolleyError(exception));
             }
-            
           }
       }, new Response.ErrorListener() {
           @Override
@@ -1017,7 +951,6 @@ public class PetApi {
       errorListener.onErrorResponse(new VolleyError(ex));
     }
   }
-  
   /**
   * Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
@@ -1035,7 +968,7 @@ public class PetApi {
   
 
   // create path and map variables
-  String path = "/pet/{petId}?testing_byte_array=true".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
+  String path = "/pet/{petId}?testing_byte_array&#x3D;true".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
 
   // query params
   List<Pair> queryParams = new ArrayList<Pair>();
@@ -1044,9 +977,7 @@ public class PetApi {
       // form params
       Map<String, String> formParams = new HashMap<String, String>();
 
-  
 
-  
 
       String[] contentTypes = {
   
@@ -1062,10 +993,9 @@ public class PetApi {
       postBody = httpEntity;
       } else {
       // normal form params
-  
-      }
+        }
 
-      String[] authNames = new String[] { "api_key", "petstore_auth" };
+      String[] authNames = new String[] { "petstore_auth", "api_key" };
 
       try {
         String localVarResponse = apiInvoker.invokeAPI (basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames);
@@ -1080,7 +1010,10 @@ public class PetApi {
          throw ex;
       } catch (ExecutionException ex) {
          if(ex.getCause() instanceof VolleyError) {
-            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+	    VolleyError volleyError = (VolleyError)ex.getCause();
+	    if (volleyError.networkResponse != null) {
+	       throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage());
+	    }
          }
          throw ex;
       } catch (TimeoutException ex) {
@@ -1105,7 +1038,7 @@ public class PetApi {
     
 
     // create path and map variables
-    String path = "/pet/{petId}?testing_byte_array=true".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
+    String path = "/pet/{petId}?testing_byte_array&#x3D;true".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
 
     // query params
     List<Pair> queryParams = new ArrayList<Pair>();
@@ -1114,9 +1047,7 @@ public class PetApi {
     // form params
     Map<String, String> formParams = new HashMap<String, String>();
 
-    
 
-    
 
     String[] contentTypes = {
       
@@ -1132,26 +1063,20 @@ public class PetApi {
       postBody = httpEntity;
     } else {
       // normal form params
-      
-    }
+          }
 
-      String[] authNames = new String[] { "api_key", "petstore_auth" };
+      String[] authNames = new String[] { "petstore_auth", "api_key" };
 
     try {
       apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames,
         new Response.Listener<String>() {
           @Override
           public void onResponse(String localVarResponse) {
-            
             try {
               responseListener.onResponse((byte[]) ApiInvoker.deserialize(localVarResponse,  "", byte[].class));
-              
-              
-            
             } catch (ApiException exception) {
                errorListener.onErrorResponse(new VolleyError(exception));
             }
-            
           }
       }, new Response.ErrorListener() {
           @Override
@@ -1163,7 +1088,6 @@ public class PetApi {
       errorListener.onErrorResponse(new VolleyError(ex));
     }
   }
-  
   /**
   * Update an existing pet
   * 
@@ -1184,9 +1108,7 @@ public class PetApi {
       // form params
       Map<String, String> formParams = new HashMap<String, String>();
 
-  
 
-  
 
       String[] contentTypes = {
   "application/json","application/xml"
@@ -1202,8 +1124,7 @@ public class PetApi {
       postBody = httpEntity;
       } else {
       // normal form params
-  
-      }
+        }
 
       String[] authNames = new String[] { "petstore_auth" };
 
@@ -1220,7 +1141,10 @@ public class PetApi {
          throw ex;
       } catch (ExecutionException ex) {
          if(ex.getCause() instanceof VolleyError) {
-            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+	    VolleyError volleyError = (VolleyError)ex.getCause();
+	    if (volleyError.networkResponse != null) {
+	       throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage());
+	    }
          }
          throw ex;
       } catch (TimeoutException ex) {
@@ -1248,9 +1172,7 @@ public class PetApi {
     // form params
     Map<String, String> formParams = new HashMap<String, String>();
 
-    
 
-    
 
     String[] contentTypes = {
       "application/json","application/xml"
@@ -1266,8 +1188,7 @@ public class PetApi {
       postBody = httpEntity;
     } else {
       // normal form params
-      
-    }
+          }
 
       String[] authNames = new String[] { "petstore_auth" };
 
@@ -1276,11 +1197,7 @@ public class PetApi {
         new Response.Listener<String>() {
           @Override
           public void onResponse(String localVarResponse) {
-            
-              
               responseListener.onResponse(localVarResponse);
-              
-            
           }
       }, new Response.ErrorListener() {
           @Override
@@ -1292,7 +1209,6 @@ public class PetApi {
       errorListener.onErrorResponse(new VolleyError(ex));
     }
   }
-  
   /**
   * Updates a pet in the store with form data
   * 
@@ -1321,9 +1237,7 @@ public class PetApi {
       // form params
       Map<String, String> formParams = new HashMap<String, String>();
 
-  
 
-  
 
       String[] contentTypes = {
   "application/x-www-form-urlencoded"
@@ -1348,8 +1262,7 @@ public class PetApi {
       } else {
       // normal form params
   formParams.put("name", ApiInvoker.parameterToString(name));
-  formParams.put("status", ApiInvoker.parameterToString(status));
-  
+formParams.put("status", ApiInvoker.parameterToString(status));
       }
 
       String[] authNames = new String[] { "petstore_auth" };
@@ -1367,7 +1280,10 @@ public class PetApi {
          throw ex;
       } catch (ExecutionException ex) {
          if(ex.getCause() instanceof VolleyError) {
-            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+	    VolleyError volleyError = (VolleyError)ex.getCause();
+	    if (volleyError.networkResponse != null) {
+	       throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage());
+	    }
          }
          throw ex;
       } catch (TimeoutException ex) {
@@ -1401,9 +1317,7 @@ public class PetApi {
     // form params
     Map<String, String> formParams = new HashMap<String, String>();
 
-    
 
-    
 
     String[] contentTypes = {
       "application/x-www-form-urlencoded"
@@ -1428,8 +1342,7 @@ public class PetApi {
     } else {
       // normal form params
       formParams.put("name", ApiInvoker.parameterToString(name));
-      formParams.put("status", ApiInvoker.parameterToString(status));
-      
+formParams.put("status", ApiInvoker.parameterToString(status));
     }
 
       String[] authNames = new String[] { "petstore_auth" };
@@ -1439,11 +1352,7 @@ public class PetApi {
         new Response.Listener<String>() {
           @Override
           public void onResponse(String localVarResponse) {
-            
-              
               responseListener.onResponse(localVarResponse);
-              
-            
           }
       }, new Response.ErrorListener() {
           @Override
@@ -1455,7 +1364,6 @@ public class PetApi {
       errorListener.onErrorResponse(new VolleyError(ex));
     }
   }
-  
   /**
   * uploads an image
   * 
@@ -1484,9 +1392,7 @@ public class PetApi {
       // form params
       Map<String, String> formParams = new HashMap<String, String>();
 
-  
 
-  
 
       String[] contentTypes = {
   "multipart/form-data"
@@ -1511,8 +1417,7 @@ public class PetApi {
       } else {
       // normal form params
   formParams.put("additionalMetadata", ApiInvoker.parameterToString(additionalMetadata));
-  
-  
+
       }
 
       String[] authNames = new String[] { "petstore_auth" };
@@ -1530,7 +1435,10 @@ public class PetApi {
          throw ex;
       } catch (ExecutionException ex) {
          if(ex.getCause() instanceof VolleyError) {
-            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+	    VolleyError volleyError = (VolleyError)ex.getCause();
+	    if (volleyError.networkResponse != null) {
+	       throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage());
+	    }
          }
          throw ex;
       } catch (TimeoutException ex) {
@@ -1564,9 +1472,7 @@ public class PetApi {
     // form params
     Map<String, String> formParams = new HashMap<String, String>();
 
-    
 
-    
 
     String[] contentTypes = {
       "multipart/form-data"
@@ -1591,8 +1497,7 @@ public class PetApi {
     } else {
       // normal form params
       formParams.put("additionalMetadata", ApiInvoker.parameterToString(additionalMetadata));
-      
-      
+
     }
 
       String[] authNames = new String[] { "petstore_auth" };
@@ -1602,11 +1507,7 @@ public class PetApi {
         new Response.Listener<String>() {
           @Override
           public void onResponse(String localVarResponse) {
-            
-              
               responseListener.onResponse(localVarResponse);
-              
-            
           }
       }, new Response.ErrorListener() {
           @Override
@@ -1618,5 +1519,4 @@ public class PetApi {
       errorListener.onErrorResponse(new VolleyError(ex));
     }
   }
-  
 }
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/StoreApi.java
index e0aa403200a..2d7b1e7683f 100644
--- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/StoreApi.java
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/StoreApi.java
@@ -44,7 +44,6 @@ public class StoreApi {
     return basePath;
   }
 
-  
   /**
   * Delete purchase order by ID
   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
@@ -71,9 +70,7 @@ public class StoreApi {
       // form params
       Map<String, String> formParams = new HashMap<String, String>();
 
-  
 
-  
 
       String[] contentTypes = {
   
@@ -89,8 +86,7 @@ public class StoreApi {
       postBody = httpEntity;
       } else {
       // normal form params
-  
-      }
+        }
 
       String[] authNames = new String[] {  };
 
@@ -107,7 +103,10 @@ public class StoreApi {
          throw ex;
       } catch (ExecutionException ex) {
          if(ex.getCause() instanceof VolleyError) {
-            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+	    VolleyError volleyError = (VolleyError)ex.getCause();
+	    if (volleyError.networkResponse != null) {
+	       throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage());
+	    }
          }
          throw ex;
       } catch (TimeoutException ex) {
@@ -141,9 +140,7 @@ public class StoreApi {
     // form params
     Map<String, String> formParams = new HashMap<String, String>();
 
-    
 
-    
 
     String[] contentTypes = {
       
@@ -159,8 +156,7 @@ public class StoreApi {
       postBody = httpEntity;
     } else {
       // normal form params
-      
-    }
+          }
 
       String[] authNames = new String[] {  };
 
@@ -169,11 +165,7 @@ public class StoreApi {
         new Response.Listener<String>() {
           @Override
           public void onResponse(String localVarResponse) {
-            
-              
               responseListener.onResponse(localVarResponse);
-              
-            
           }
       }, new Response.ErrorListener() {
           @Override
@@ -185,7 +177,6 @@ public class StoreApi {
       errorListener.onErrorResponse(new VolleyError(ex));
     }
   }
-  
   /**
   * Finds orders by status
   * A single status value can be provided as a string
@@ -206,11 +197,8 @@ public class StoreApi {
       // form params
       Map<String, String> formParams = new HashMap<String, String>();
 
-  
           queryParams.addAll(ApiInvoker.parameterToPairs("", "status", status));
-  
 
-  
 
       String[] contentTypes = {
   
@@ -226,8 +214,7 @@ public class StoreApi {
       postBody = httpEntity;
       } else {
       // normal form params
-  
-      }
+        }
 
       String[] authNames = new String[] { "test_api_client_id", "test_api_client_secret" };
 
@@ -244,7 +231,10 @@ public class StoreApi {
          throw ex;
       } catch (ExecutionException ex) {
          if(ex.getCause() instanceof VolleyError) {
-            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+	    VolleyError volleyError = (VolleyError)ex.getCause();
+	    if (volleyError.networkResponse != null) {
+	       throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage());
+	    }
          }
          throw ex;
       } catch (TimeoutException ex) {
@@ -272,11 +262,8 @@ public class StoreApi {
     // form params
     Map<String, String> formParams = new HashMap<String, String>();
 
-    
     queryParams.addAll(ApiInvoker.parameterToPairs("", "status", status));
-    
 
-    
 
     String[] contentTypes = {
       
@@ -292,8 +279,7 @@ public class StoreApi {
       postBody = httpEntity;
     } else {
       // normal form params
-      
-    }
+          }
 
       String[] authNames = new String[] { "test_api_client_id", "test_api_client_secret" };
 
@@ -302,16 +288,11 @@ public class StoreApi {
         new Response.Listener<String>() {
           @Override
           public void onResponse(String localVarResponse) {
-            
             try {
               responseListener.onResponse((List<Order>) ApiInvoker.deserialize(localVarResponse,  "array", Order.class));
-              
-              
-            
             } catch (ApiException exception) {
                errorListener.onErrorResponse(new VolleyError(exception));
             }
-            
           }
       }, new Response.ErrorListener() {
           @Override
@@ -323,7 +304,6 @@ public class StoreApi {
       errorListener.onErrorResponse(new VolleyError(ex));
     }
   }
-  
   /**
   * Returns pet inventories by status
   * Returns a map of status codes to quantities
@@ -343,9 +323,7 @@ public class StoreApi {
       // form params
       Map<String, String> formParams = new HashMap<String, String>();
 
-  
 
-  
 
       String[] contentTypes = {
   
@@ -361,8 +339,7 @@ public class StoreApi {
       postBody = httpEntity;
       } else {
       // normal form params
-  
-      }
+        }
 
       String[] authNames = new String[] { "api_key" };
 
@@ -379,7 +356,10 @@ public class StoreApi {
          throw ex;
       } catch (ExecutionException ex) {
          if(ex.getCause() instanceof VolleyError) {
-            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+	    VolleyError volleyError = (VolleyError)ex.getCause();
+	    if (volleyError.networkResponse != null) {
+	       throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage());
+	    }
          }
          throw ex;
       } catch (TimeoutException ex) {
@@ -407,9 +387,7 @@ public class StoreApi {
     // form params
     Map<String, String> formParams = new HashMap<String, String>();
 
-    
 
-    
 
     String[] contentTypes = {
       
@@ -425,8 +403,7 @@ public class StoreApi {
       postBody = httpEntity;
     } else {
       // normal form params
-      
-    }
+          }
 
       String[] authNames = new String[] { "api_key" };
 
@@ -435,16 +412,11 @@ public class StoreApi {
         new Response.Listener<String>() {
           @Override
           public void onResponse(String localVarResponse) {
-            
             try {
               responseListener.onResponse((Map<String, Integer>) ApiInvoker.deserialize(localVarResponse,  "map", Map.class));
-              
-              
-            
             } catch (ApiException exception) {
                errorListener.onErrorResponse(new VolleyError(exception));
             }
-            
           }
       }, new Response.ErrorListener() {
           @Override
@@ -456,7 +428,6 @@ public class StoreApi {
       errorListener.onErrorResponse(new VolleyError(ex));
     }
   }
-  
   /**
   * Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
   * Returns an arbitrary object which is actually a map of status codes to quantities
@@ -467,7 +438,7 @@ public class StoreApi {
   
 
   // create path and map variables
-  String path = "/store/inventory?response=arbitrary_object".replaceAll("\\{format\\}","json");
+  String path = "/store/inventory?response&#x3D;arbitrary_object".replaceAll("\\{format\\}","json");
 
   // query params
   List<Pair> queryParams = new ArrayList<Pair>();
@@ -476,9 +447,7 @@ public class StoreApi {
       // form params
       Map<String, String> formParams = new HashMap<String, String>();
 
-  
 
-  
 
       String[] contentTypes = {
   
@@ -494,8 +463,7 @@ public class StoreApi {
       postBody = httpEntity;
       } else {
       // normal form params
-  
-      }
+        }
 
       String[] authNames = new String[] { "api_key" };
 
@@ -512,7 +480,10 @@ public class StoreApi {
          throw ex;
       } catch (ExecutionException ex) {
          if(ex.getCause() instanceof VolleyError) {
-            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+	    VolleyError volleyError = (VolleyError)ex.getCause();
+	    if (volleyError.networkResponse != null) {
+	       throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage());
+	    }
          }
          throw ex;
       } catch (TimeoutException ex) {
@@ -531,7 +502,7 @@ public class StoreApi {
   
 
     // create path and map variables
-    String path = "/store/inventory?response=arbitrary_object".replaceAll("\\{format\\}","json");
+    String path = "/store/inventory?response&#x3D;arbitrary_object".replaceAll("\\{format\\}","json");
 
     // query params
     List<Pair> queryParams = new ArrayList<Pair>();
@@ -540,9 +511,7 @@ public class StoreApi {
     // form params
     Map<String, String> formParams = new HashMap<String, String>();
 
-    
 
-    
 
     String[] contentTypes = {
       
@@ -558,8 +527,7 @@ public class StoreApi {
       postBody = httpEntity;
     } else {
       // normal form params
-      
-    }
+          }
 
       String[] authNames = new String[] { "api_key" };
 
@@ -568,16 +536,11 @@ public class StoreApi {
         new Response.Listener<String>() {
           @Override
           public void onResponse(String localVarResponse) {
-            
             try {
               responseListener.onResponse((Object) ApiInvoker.deserialize(localVarResponse,  "", Object.class));
-              
-              
-            
             } catch (ApiException exception) {
                errorListener.onErrorResponse(new VolleyError(exception));
             }
-            
           }
       }, new Response.ErrorListener() {
           @Override
@@ -589,10 +552,9 @@ public class StoreApi {
       errorListener.onErrorResponse(new VolleyError(ex));
     }
   }
-  
   /**
   * Find purchase order by ID
-  * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+  * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
    * @param orderId ID of pet that needs to be fetched
    * @return Order
   */
@@ -616,9 +578,7 @@ public class StoreApi {
       // form params
       Map<String, String> formParams = new HashMap<String, String>();
 
-  
 
-  
 
       String[] contentTypes = {
   
@@ -634,10 +594,9 @@ public class StoreApi {
       postBody = httpEntity;
       } else {
       // normal form params
-  
-      }
+        }
 
-      String[] authNames = new String[] { "test_api_key_header", "test_api_key_query" };
+      String[] authNames = new String[] { "test_api_key_query", "test_api_key_header" };
 
       try {
         String localVarResponse = apiInvoker.invokeAPI (basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames);
@@ -652,7 +611,10 @@ public class StoreApi {
          throw ex;
       } catch (ExecutionException ex) {
          if(ex.getCause() instanceof VolleyError) {
-            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+	    VolleyError volleyError = (VolleyError)ex.getCause();
+	    if (volleyError.networkResponse != null) {
+	       throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage());
+	    }
          }
          throw ex;
       } catch (TimeoutException ex) {
@@ -662,7 +624,7 @@ public class StoreApi {
 
       /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+   * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
    * @param orderId ID of pet that needs to be fetched
   */
   public void getOrderById (String orderId, final Response.Listener<Order> responseListener, final Response.ErrorListener errorListener) {
@@ -686,9 +648,7 @@ public class StoreApi {
     // form params
     Map<String, String> formParams = new HashMap<String, String>();
 
-    
 
-    
 
     String[] contentTypes = {
       
@@ -704,26 +664,20 @@ public class StoreApi {
       postBody = httpEntity;
     } else {
       // normal form params
-      
-    }
+          }
 
-      String[] authNames = new String[] { "test_api_key_header", "test_api_key_query" };
+      String[] authNames = new String[] { "test_api_key_query", "test_api_key_header" };
 
     try {
       apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames,
         new Response.Listener<String>() {
           @Override
           public void onResponse(String localVarResponse) {
-            
             try {
               responseListener.onResponse((Order) ApiInvoker.deserialize(localVarResponse,  "", Order.class));
-              
-              
-            
             } catch (ApiException exception) {
                errorListener.onErrorResponse(new VolleyError(exception));
             }
-            
           }
       }, new Response.ErrorListener() {
           @Override
@@ -735,7 +689,6 @@ public class StoreApi {
       errorListener.onErrorResponse(new VolleyError(ex));
     }
   }
-  
   /**
   * Place an order for a pet
   * 
@@ -756,9 +709,7 @@ public class StoreApi {
       // form params
       Map<String, String> formParams = new HashMap<String, String>();
 
-  
 
-  
 
       String[] contentTypes = {
   
@@ -774,8 +725,7 @@ public class StoreApi {
       postBody = httpEntity;
       } else {
       // normal form params
-  
-      }
+        }
 
       String[] authNames = new String[] { "test_api_client_id", "test_api_client_secret" };
 
@@ -792,7 +742,10 @@ public class StoreApi {
          throw ex;
       } catch (ExecutionException ex) {
          if(ex.getCause() instanceof VolleyError) {
-            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+	    VolleyError volleyError = (VolleyError)ex.getCause();
+	    if (volleyError.networkResponse != null) {
+	       throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage());
+	    }
          }
          throw ex;
       } catch (TimeoutException ex) {
@@ -820,9 +773,7 @@ public class StoreApi {
     // form params
     Map<String, String> formParams = new HashMap<String, String>();
 
-    
 
-    
 
     String[] contentTypes = {
       
@@ -838,8 +789,7 @@ public class StoreApi {
       postBody = httpEntity;
     } else {
       // normal form params
-      
-    }
+          }
 
       String[] authNames = new String[] { "test_api_client_id", "test_api_client_secret" };
 
@@ -848,16 +798,11 @@ public class StoreApi {
         new Response.Listener<String>() {
           @Override
           public void onResponse(String localVarResponse) {
-            
             try {
               responseListener.onResponse((Order) ApiInvoker.deserialize(localVarResponse,  "", Order.class));
-              
-              
-            
             } catch (ApiException exception) {
                errorListener.onErrorResponse(new VolleyError(exception));
             }
-            
           }
       }, new Response.ErrorListener() {
           @Override
@@ -869,5 +814,4 @@ public class StoreApi {
       errorListener.onErrorResponse(new VolleyError(ex));
     }
   }
-  
 }
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/UserApi.java
index 0938e600dd2..33575e314b9 100644
--- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/UserApi.java
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/UserApi.java
@@ -44,7 +44,6 @@ public class UserApi {
     return basePath;
   }
 
-  
   /**
   * Create user
   * This can only be done by the logged in user.
@@ -65,9 +64,7 @@ public class UserApi {
       // form params
       Map<String, String> formParams = new HashMap<String, String>();
 
-  
 
-  
 
       String[] contentTypes = {
   
@@ -83,8 +80,7 @@ public class UserApi {
       postBody = httpEntity;
       } else {
       // normal form params
-  
-      }
+        }
 
       String[] authNames = new String[] {  };
 
@@ -101,7 +97,10 @@ public class UserApi {
          throw ex;
       } catch (ExecutionException ex) {
          if(ex.getCause() instanceof VolleyError) {
-            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+	    VolleyError volleyError = (VolleyError)ex.getCause();
+	    if (volleyError.networkResponse != null) {
+	       throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage());
+	    }
          }
          throw ex;
       } catch (TimeoutException ex) {
@@ -129,9 +128,7 @@ public class UserApi {
     // form params
     Map<String, String> formParams = new HashMap<String, String>();
 
-    
 
-    
 
     String[] contentTypes = {
       
@@ -147,8 +144,7 @@ public class UserApi {
       postBody = httpEntity;
     } else {
       // normal form params
-      
-    }
+          }
 
       String[] authNames = new String[] {  };
 
@@ -157,11 +153,7 @@ public class UserApi {
         new Response.Listener<String>() {
           @Override
           public void onResponse(String localVarResponse) {
-            
-              
               responseListener.onResponse(localVarResponse);
-              
-            
           }
       }, new Response.ErrorListener() {
           @Override
@@ -173,7 +165,6 @@ public class UserApi {
       errorListener.onErrorResponse(new VolleyError(ex));
     }
   }
-  
   /**
   * Creates list of users with given input array
   * 
@@ -194,9 +185,7 @@ public class UserApi {
       // form params
       Map<String, String> formParams = new HashMap<String, String>();
 
-  
 
-  
 
       String[] contentTypes = {
   
@@ -212,8 +201,7 @@ public class UserApi {
       postBody = httpEntity;
       } else {
       // normal form params
-  
-      }
+        }
 
       String[] authNames = new String[] {  };
 
@@ -230,7 +218,10 @@ public class UserApi {
          throw ex;
       } catch (ExecutionException ex) {
          if(ex.getCause() instanceof VolleyError) {
-            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+	    VolleyError volleyError = (VolleyError)ex.getCause();
+	    if (volleyError.networkResponse != null) {
+	       throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage());
+	    }
          }
          throw ex;
       } catch (TimeoutException ex) {
@@ -258,9 +249,7 @@ public class UserApi {
     // form params
     Map<String, String> formParams = new HashMap<String, String>();
 
-    
 
-    
 
     String[] contentTypes = {
       
@@ -276,8 +265,7 @@ public class UserApi {
       postBody = httpEntity;
     } else {
       // normal form params
-      
-    }
+          }
 
       String[] authNames = new String[] {  };
 
@@ -286,11 +274,7 @@ public class UserApi {
         new Response.Listener<String>() {
           @Override
           public void onResponse(String localVarResponse) {
-            
-              
               responseListener.onResponse(localVarResponse);
-              
-            
           }
       }, new Response.ErrorListener() {
           @Override
@@ -302,7 +286,6 @@ public class UserApi {
       errorListener.onErrorResponse(new VolleyError(ex));
     }
   }
-  
   /**
   * Creates list of users with given input array
   * 
@@ -323,9 +306,7 @@ public class UserApi {
       // form params
       Map<String, String> formParams = new HashMap<String, String>();
 
-  
 
-  
 
       String[] contentTypes = {
   
@@ -341,8 +322,7 @@ public class UserApi {
       postBody = httpEntity;
       } else {
       // normal form params
-  
-      }
+        }
 
       String[] authNames = new String[] {  };
 
@@ -359,7 +339,10 @@ public class UserApi {
          throw ex;
       } catch (ExecutionException ex) {
          if(ex.getCause() instanceof VolleyError) {
-            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+	    VolleyError volleyError = (VolleyError)ex.getCause();
+	    if (volleyError.networkResponse != null) {
+	       throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage());
+	    }
          }
          throw ex;
       } catch (TimeoutException ex) {
@@ -387,9 +370,7 @@ public class UserApi {
     // form params
     Map<String, String> formParams = new HashMap<String, String>();
 
-    
 
-    
 
     String[] contentTypes = {
       
@@ -405,8 +386,7 @@ public class UserApi {
       postBody = httpEntity;
     } else {
       // normal form params
-      
-    }
+          }
 
       String[] authNames = new String[] {  };
 
@@ -415,11 +395,7 @@ public class UserApi {
         new Response.Listener<String>() {
           @Override
           public void onResponse(String localVarResponse) {
-            
-              
               responseListener.onResponse(localVarResponse);
-              
-            
           }
       }, new Response.ErrorListener() {
           @Override
@@ -431,7 +407,6 @@ public class UserApi {
       errorListener.onErrorResponse(new VolleyError(ex));
     }
   }
-  
   /**
   * Delete user
   * This can only be done by the logged in user.
@@ -458,9 +433,7 @@ public class UserApi {
       // form params
       Map<String, String> formParams = new HashMap<String, String>();
 
-  
 
-  
 
       String[] contentTypes = {
   
@@ -476,8 +449,7 @@ public class UserApi {
       postBody = httpEntity;
       } else {
       // normal form params
-  
-      }
+        }
 
       String[] authNames = new String[] { "test_http_basic" };
 
@@ -494,7 +466,10 @@ public class UserApi {
          throw ex;
       } catch (ExecutionException ex) {
          if(ex.getCause() instanceof VolleyError) {
-            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+	    VolleyError volleyError = (VolleyError)ex.getCause();
+	    if (volleyError.networkResponse != null) {
+	       throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage());
+	    }
          }
          throw ex;
       } catch (TimeoutException ex) {
@@ -528,9 +503,7 @@ public class UserApi {
     // form params
     Map<String, String> formParams = new HashMap<String, String>();
 
-    
 
-    
 
     String[] contentTypes = {
       
@@ -546,8 +519,7 @@ public class UserApi {
       postBody = httpEntity;
     } else {
       // normal form params
-      
-    }
+          }
 
       String[] authNames = new String[] { "test_http_basic" };
 
@@ -556,11 +528,7 @@ public class UserApi {
         new Response.Listener<String>() {
           @Override
           public void onResponse(String localVarResponse) {
-            
-              
               responseListener.onResponse(localVarResponse);
-              
-            
           }
       }, new Response.ErrorListener() {
           @Override
@@ -572,11 +540,10 @@ public class UserApi {
       errorListener.onErrorResponse(new VolleyError(ex));
     }
   }
-  
   /**
   * Get user by user name
   * 
-   * @param username The name that needs to be fetched. Use user1 for testing.
+   * @param username The name that needs to be fetched. Use user1 for testing. 
    * @return User
   */
   public User getUserByName (String username) throws TimeoutException, ExecutionException, InterruptedException, ApiException {
@@ -599,9 +566,7 @@ public class UserApi {
       // form params
       Map<String, String> formParams = new HashMap<String, String>();
 
-  
 
-  
 
       String[] contentTypes = {
   
@@ -617,8 +582,7 @@ public class UserApi {
       postBody = httpEntity;
       } else {
       // normal form params
-  
-      }
+        }
 
       String[] authNames = new String[] {  };
 
@@ -635,7 +599,10 @@ public class UserApi {
          throw ex;
       } catch (ExecutionException ex) {
          if(ex.getCause() instanceof VolleyError) {
-            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+	    VolleyError volleyError = (VolleyError)ex.getCause();
+	    if (volleyError.networkResponse != null) {
+	       throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage());
+	    }
          }
          throw ex;
       } catch (TimeoutException ex) {
@@ -646,7 +613,7 @@ public class UserApi {
       /**
    * Get user by user name
    * 
-   * @param username The name that needs to be fetched. Use user1 for testing.
+   * @param username The name that needs to be fetched. Use user1 for testing. 
   */
   public void getUserByName (String username, final Response.Listener<User> responseListener, final Response.ErrorListener errorListener) {
     Object postBody = null;
@@ -669,9 +636,7 @@ public class UserApi {
     // form params
     Map<String, String> formParams = new HashMap<String, String>();
 
-    
 
-    
 
     String[] contentTypes = {
       
@@ -687,8 +652,7 @@ public class UserApi {
       postBody = httpEntity;
     } else {
       // normal form params
-      
-    }
+          }
 
       String[] authNames = new String[] {  };
 
@@ -697,16 +661,11 @@ public class UserApi {
         new Response.Listener<String>() {
           @Override
           public void onResponse(String localVarResponse) {
-            
             try {
               responseListener.onResponse((User) ApiInvoker.deserialize(localVarResponse,  "", User.class));
-              
-              
-            
             } catch (ApiException exception) {
                errorListener.onErrorResponse(new VolleyError(exception));
             }
-            
           }
       }, new Response.ErrorListener() {
           @Override
@@ -718,7 +677,6 @@ public class UserApi {
       errorListener.onErrorResponse(new VolleyError(ex));
     }
   }
-  
   /**
   * Logs user into the system
   * 
@@ -740,13 +698,9 @@ public class UserApi {
       // form params
       Map<String, String> formParams = new HashMap<String, String>();
 
-  
           queryParams.addAll(ApiInvoker.parameterToPairs("", "username", username));
-  
           queryParams.addAll(ApiInvoker.parameterToPairs("", "password", password));
-  
 
-  
 
       String[] contentTypes = {
   
@@ -762,8 +716,7 @@ public class UserApi {
       postBody = httpEntity;
       } else {
       // normal form params
-  
-      }
+        }
 
       String[] authNames = new String[] {  };
 
@@ -780,7 +733,10 @@ public class UserApi {
          throw ex;
       } catch (ExecutionException ex) {
          if(ex.getCause() instanceof VolleyError) {
-            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+	    VolleyError volleyError = (VolleyError)ex.getCause();
+	    if (volleyError.networkResponse != null) {
+	       throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage());
+	    }
          }
          throw ex;
       } catch (TimeoutException ex) {
@@ -808,13 +764,9 @@ public class UserApi {
     // form params
     Map<String, String> formParams = new HashMap<String, String>();
 
-    
     queryParams.addAll(ApiInvoker.parameterToPairs("", "username", username));
-    
     queryParams.addAll(ApiInvoker.parameterToPairs("", "password", password));
-    
 
-    
 
     String[] contentTypes = {
       
@@ -830,8 +782,7 @@ public class UserApi {
       postBody = httpEntity;
     } else {
       // normal form params
-      
-    }
+          }
 
       String[] authNames = new String[] {  };
 
@@ -840,16 +791,11 @@ public class UserApi {
         new Response.Listener<String>() {
           @Override
           public void onResponse(String localVarResponse) {
-            
             try {
               responseListener.onResponse((String) ApiInvoker.deserialize(localVarResponse,  "", String.class));
-              
-              
-            
             } catch (ApiException exception) {
                errorListener.onErrorResponse(new VolleyError(exception));
             }
-            
           }
       }, new Response.ErrorListener() {
           @Override
@@ -861,7 +807,6 @@ public class UserApi {
       errorListener.onErrorResponse(new VolleyError(ex));
     }
   }
-  
   /**
   * Logs out current logged in user session
   * 
@@ -881,9 +826,7 @@ public class UserApi {
       // form params
       Map<String, String> formParams = new HashMap<String, String>();
 
-  
 
-  
 
       String[] contentTypes = {
   
@@ -899,8 +842,7 @@ public class UserApi {
       postBody = httpEntity;
       } else {
       // normal form params
-  
-      }
+        }
 
       String[] authNames = new String[] {  };
 
@@ -917,7 +859,10 @@ public class UserApi {
          throw ex;
       } catch (ExecutionException ex) {
          if(ex.getCause() instanceof VolleyError) {
-            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+	    VolleyError volleyError = (VolleyError)ex.getCause();
+	    if (volleyError.networkResponse != null) {
+	       throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage());
+	    }
          }
          throw ex;
       } catch (TimeoutException ex) {
@@ -945,9 +890,7 @@ public class UserApi {
     // form params
     Map<String, String> formParams = new HashMap<String, String>();
 
-    
 
-    
 
     String[] contentTypes = {
       
@@ -963,8 +906,7 @@ public class UserApi {
       postBody = httpEntity;
     } else {
       // normal form params
-      
-    }
+          }
 
       String[] authNames = new String[] {  };
 
@@ -973,11 +915,7 @@ public class UserApi {
         new Response.Listener<String>() {
           @Override
           public void onResponse(String localVarResponse) {
-            
-              
               responseListener.onResponse(localVarResponse);
-              
-            
           }
       }, new Response.ErrorListener() {
           @Override
@@ -989,7 +927,6 @@ public class UserApi {
       errorListener.onErrorResponse(new VolleyError(ex));
     }
   }
-  
   /**
   * Updated user
   * This can only be done by the logged in user.
@@ -1017,9 +954,7 @@ public class UserApi {
       // form params
       Map<String, String> formParams = new HashMap<String, String>();
 
-  
 
-  
 
       String[] contentTypes = {
   
@@ -1035,8 +970,7 @@ public class UserApi {
       postBody = httpEntity;
       } else {
       // normal form params
-  
-      }
+        }
 
       String[] authNames = new String[] {  };
 
@@ -1053,7 +987,10 @@ public class UserApi {
          throw ex;
       } catch (ExecutionException ex) {
          if(ex.getCause() instanceof VolleyError) {
-            throw new ApiException(((VolleyError) ex.getCause()).networkResponse.statusCode, ((VolleyError) ex.getCause()).getMessage());
+	    VolleyError volleyError = (VolleyError)ex.getCause();
+	    if (volleyError.networkResponse != null) {
+	       throw new ApiException(volleyError.networkResponse.statusCode, volleyError.getMessage());
+	    }
          }
          throw ex;
       } catch (TimeoutException ex) {
@@ -1087,9 +1024,7 @@ public class UserApi {
     // form params
     Map<String, String> formParams = new HashMap<String, String>();
 
-    
 
-    
 
     String[] contentTypes = {
       
@@ -1105,8 +1040,7 @@ public class UserApi {
       postBody = httpEntity;
     } else {
       // normal form params
-      
-    }
+          }
 
       String[] authNames = new String[] {  };
 
@@ -1115,11 +1049,7 @@ public class UserApi {
         new Response.Listener<String>() {
           @Override
           public void onResponse(String localVarResponse) {
-            
-              
               responseListener.onResponse(localVarResponse);
-              
-            
           }
       }, new Response.ErrorListener() {
           @Override
@@ -1131,5 +1061,4 @@ public class UserApi {
       errorListener.onErrorResponse(new VolleyError(ex));
     }
   }
-  
 }
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Animal.java
new file mode 100644
index 00000000000..80b84fb850a
--- /dev/null
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Animal.java
@@ -0,0 +1,34 @@
+package io.swagger.client.model;
+
+
+import io.swagger.annotations.*;
+import com.google.gson.annotations.SerializedName;
+
+
+@ApiModel(description = "")
+public class Animal  {
+  
+  @SerializedName("className")
+  private String className = null;
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Animal {\n");
+    
+    sb.append("  className: ").append(className).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Cat.java
new file mode 100644
index 00000000000..449d6bddaa7
--- /dev/null
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Cat.java
@@ -0,0 +1,48 @@
+package io.swagger.client.model;
+
+import io.swagger.client.model.Animal;
+
+import io.swagger.annotations.*;
+import com.google.gson.annotations.SerializedName;
+
+
+@ApiModel(description = "")
+public class Cat extends Animal {
+  
+  @SerializedName("className")
+  private String className = null;
+  @SerializedName("declawed")
+  private Boolean declawed = null;
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Boolean getDeclawed() {
+    return declawed;
+  }
+  public void setDeclawed(Boolean declawed) {
+    this.declawed = declawed;
+  }
+
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Cat {\n");
+    sb.append("  " + super.toString()).append("\n");
+    sb.append("  className: ").append(className).append("\n");
+    sb.append("  declawed: ").append(declawed).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Category.java
index 44c71e8a620..b3fa2f93341 100644
--- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Category.java
@@ -13,7 +13,6 @@ public class Category  {
   @SerializedName("name")
   private String name = null;
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -24,7 +23,6 @@ public class Category  {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -35,7 +33,6 @@ public class Category  {
     this.name = name;
   }
 
-  
 
   @Override
   public String toString()  {
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Dog.java
new file mode 100644
index 00000000000..8f35b9b0ea9
--- /dev/null
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Dog.java
@@ -0,0 +1,48 @@
+package io.swagger.client.model;
+
+import io.swagger.client.model.Animal;
+
+import io.swagger.annotations.*;
+import com.google.gson.annotations.SerializedName;
+
+
+@ApiModel(description = "")
+public class Dog extends Animal {
+  
+  @SerializedName("className")
+  private String className = null;
+  @SerializedName("breed")
+  private String breed = null;
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getBreed() {
+    return breed;
+  }
+  public void setBreed(String breed) {
+    this.breed = breed;
+  }
+
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Dog {\n");
+    sb.append("  " + super.toString()).append("\n");
+    sb.append("  className: ").append(className).append("\n");
+    sb.append("  breed: ").append(breed).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/FormatTest.java
new file mode 100644
index 00000000000..3f362afc925
--- /dev/null
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/FormatTest.java
@@ -0,0 +1,179 @@
+package io.swagger.client.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import io.swagger.annotations.*;
+import com.google.gson.annotations.SerializedName;
+
+
+@ApiModel(description = "")
+public class FormatTest  {
+  
+  @SerializedName("integer")
+  private Integer integer = null;
+  @SerializedName("int32")
+  private Integer int32 = null;
+  @SerializedName("int64")
+  private Long int64 = null;
+  @SerializedName("number")
+  private BigDecimal number = null;
+  @SerializedName("float")
+  private Float _float = null;
+  @SerializedName("double")
+  private Double _double = null;
+  @SerializedName("string")
+  private String string = null;
+  @SerializedName("byte")
+  private byte[] _byte = null;
+  @SerializedName("binary")
+  private byte[] binary = null;
+  @SerializedName("date")
+  private Date date = null;
+  @SerializedName("dateTime")
+  private Date dateTime = null;
+  @SerializedName("password")
+  private String password = null;
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getInteger() {
+    return integer;
+  }
+  public void setInteger(Integer integer) {
+    this.integer = integer;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getInt32() {
+    return int32;
+  }
+  public void setInt32(Integer int32) {
+    this.int32 = int32;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Long getInt64() {
+    return int64;
+  }
+  public void setInt64(Long int64) {
+    this.int64 = int64;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public BigDecimal getNumber() {
+    return number;
+  }
+  public void setNumber(BigDecimal number) {
+    this.number = number;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Float getFloat() {
+    return _float;
+  }
+  public void setFloat(Float _float) {
+    this._float = _float;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Double getDouble() {
+    return _double;
+  }
+  public void setDouble(Double _double) {
+    this._double = _double;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getString() {
+    return string;
+  }
+  public void setString(String string) {
+    this.string = string;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public byte[] getByte() {
+    return _byte;
+  }
+  public void setByte(byte[] _byte) {
+    this._byte = _byte;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public byte[] getBinary() {
+    return binary;
+  }
+  public void setBinary(byte[] binary) {
+    this.binary = binary;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Date getDate() {
+    return date;
+  }
+  public void setDate(Date date) {
+    this.date = date;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Date getDateTime() {
+    return dateTime;
+  }
+  public void setDateTime(Date dateTime) {
+    this.dateTime = dateTime;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getPassword() {
+    return password;
+  }
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FormatTest {\n");
+    
+    sb.append("  integer: ").append(integer).append("\n");
+    sb.append("  int32: ").append(int32).append("\n");
+    sb.append("  int64: ").append(int64).append("\n");
+    sb.append("  number: ").append(number).append("\n");
+    sb.append("  _float: ").append(_float).append("\n");
+    sb.append("  _double: ").append(_double).append("\n");
+    sb.append("  string: ").append(string).append("\n");
+    sb.append("  _byte: ").append(_byte).append("\n");
+    sb.append("  binary: ").append(binary).append("\n");
+    sb.append("  date: ").append(date).append("\n");
+    sb.append("  dateTime: ").append(dateTime).append("\n");
+    sb.append("  password: ").append(password).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/InlineResponse200.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/InlineResponse200.java
index c4fd8ce357d..85b56f0e488 100644
--- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/InlineResponse200.java
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/InlineResponse200.java
@@ -10,34 +10,42 @@ import com.google.gson.annotations.SerializedName;
 @ApiModel(description = "")
 public class InlineResponse200  {
   
-  @SerializedName("tags")
-  private List<Tag> tags = null;
+  @SerializedName("photoUrls")
+  private List<String> photoUrls = null;
+  @SerializedName("name")
+  private String name = null;
   @SerializedName("id")
   private Long id = null;
   @SerializedName("category")
   private Object category = null;
+  @SerializedName("tags")
+  private List<Tag> tags = null;
   public enum StatusEnum {
      available,  pending,  sold, 
   };
   @SerializedName("status")
   private StatusEnum status = null;
-  @SerializedName("name")
-  private String name = null;
-  @SerializedName("photoUrls")
-  private List<String> photoUrls = null;
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
-  public List<Tag> getTags() {
-    return tags;
+  public List<String> getPhotoUrls() {
+    return photoUrls;
   }
-  public void setTags(List<Tag> tags) {
-    this.tags = tags;
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
   }
 
-  
   /**
    **/
   @ApiModelProperty(required = true, value = "")
@@ -48,7 +56,6 @@ public class InlineResponse200  {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -59,7 +66,16 @@ public class InlineResponse200  {
     this.category = category;
   }
 
-  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<Tag> getTags() {
+    return tags;
+  }
+  public void setTags(List<Tag> tags) {
+    this.tags = tags;
+  }
+
   /**
    * pet status in the store
    **/
@@ -71,41 +87,18 @@ public class InlineResponse200  {
     this.status = status;
   }
 
-  
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public String getName() {
-    return name;
-  }
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public List<String> getPhotoUrls() {
-    return photoUrls;
-  }
-  public void setPhotoUrls(List<String> photoUrls) {
-    this.photoUrls = photoUrls;
-  }
-
-  
 
   @Override
   public String toString()  {
     StringBuilder sb = new StringBuilder();
     sb.append("class InlineResponse200 {\n");
     
-    sb.append("  tags: ").append(tags).append("\n");
+    sb.append("  photoUrls: ").append(photoUrls).append("\n");
+    sb.append("  name: ").append(name).append("\n");
     sb.append("  id: ").append(id).append("\n");
     sb.append("  category: ").append(category).append("\n");
+    sb.append("  tags: ").append(tags).append("\n");
     sb.append("  status: ").append(status).append("\n");
-    sb.append("  name: ").append(name).append("\n");
-    sb.append("  photoUrls: ").append(photoUrls).append("\n");
     sb.append("}\n");
     return sb.toString();
   }
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Model200Response.java
index 4a6e58b2a5e..31664d1e6cf 100644
--- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Model200Response.java
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Model200Response.java
@@ -5,13 +5,15 @@ import io.swagger.annotations.*;
 import com.google.gson.annotations.SerializedName;
 
 
-@ApiModel(description = "")
+/**
+ * Model for testing model name starting with number
+ **/
+@ApiModel(description = "Model for testing model name starting with number")
 public class Model200Response  {
   
   @SerializedName("name")
   private Integer name = null;
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -22,7 +24,6 @@ public class Model200Response  {
     this.name = name;
   }
 
-  
 
   @Override
   public String toString()  {
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/ModelReturn.java
index 24763f3acb4..f0b0802096f 100644
--- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/ModelReturn.java
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -5,13 +5,15 @@ import io.swagger.annotations.*;
 import com.google.gson.annotations.SerializedName;
 
 
-@ApiModel(description = "")
+/**
+ * Model for testing reserved words
+ **/
+@ApiModel(description = "Model for testing reserved words")
 public class ModelReturn  {
   
   @SerializedName("return")
   private Integer _return = null;
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -22,7 +24,6 @@ public class ModelReturn  {
     this._return = _return;
   }
 
-  
 
   @Override
   public String toString()  {
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Name.java
index 9763aca7b34..d9f6153eb45 100644
--- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Name.java
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Name.java
@@ -5,7 +5,10 @@ import io.swagger.annotations.*;
 import com.google.gson.annotations.SerializedName;
 
 
-@ApiModel(description = "")
+/**
+ * Model for testing model name same as property name
+ **/
+@ApiModel(description = "Model for testing model name same as property name")
 public class Name  {
   
   @SerializedName("name")
@@ -13,10 +16,9 @@ public class Name  {
   @SerializedName("snake_case")
   private Integer snakeCase = null;
 
-  
   /**
    **/
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
   }
@@ -24,7 +26,6 @@ public class Name  {
     this.name = name;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -35,7 +36,6 @@ public class Name  {
     this.snakeCase = snakeCase;
   }
 
-  
 
   @Override
   public String toString()  {
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Order.java
index f3f42db615c..be6f1b96db2 100644
--- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Order.java
@@ -25,7 +25,6 @@ public class Order  {
   @SerializedName("complete")
   private Boolean complete = null;
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -36,7 +35,6 @@ public class Order  {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -47,7 +45,6 @@ public class Order  {
     this.petId = petId;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -58,7 +55,6 @@ public class Order  {
     this.quantity = quantity;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -69,7 +65,6 @@ public class Order  {
     this.shipDate = shipDate;
   }
 
-  
   /**
    * Order Status
    **/
@@ -81,7 +76,6 @@ public class Order  {
     this.status = status;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -92,7 +86,6 @@ public class Order  {
     this.complete = complete;
   }
 
-  
 
   @Override
   public String toString()  {
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Pet.java
index 20865ad5434..425b11a6ddc 100644
--- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Pet.java
@@ -27,7 +27,6 @@ public class Pet  {
   @SerializedName("status")
   private StatusEnum status = null;
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -38,7 +37,6 @@ public class Pet  {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -49,7 +47,6 @@ public class Pet  {
     this.category = category;
   }
 
-  
   /**
    **/
   @ApiModelProperty(required = true, value = "")
@@ -60,7 +57,6 @@ public class Pet  {
     this.name = name;
   }
 
-  
   /**
    **/
   @ApiModelProperty(required = true, value = "")
@@ -71,7 +67,6 @@ public class Pet  {
     this.photoUrls = photoUrls;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -82,7 +77,6 @@ public class Pet  {
     this.tags = tags;
   }
 
-  
   /**
    * pet status in the store
    **/
@@ -94,7 +88,6 @@ public class Pet  {
     this.status = status;
   }
 
-  
 
   @Override
   public String toString()  {
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/SpecialModelName.java
index d804bdd8765..78aae71a5c5 100644
--- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/SpecialModelName.java
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -11,7 +11,6 @@ public class SpecialModelName  {
   @SerializedName("$special[property.name]")
   private Long specialPropertyName = null;
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -22,7 +21,6 @@ public class SpecialModelName  {
     this.specialPropertyName = specialPropertyName;
   }
 
-  
 
   @Override
   public String toString()  {
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Tag.java
index 7c9651b1ba8..2d21e6240db 100644
--- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Tag.java
@@ -13,7 +13,6 @@ public class Tag  {
   @SerializedName("name")
   private String name = null;
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -24,7 +23,6 @@ public class Tag  {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -35,7 +33,6 @@ public class Tag  {
     this.name = name;
   }
 
-  
 
   @Override
   public String toString()  {
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/User.java
index dc022697eb0..d2b89faec07 100644
--- a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/User.java
@@ -25,7 +25,6 @@ public class User  {
   @SerializedName("userStatus")
   private Integer userStatus = null;
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -36,7 +35,6 @@ public class User  {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -47,7 +45,6 @@ public class User  {
     this.username = username;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -58,7 +55,6 @@ public class User  {
     this.firstName = firstName;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -69,7 +65,6 @@ public class User  {
     this.lastName = lastName;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -80,7 +75,6 @@ public class User  {
     this.email = email;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -91,7 +85,6 @@ public class User  {
     this.password = password;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -102,7 +95,6 @@ public class User  {
     this.phone = phone;
   }
 
-  
   /**
    * User Status
    **/
@@ -114,7 +106,6 @@ public class User  {
     this.userStatus = userStatus;
   }
 
-  
 
   @Override
   public String toString()  {
diff --git a/samples/client/petstore/async-scala/build.sbt b/samples/client/petstore/async-scala/build.sbt
index b02498c74e8..e612d5937ea 100644
--- a/samples/client/petstore/async-scala/build.sbt
+++ b/samples/client/petstore/async-scala/build.sbt
@@ -3,7 +3,7 @@ organization := ""
 name := "-client"
 
 libraryDependencies ++= Seq(
-  "io.swagger" %% "swagger-async-httpclient" % "0.3.5",
+  "com.wordnik.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",
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 9d0c05187a9..f9f2e5d6216 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
@@ -2,7 +2,7 @@ package io.swagger.client
 
 import io.swagger.client.api._
 
-import io.swagger.client._
+import com.wordnik.swagger.client._
 
 import java.io.Closeable
 
@@ -14,14 +14,14 @@ class SwaggerClient(config: SwaggerConfig) extends Closeable {
 
   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)
   
+  val user = new UserApi(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 84b6ba4c7ea..b918b0c55f8 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
@@ -1,17 +1,15 @@
 package io.swagger.client.api
 
 import io.swagger.client.model.Pet
+import io.swagger.client.model.ApiResponse
 import java.io.File
-import io.swagger.client._
-import scala.concurrent.{ Future, Await }
-import scala.concurrent.duration._
+import com.wordnik.swagger.client._
+import scala.concurrent.Future
 import collection.mutable
 
 class PetApi(client: TransportClient, config: SwaggerConfig) extends ApiClient(client, config) {
 
-  
-  def updatePet(body: Option[Pet] = None
-      )(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[Pet]): Future[Unit] = {
+  def addPet(body: Pet)(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[Pet]): Future[Unit] = {
     // create path and map variables
     val path = (addFmt("/pet"))
 
@@ -19,33 +17,9 @@ class PetApi(client: TransportClient, config: SwaggerConfig) extends ApiClient(c
     val queryParams = new mutable.HashMap[String, String]
     val headerParams = new mutable.HashMap[String, String]
 
-    
+    if (body == null) throw new Exception("Missing required parameter 'body' when calling PetApi->addPet")
 
-    
 
-    
-
-    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 =>
@@ -53,98 +27,6 @@ class PetApi(client: TransportClient, config: SwaggerConfig) extends ApiClient(c
     }
   }
 
-  
-  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"))
-
-    // query params
-    val queryParams = new mutable.HashMap[String, String]
-    val headerParams = new mutable.HashMap[String, String]
-
-    
-
-    if(status != null) status.foreach { v => queryParams += "status" -> v.toString }
-
-    
-
-    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"))
-
-    // query params
-    val queryParams = new mutable.HashMap[String, String]
-    val headerParams = new mutable.HashMap[String, String]
-
-    
-
-    if(tags != null) tags.foreach { v => queryParams += "tags" -> v.toString }
-
-    
-
-    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: 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(petId: Long,
       apiKey: Option[String] = None
       )(implicit reader: ClientResponseReader[Unit]): Future[Unit] = {
@@ -156,9 +38,6 @@ class PetApi(client: TransportClient, config: SwaggerConfig) extends ApiClient(c
     val queryParams = new mutable.HashMap[String, String]
     val headerParams = new mutable.HashMap[String, String]
 
-    
-
-    
 
     headerParams += "api_key" -> apiKey.toString
 
@@ -168,11 +47,105 @@ class PetApi(client: TransportClient, config: SwaggerConfig) extends ApiClient(c
     }
   }
 
-  
+  def findPetsByStatus(status: List[String])(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]
+
+    if (status == null) throw new Exception("Missing required parameter 'status' when calling PetApi->findPetsByStatus")
+
+    if (status != null) queryParams += "status" -> status.toString
+
+
+
+    val resFuture = client.submit("GET", path, queryParams.toMap, headerParams.toMap, "")
+    resFuture flatMap { resp =>
+      process(reader.read(resp))
+    }
+  }
+
+  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]
+
+    if (tags == null) throw new Exception("Missing required parameter 'tags' when calling PetApi->findPetsByTags")
+
+    if (tags != null) queryParams += "tags" -> tags.toString
+
+
+
+    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 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]
+
+    if (body == null) throw new Exception("Missing required parameter 'body' when calling PetApi->updatePet")
+
+
+
+    val resFuture = client.submit("PUT", path, queryParams.toMap, headerParams.toMap, writer.write(body))
+    resFuture flatMap { resp =>
+      process(reader.read(resp))
+    }
+  }
+
+  def updatePetWithForm(petId: Long,
+      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 uploadFile(petId: Long,
       additionalMetadata: Option[String] = None,
       file: Option[File] = None
-      )(implicit reader: ClientResponseReader[Unit]): Future[Unit] = {
+      )(implicit reader: ClientResponseReader[ApiResponse]): Future[ApiResponse] = {
     // create path and map variables
     val path = (addFmt("/pet/{petId}/uploadImage")
         replaceAll ("\\{" + "petId" + "\\}",petId.toString))
@@ -181,11 +154,7 @@ class PetApi(client: TransportClient, config: SwaggerConfig) extends ApiClient(c
     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 =>
@@ -193,6 +162,5 @@ class PetApi(client: TransportClient, config: SwaggerConfig) extends ApiClient(c
     }
   }
 
-  
 
 }
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 c7a18efbf14..e17c641fcb2 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
@@ -1,79 +1,12 @@
 package io.swagger.client.api
 
 import io.swagger.client.model.Order
-import io.swagger.client._
-import scala.concurrent.{ Future, Await }
-import scala.concurrent.duration._
+import com.wordnik.swagger.client._
+import scala.concurrent.Future
 import collection.mutable
 
 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]
-
-    
-
-    
-
-    
-
-    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("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}")
@@ -83,11 +16,7 @@ class StoreApi(client: TransportClient, config: SwaggerConfig) extends ApiClient
     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 =>
@@ -95,6 +24,56 @@ class StoreApi(client: TransportClient, config: SwaggerConfig) extends ApiClient
     }
   }
 
-  
+  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 getOrderById(orderId: Long)(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 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]
+
+    if (body == null) throw new Exception("Missing required parameter 'body' when calling StoreApi->placeOrder")
+
+
+
+    val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, writer.write(body))
+    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 766e4d22312..bf3294cb331 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
@@ -1,16 +1,13 @@
 package io.swagger.client.api
 
 import io.swagger.client.model.User
-import io.swagger.client._
-import scala.concurrent.{ Future, Await }
-import scala.concurrent.duration._
+import com.wordnik.swagger.client._
+import scala.concurrent.Future
 import collection.mutable
 
 class UserApi(client: TransportClient, config: SwaggerConfig) extends ApiClient(client, config) {
 
-  
-  def createUser(body: Option[User] = None
-      )(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[User]): Future[Unit] = {
+  def createUser(body: User)(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[User]): Future[Unit] = {
     // create path and map variables
     val path = (addFmt("/user"))
 
@@ -18,11 +15,9 @@ class UserApi(client: TransportClient, config: SwaggerConfig) extends ApiClient(
     val queryParams = new mutable.HashMap[String, String]
     val headerParams = new mutable.HashMap[String, String]
 
-    
+    if (body == null) throw new Exception("Missing required parameter 'body' when calling UserApi->createUser")
 
-    
 
-    
 
     val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, writer.write(body))
     resFuture flatMap { resp =>
@@ -30,9 +25,7 @@ class UserApi(client: TransportClient, config: SwaggerConfig) extends ApiClient(
     }
   }
 
-  
-  def createUsersWithArrayInput(body: Option[List[User]] = None
-      )(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[List[User]]): Future[Unit] = {
+  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"))
 
@@ -40,11 +33,9 @@ class UserApi(client: TransportClient, config: SwaggerConfig) extends ApiClient(
     val queryParams = new mutable.HashMap[String, String]
     val headerParams = new mutable.HashMap[String, String]
 
-    
+    if (body == null) throw new Exception("Missing required parameter 'body' when calling UserApi->createUsersWithArrayInput")
 
-    
 
-    
 
     val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, writer.write(body))
     resFuture flatMap { resp =>
@@ -52,9 +43,7 @@ class UserApi(client: TransportClient, config: SwaggerConfig) extends ApiClient(
     }
   }
 
-  
-  def createUsersWithListInput(body: Option[List[User]] = None
-      )(implicit reader: ClientResponseReader[Unit], writer: RequestWriter[List[User]]): Future[Unit] = {
+  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"))
 
@@ -62,11 +51,9 @@ class UserApi(client: TransportClient, config: SwaggerConfig) extends ApiClient(
     val queryParams = new mutable.HashMap[String, String]
     val headerParams = new mutable.HashMap[String, String]
 
-    
+    if (body == null) throw new Exception("Missing required parameter 'body' when calling UserApi->createUsersWithListInput")
 
-    
 
-    
 
     val resFuture = client.submit("POST", path, queryParams.toMap, headerParams.toMap, writer.write(body))
     resFuture flatMap { resp =>
@@ -74,97 +61,6 @@ class UserApi(client: TransportClient, config: SwaggerConfig) extends ApiClient(
     }
   }
 
-  
-  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"))
-
-    // query params
-    val queryParams = new mutable.HashMap[String, String]
-    val headerParams = new mutable.HashMap[String, String]
-
-    
-
-    if(username != null) username.foreach { v => queryParams += "username" -> v.toString }if(password != null) password.foreach { v => queryParams += "password" -> v.toString }
-
-    
-
-    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 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}")
@@ -174,11 +70,7 @@ class UserApi(client: TransportClient, config: SwaggerConfig) extends ApiClient(
     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 =>
@@ -186,6 +78,79 @@ class UserApi(client: TransportClient, config: SwaggerConfig) extends ApiClient(
     }
   }
 
-  
+  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 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]
+
+    if (username != null) queryParams += "username" -> username.toString
+
+    if (password != null) queryParams += "password" -> password.toString
+
+
+
+    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 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]
+
+    if (body == null) throw new Exception("Missing required parameter 'body' when calling UserApi->updateUser")
+
+
+
+    val resFuture = client.submit("PUT", path, queryParams.toMap, headerParams.toMap, writer.write(body))
+    resFuture flatMap { resp =>
+      process(reader.read(resp))
+    }
+  }
+
 
 }
diff --git a/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/ApiResponse.scala b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/ApiResponse.scala
new file mode 100644
index 00000000000..d1d2c29d588
--- /dev/null
+++ b/samples/client/petstore/async-scala/src/main/scala/io/swagger/client/model/ApiResponse.scala
@@ -0,0 +1,11 @@
+package io.swagger.client.model
+
+import org.joda.time.DateTime
+import java.util.UUID
+
+
+case class ApiResponse (
+  code: Option[Integer],
+_type: Option[String],
+message: Option[String]
+)
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 1b410e7c59e..afd533df15e 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
@@ -1,10 +1,10 @@
 package io.swagger.client.model
 
 import org.joda.time.DateTime
+import java.util.UUID
 
 
 case class Category (
-  id: Long,
-  name: String
-  
+  id: Option[Long],
+name: Option[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 f7a10a44965..42f4859e2e3 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
@@ -1,14 +1,14 @@
 package io.swagger.client.model
 
 import org.joda.time.DateTime
+import java.util.UUID
 
 
 case class Order (
-  id: Long,
-  petId: Long,
-  quantity: Integer,
-  shipDate: DateTime,
-  status: String,  // Order Status
-  complete: Boolean
-  
+  id: Option[Long],
+petId: Option[Long],
+quantity: Option[Integer],
+shipDate: Option[DateTime],
+status: Option[String],  // Order Status
+complete: Option[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 7e76c72914b..f296c7f7146 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
@@ -1,14 +1,14 @@
 package io.swagger.client.model
 
 import org.joda.time.DateTime
+import java.util.UUID
 
 
 case class Pet (
-  id: Long,
-  category: Category,
-  name: String,
-  photoUrls: List[String],
-  tags: List[Tag],
-  status: String  // pet status in the store
-  
+  id: Option[Long],
+category: Option[Category],
+name: String,
+photoUrls: List[String],
+tags: Option[List[Tag]],
+status: Option[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 9dfe60d36f8..3d7772c5659 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
@@ -1,10 +1,10 @@
 package io.swagger.client.model
 
 import org.joda.time.DateTime
+import java.util.UUID
 
 
 case class Tag (
-  id: Long,
-  name: String
-  
+  id: Option[Long],
+name: Option[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 598adae451a..e016b7a88dd 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
@@ -1,16 +1,16 @@
 package io.swagger.client.model
 
 import org.joda.time.DateTime
+import java.util.UUID
 
 
 case class User (
-  id: Long,
-  username: String,
-  firstName: String,
-  lastName: String,
-  email: String,
-  password: String,
-  phone: String,
-  userStatus: Integer  // User Status
-  
+  id: Option[Long],
+username: Option[String],
+firstName: Option[String],
+lastName: Option[String],
+email: Option[String],
+password: Option[String],
+phone: Option[String],
+userStatus: Option[Integer]  // User Status
 )
diff --git a/samples/client/petstore/async-scala/src/test/scala/Test.scala b/samples/client/petstore/async-scala/src/test/scala/Test.scala
index d880fcb7f9c..749772a2718 100644
--- a/samples/client/petstore/async-scala/src/test/scala/Test.scala
+++ b/samples/client/petstore/async-scala/src/test/scala/Test.scala
@@ -1,8 +1,18 @@
+import io.swagger.client._
+import io.swagger.client.api._
+import io.swagger.client.model._
+
 import java.net.URI
 
 import scala.concurrent._
 import scala.concurrent.duration._
 import scala.util.{Failure, Success}
+import org.scalatest._
+import org.junit.runner.RunWith
+import org.scalatest.junit.JUnitRunner
+import org.scalatest.FunSuite
+import com.wordnik.swagger._
+com.wordnik.swagger.client
 
 @RunWith(classOf[JUnitRunner])
 class SimpleTest extends FlatSpec with Matchers {
@@ -24,4 +34,4 @@ class SimpleTest extends FlatSpec with Matchers {
       case Failure(t) => println("failed " + t.getMessage)
     }
   }
-}
\ 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
index b09b31264c3..2a513818a31 100644
--- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Api/PetApi.cs
+++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Api/PetApi.cs
@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using System.Collections.Generic;
 using RestSharp;
 using IO.Swagger.Client;
@@ -7,57 +6,17 @@ using IO.Swagger.Model;
 
 namespace IO.Swagger.Api
 {
-    
     /// <summary>
     /// Represents a collection of functions to interact with the API endpoints
     /// </summary>
     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&lt;Pet&gt;</returns>
-        List<Pet> FindPetsByStatus (List<string> status);
-        
-        /// <summary>
-        /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-        /// </summary>
-        /// <param name="tags">Tags to filter by</param>
-        /// <returns>List&lt;Pet&gt;</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>
@@ -65,16 +24,46 @@ namespace IO.Swagger.Api
         /// <param name="apiKey"></param>
         /// <returns></returns>
         void DeletePet (long? petId, string apiKey);
-        
+        /// <summary>
+        /// Finds Pets by status Multiple status values can be provided with comma separated strings
+        /// </summary>
+        /// <param name="status">Status values that need to be considered for filter</param>
+        /// <returns>List&lt;Pet&gt;</returns>
+        List<Pet> FindPetsByStatus (List<string> status);
+        /// <summary>
+        /// Finds Pets by tags Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+        /// </summary>
+        /// <param name="tags">Tags to filter by</param>
+        /// <returns>List&lt;Pet&gt;</returns>
+        List<Pet> FindPetsByTags (List<string> tags);
+        /// <summary>
+        /// Find pet by ID Returns a single pet
+        /// </summary>
+        /// <param name="petId">ID of pet to return</param>
+        /// <returns>Pet</returns>
+        Pet GetPetById (long? petId);
+        /// <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>
+        /// 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 (long? petId, string name, string status);
         /// <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);
-        
+        /// <returns>ApiResponse</returns>
+        ApiResponse UploadFile (long? petId, string additionalMetadata, System.IO.Stream file);
     }
   
     /// <summary>
@@ -130,47 +119,6 @@ namespace IO.Swagger.Api
         /// <value>An instance of the ApiClient</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, 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>
@@ -179,22 +127,20 @@ namespace IO.Swagger.Api
         public void AddPet (Pet body)
         {
             
+            // verify the required parameter 'body' is set
+            if (body == null) throw new ApiException(400, "Missing required parameter 'body' when calling AddPet");
+            
     
             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
-            
+                                                postBody = ApiClient.Serialize(body); // http body (model) parameter
     
             // authentication setting, if any
             String[] authSettings = new String[] { "petstore_auth" };
@@ -210,177 +156,6 @@ namespace IO.Swagger.Api
             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&lt;Pet&gt;</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&lt;Pet&gt;</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" };
-    
-            // 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>
@@ -397,7 +172,6 @@ namespace IO.Swagger.Api
             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>();
@@ -405,12 +179,8 @@ namespace IO.Swagger.Api
             var fileParams = new Dictionary<String, FileParameter>();
             String postBody = null;
     
-            
-             if (apiKey != null) headerParams.Add("api_key", ApiClient.ParameterToString(apiKey)); // header parameter
-            
-            
-            
-    
+                         if (apiKey != null) headerParams.Add("api_key", ApiClient.ParameterToString(apiKey)); // header parameter
+                            
             // authentication setting, if any
             String[] authSettings = new String[] { "petstore_auth" };
     
@@ -425,15 +195,203 @@ namespace IO.Swagger.Api
             return;
         }
     
-        
+        /// <summary>
+        /// Finds Pets by status Multiple status values can be provided with comma separated strings
+        /// </summary>
+        /// <param name="status">Status values that need to be considered for filter</param> 
+        /// <returns>List&lt;Pet&gt;</returns>            
+        public List<Pet> FindPetsByStatus (List<string> status)
+        {
+            
+            // verify the required parameter 'status' is set
+            if (status == null) throw new ApiException(400, "Missing required parameter 'status' when calling FindPetsByStatus");
+            
+    
+            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 Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+        /// </summary>
+        /// <param name="tags">Tags to filter by</param> 
+        /// <returns>List&lt;Pet&gt;</returns>            
+        public List<Pet> FindPetsByTags (List<string> tags)
+        {
+            
+            // verify the required parameter 'tags' is set
+            if (tags == null) throw new ApiException(400, "Missing required parameter 'tags' when calling FindPetsByTags");
+            
+    
+            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 single pet
+        /// </summary>
+        /// <param name="petId">ID of pet to return</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" };
+    
+            // 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>
+        /// 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)
+        {
+            
+            // verify the required parameter 'body' is set
+            if (body == null) throw new ApiException(400, "Missing required parameter 'body' when calling UpdatePet");
+            
+    
+            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>
+        /// 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 (long? 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>
         /// 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)
+        /// <returns>ApiResponse</returns>            
+        public ApiResponse UploadFile (long? petId, string additionalMetadata, System.IO.Stream file)
         {
             
             // verify the required parameter 'petId' is set
@@ -443,7 +401,6 @@ namespace IO.Swagger.Api
             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>();
@@ -451,13 +408,9 @@ namespace IO.Swagger.Api
             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));
-            
-            
-    
+                                    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" };
     
@@ -469,10 +422,8 @@ namespace IO.Swagger.Api
             else if (((int)response.StatusCode) == 0)
                 throw new ApiException ((int)response.StatusCode, "Error calling UploadFile: " + response.ErrorMessage, response.ErrorMessage);
     
-            return;
+            return (ApiResponse) ApiClient.Deserialize(response.Content, typeof(ApiResponse), response.Headers);
         }
     
-        
     }
-    
 }
diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Api/StoreApi.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Api/StoreApi.cs
index ba269cc2b0c..0f9cb2339be 100644
--- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Api/StoreApi.cs
@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using System.Collections.Generic;
 using RestSharp;
 using IO.Swagger.Client;
@@ -7,40 +6,34 @@ using IO.Swagger.Model;
 
 namespace IO.Swagger.Api
 {
-    
     /// <summary>
     /// Represents a collection of functions to interact with the API endpoints
     /// </summary>
     public interface IStoreApi
     {
-        
-        /// <summary>
-        /// Returns pet inventories by status Returns a map of status codes to quantities
-        /// </summary>
-        /// <returns>Dictionary&lt;String, int?&gt;</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>
+        /// Returns pet inventories by status Returns a map of status codes to quantities
+        /// </summary>
+        /// <returns>Dictionary&lt;String, int?&gt;</returns>
+        Dictionary<String, int?> GetInventory ();
+        /// <summary>
+        /// Find purchase order by ID For valid response try integer IDs with value &lt;&#x3D; 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 (long? orderId);
+        /// <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>
@@ -96,128 +89,6 @@ namespace IO.Swagger.Api
         /// <value>An instance of the ApiClient</value>
         public ApiClient ApiClient {get; set;}
     
-        
-        /// <summary>
-        /// Returns pet inventories by status Returns a map of status codes to quantities
-        /// </summary>
-        /// <returns>Dictionary&lt;String, int?&gt;</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>
@@ -233,7 +104,6 @@ namespace IO.Swagger.Api
             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>();
@@ -241,11 +111,7 @@ namespace IO.Swagger.Api
             var fileParams = new Dictionary<String, FileParameter>();
             String postBody = null;
     
-            
-            
-            
-            
-    
+                                                    
             // authentication setting, if any
             String[] authSettings = new String[] {  };
     
@@ -260,7 +126,111 @@ namespace IO.Swagger.Api
             return;
         }
     
-        
-    }
+        /// <summary>
+        /// Returns pet inventories by status Returns a map of status codes to quantities
+        /// </summary>
+        /// <returns>Dictionary&lt;String, int?&gt;</returns>            
+        public Dictionary<String, int?> GetInventory ()
+        {
+            
     
+            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>
+        /// Find purchase order by ID For valid response try integer IDs with value &lt;&#x3D; 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 (long? 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>
+        /// 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)
+        {
+            
+            // verify the required parameter 'body' is set
+            if (body == null) throw new ApiException(400, "Missing required parameter 'body' when calling PlaceOrder");
+            
+    
+            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);
+        }
+    
+    }
 }
diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Api/UserApi.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Api/UserApi.cs
index 1374556698e..e57bd2f8873 100644
--- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Api/UserApi.cs
+++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Api/UserApi.cs
@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using System.Collections.Generic;
 using RestSharp;
 using IO.Swagger.Client;
@@ -7,34 +6,41 @@ using IO.Swagger.Model;
 
 namespace IO.Swagger.Api
 {
-    
     /// <summary>
     /// Represents a collection of functions to interact with the API endpoints
     /// </summary>
     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>
+        /// 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>
+        /// 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>
         /// Logs user into the system 
         /// </summary>
@@ -42,20 +48,11 @@ namespace IO.Swagger.Api
         /// <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>
@@ -63,14 +60,6 @@ namespace IO.Swagger.Api
         /// <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>
@@ -126,7 +115,6 @@ namespace IO.Swagger.Api
         /// <value>An instance of the ApiClient</value>
         public ApiClient ApiClient {get; set;}
     
-        
         /// <summary>
         /// Create user This can only be done by the logged in user.
         /// </summary>
@@ -135,22 +123,20 @@ namespace IO.Swagger.Api
         public void CreateUser (User body)
         {
             
+            // verify the required parameter 'body' is set
+            if (body == null) throw new ApiException(400, "Missing required parameter 'body' when calling CreateUser");
+            
     
             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
-            
+                                                postBody = ApiClient.Serialize(body); // http body (model) parameter
     
             // authentication setting, if any
             String[] authSettings = new String[] {  };
@@ -166,7 +152,6 @@ namespace IO.Swagger.Api
             return;
         }
     
-        
         /// <summary>
         /// Creates list of users with given input array 
         /// </summary>
@@ -175,22 +160,20 @@ namespace IO.Swagger.Api
         public void CreateUsersWithArrayInput (List<User> body)
         {
             
+            // verify the required parameter 'body' is set
+            if (body == null) throw new ApiException(400, "Missing required parameter 'body' when calling CreateUsersWithArrayInput");
+            
     
             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
-            
+                                                postBody = ApiClient.Serialize(body); // http body (model) parameter
     
             // authentication setting, if any
             String[] authSettings = new String[] {  };
@@ -206,7 +189,6 @@ namespace IO.Swagger.Api
             return;
         }
     
-        
         /// <summary>
         /// Creates list of users with given input array 
         /// </summary>
@@ -215,22 +197,20 @@ namespace IO.Swagger.Api
         public void CreateUsersWithListInput (List<User> body)
         {
             
+            // verify the required parameter 'body' is set
+            if (body == null) throw new ApiException(400, "Missing required parameter 'body' when calling CreateUsersWithListInput");
+            
     
             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
-            
+                                                postBody = ApiClient.Serialize(body); // http body (model) parameter
     
             // authentication setting, if any
             String[] authSettings = new String[] {  };
@@ -246,175 +226,6 @@ namespace IO.Swagger.Api
             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>
@@ -430,7 +241,6 @@ namespace IO.Swagger.Api
             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>();
@@ -438,11 +248,7 @@ namespace IO.Swagger.Api
             var fileParams = new Dictionary<String, FileParameter>();
             String postBody = null;
     
-            
-            
-            
-            
-    
+                                                    
             // authentication setting, if any
             String[] authSettings = new String[] {  };
     
@@ -457,7 +263,158 @@ namespace IO.Swagger.Api
             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>
+        /// 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)
+        {
+            
+            // verify the required parameter 'username' is set
+            if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling LoginUser");
+            
+            // verify the required parameter 'password' is set
+            if (password == null) throw new ApiException(400, "Missing required parameter 'password' when calling LoginUser");
+            
+    
+            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>
+        /// 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");
+            
+            // verify the required parameter 'body' is set
+            if (body == null) throw new ApiException(400, "Missing required parameter 'body' 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;
+        }
+    
+    }
 }
diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Client/ApiClient.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Client/ApiClient.cs
index 3041cde567e..4f55f130134 100644
--- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Client/ApiClient.cs
+++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Client/ApiClient.cs
@@ -257,17 +257,14 @@ namespace IO.Swagger.Client
                 // determine which one to use
                 switch(auth)
                 {
-                    
-                    case "api_key":
-                        headerParams["api_key"] = GetApiKeyWithPrefix("api_key");
-                        
-                        break;
-                    
                     case "petstore_auth":
                         
                         //TODO support oauth
                         break;
-                    
+                    case "api_key":
+                        headerParams["api_key"] = GetApiKeyWithPrefix("api_key");
+                        
+                        break;
                     default:
                         //TODO show warning about security definition not found
                         break;
diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Model/ApiResponse.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Model/ApiResponse.cs
new file mode 100644
index 00000000000..42e259da68a
--- /dev/null
+++ b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Model/ApiResponse.cs
@@ -0,0 +1,60 @@
+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 ApiResponse {
+    /// <summary>
+    /// Gets or Sets Code
+    /// </summary>
+    [DataMember(Name="code", EmitDefaultValue=false)]
+    [JsonProperty(PropertyName = "code")]
+    public int? Code { get; set; }
+
+    /// <summary>
+    /// Gets or Sets Type
+    /// </summary>
+    [DataMember(Name="type", EmitDefaultValue=false)]
+    [JsonProperty(PropertyName = "type")]
+    public string Type { get; set; }
+
+    /// <summary>
+    /// Gets or Sets Message
+    /// </summary>
+    [DataMember(Name="message", EmitDefaultValue=false)]
+    [JsonProperty(PropertyName = "message")]
+    public string Message { 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 ApiResponse {\n");
+      sb.Append("  Code: ").Append(Code).Append("\n");
+      sb.Append("  Type: ").Append(Type).Append("\n");
+      sb.Append("  Message: ").Append(Message).Append("\n");
+      sb.Append("}\n");
+      return sb.ToString();
+    }
+
+    /// <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/Category.cs b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/src/main/CsharpDotNet2/IO/Swagger/Model/Category.cs
index a11c0761d2d..3e2508259db 100644
--- 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
@@ -12,7 +12,6 @@ namespace IO.Swagger.Model {
   /// </summary>
   [DataContract]
   public class Category {
-    
     /// <summary>
     /// Gets or Sets Id
     /// </summary>
@@ -20,7 +19,6 @@ namespace IO.Swagger.Model {
     [JsonProperty(PropertyName = "id")]
     public long? Id { get; set; }
 
-    
     /// <summary>
     /// Gets or Sets Name
     /// </summary>
@@ -28,7 +26,6 @@ namespace IO.Swagger.Model {
     [JsonProperty(PropertyName = "name")]
     public string Name { get; set; }
 
-    
 
     /// <summary>
     /// Get the string presentation of the object
@@ -37,11 +34,8 @@ namespace IO.Swagger.Model {
     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();
     }
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
index 17890990aa6..0f667d9c46d 100644
--- 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
@@ -12,7 +12,6 @@ namespace IO.Swagger.Model {
   /// </summary>
   [DataContract]
   public class Order {
-    
     /// <summary>
     /// Gets or Sets Id
     /// </summary>
@@ -20,7 +19,6 @@ namespace IO.Swagger.Model {
     [JsonProperty(PropertyName = "id")]
     public long? Id { get; set; }
 
-    
     /// <summary>
     /// Gets or Sets PetId
     /// </summary>
@@ -28,7 +26,6 @@ namespace IO.Swagger.Model {
     [JsonProperty(PropertyName = "petId")]
     public long? PetId { get; set; }
 
-    
     /// <summary>
     /// Gets or Sets Quantity
     /// </summary>
@@ -36,7 +33,6 @@ namespace IO.Swagger.Model {
     [JsonProperty(PropertyName = "quantity")]
     public int? Quantity { get; set; }
 
-    
     /// <summary>
     /// Gets or Sets ShipDate
     /// </summary>
@@ -44,7 +40,6 @@ namespace IO.Swagger.Model {
     [JsonProperty(PropertyName = "shipDate")]
     public DateTime? ShipDate { get; set; }
 
-    
     /// <summary>
     /// Order Status
     /// </summary>
@@ -53,7 +48,6 @@ namespace IO.Swagger.Model {
     [JsonProperty(PropertyName = "status")]
     public string Status { get; set; }
 
-    
     /// <summary>
     /// Gets or Sets Complete
     /// </summary>
@@ -61,7 +55,6 @@ namespace IO.Swagger.Model {
     [JsonProperty(PropertyName = "complete")]
     public bool? Complete { get; set; }
 
-    
 
     /// <summary>
     /// Get the string presentation of the object
@@ -70,19 +63,12 @@ namespace IO.Swagger.Model {
     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();
     }
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
index 14f285794ad..27ab53d3767 100644
--- 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
@@ -12,7 +12,6 @@ namespace IO.Swagger.Model {
   /// </summary>
   [DataContract]
   public class Pet {
-    
     /// <summary>
     /// Gets or Sets Id
     /// </summary>
@@ -20,7 +19,6 @@ namespace IO.Swagger.Model {
     [JsonProperty(PropertyName = "id")]
     public long? Id { get; set; }
 
-    
     /// <summary>
     /// Gets or Sets Category
     /// </summary>
@@ -28,7 +26,6 @@ namespace IO.Swagger.Model {
     [JsonProperty(PropertyName = "category")]
     public Category Category { get; set; }
 
-    
     /// <summary>
     /// Gets or Sets Name
     /// </summary>
@@ -36,7 +33,6 @@ namespace IO.Swagger.Model {
     [JsonProperty(PropertyName = "name")]
     public string Name { get; set; }
 
-    
     /// <summary>
     /// Gets or Sets PhotoUrls
     /// </summary>
@@ -44,7 +40,6 @@ namespace IO.Swagger.Model {
     [JsonProperty(PropertyName = "photoUrls")]
     public List<string> PhotoUrls { get; set; }
 
-    
     /// <summary>
     /// Gets or Sets Tags
     /// </summary>
@@ -52,7 +47,6 @@ namespace IO.Swagger.Model {
     [JsonProperty(PropertyName = "tags")]
     public List<Tag> Tags { get; set; }
 
-    
     /// <summary>
     /// pet status in the store
     /// </summary>
@@ -61,7 +55,6 @@ namespace IO.Swagger.Model {
     [JsonProperty(PropertyName = "status")]
     public string Status { get; set; }
 
-    
 
     /// <summary>
     /// Get the string presentation of the object
@@ -70,19 +63,12 @@ namespace IO.Swagger.Model {
     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();
     }
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
index 9a784e07a7e..639e1d79eaf 100644
--- 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
@@ -12,7 +12,6 @@ namespace IO.Swagger.Model {
   /// </summary>
   [DataContract]
   public class Tag {
-    
     /// <summary>
     /// Gets or Sets Id
     /// </summary>
@@ -20,7 +19,6 @@ namespace IO.Swagger.Model {
     [JsonProperty(PropertyName = "id")]
     public long? Id { get; set; }
 
-    
     /// <summary>
     /// Gets or Sets Name
     /// </summary>
@@ -28,7 +26,6 @@ namespace IO.Swagger.Model {
     [JsonProperty(PropertyName = "name")]
     public string Name { get; set; }
 
-    
 
     /// <summary>
     /// Get the string presentation of the object
@@ -37,11 +34,8 @@ namespace IO.Swagger.Model {
     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();
     }
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
index ee7d6b035a3..f3367f341b9 100644
--- 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
@@ -12,7 +12,6 @@ namespace IO.Swagger.Model {
   /// </summary>
   [DataContract]
   public class User {
-    
     /// <summary>
     /// Gets or Sets Id
     /// </summary>
@@ -20,7 +19,6 @@ namespace IO.Swagger.Model {
     [JsonProperty(PropertyName = "id")]
     public long? Id { get; set; }
 
-    
     /// <summary>
     /// Gets or Sets Username
     /// </summary>
@@ -28,7 +26,6 @@ namespace IO.Swagger.Model {
     [JsonProperty(PropertyName = "username")]
     public string Username { get; set; }
 
-    
     /// <summary>
     /// Gets or Sets FirstName
     /// </summary>
@@ -36,7 +33,6 @@ namespace IO.Swagger.Model {
     [JsonProperty(PropertyName = "firstName")]
     public string FirstName { get; set; }
 
-    
     /// <summary>
     /// Gets or Sets LastName
     /// </summary>
@@ -44,7 +40,6 @@ namespace IO.Swagger.Model {
     [JsonProperty(PropertyName = "lastName")]
     public string LastName { get; set; }
 
-    
     /// <summary>
     /// Gets or Sets Email
     /// </summary>
@@ -52,7 +47,6 @@ namespace IO.Swagger.Model {
     [JsonProperty(PropertyName = "email")]
     public string Email { get; set; }
 
-    
     /// <summary>
     /// Gets or Sets Password
     /// </summary>
@@ -60,7 +54,6 @@ namespace IO.Swagger.Model {
     [JsonProperty(PropertyName = "password")]
     public string Password { get; set; }
 
-    
     /// <summary>
     /// Gets or Sets Phone
     /// </summary>
@@ -68,7 +61,6 @@ namespace IO.Swagger.Model {
     [JsonProperty(PropertyName = "phone")]
     public string Phone { get; set; }
 
-    
     /// <summary>
     /// User Status
     /// </summary>
@@ -77,7 +69,6 @@ namespace IO.Swagger.Model {
     [JsonProperty(PropertyName = "userStatus")]
     public int? UserStatus { get; set; }
 
-    
 
     /// <summary>
     /// Get the string presentation of the object
@@ -86,23 +77,14 @@ namespace IO.Swagger.Model {
     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();
     }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/AnimalTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/AnimalTests.cs
new file mode 100644
index 00000000000..861ca5fe026
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/AnimalTests.cs
@@ -0,0 +1,64 @@
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using IO.Swagger.Api;
+using IO.Swagger.Model;
+using IO.Swagger.Client;
+using System.Reflection;
+
+namespace IO.Swagger.Test
+{
+    /// <summary>
+    ///  Class for testing Animal
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by Swagger Codegen.
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class AnimalTests
+    {
+        private Animal instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            instance = new Animal();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of Animal
+        /// </summary>
+        [Test]
+        public void AnimalInstanceTest()
+        {
+            Assert.IsInstanceOf<Animal> (instance, "instance is a Animal");
+        }
+
+        /// <summary>
+        /// Test the property 'ClassName'
+        /// </summary>
+        [Test]
+        public void ClassNameTest()
+        {
+            // TODO: unit test for the property 'ClassName'
+        }
+
+    }
+
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/ApiResponseTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/ApiResponseTests.cs
new file mode 100644
index 00000000000..c2535cdadb3
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/ApiResponseTests.cs
@@ -0,0 +1,80 @@
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using IO.Swagger.Api;
+using IO.Swagger.Model;
+using IO.Swagger.Client;
+using System.Reflection;
+
+namespace IO.Swagger.Test
+{
+    /// <summary>
+    ///  Class for testing ApiResponse
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by Swagger Codegen.
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class ApiResponseTests
+    {
+        private ApiResponse instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            instance = new ApiResponse();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of ApiResponse
+        /// </summary>
+        [Test]
+        public void ApiResponseInstanceTest()
+        {
+            Assert.IsInstanceOf<ApiResponse> (instance, "instance is a ApiResponse");
+        }
+
+        /// <summary>
+        /// Test the property 'Code'
+        /// </summary>
+        [Test]
+        public void CodeTest()
+        {
+            // TODO: unit test for the property 'Code'
+        }
+        /// <summary>
+        /// Test the property 'Type'
+        /// </summary>
+        [Test]
+        public void TypeTest()
+        {
+            // TODO: unit test for the property 'Type'
+        }
+        /// <summary>
+        /// Test the property 'Message'
+        /// </summary>
+        [Test]
+        public void MessageTest()
+        {
+            // TODO: unit test for the property 'Message'
+        }
+
+    }
+
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/CatTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/CatTests.cs
new file mode 100644
index 00000000000..15cc1ab22de
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/CatTests.cs
@@ -0,0 +1,72 @@
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using IO.Swagger.Api;
+using IO.Swagger.Model;
+using IO.Swagger.Client;
+using System.Reflection;
+
+namespace IO.Swagger.Test
+{
+    /// <summary>
+    ///  Class for testing Cat
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by Swagger Codegen.
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class CatTests
+    {
+        private Cat instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            instance = new Cat();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of Cat
+        /// </summary>
+        [Test]
+        public void CatInstanceTest()
+        {
+            Assert.IsInstanceOf<Cat> (instance, "instance is a Cat");
+        }
+
+        /// <summary>
+        /// Test the property 'ClassName'
+        /// </summary>
+        [Test]
+        public void ClassNameTest()
+        {
+            // TODO: unit test for the property 'ClassName'
+        }
+        /// <summary>
+        /// Test the property 'Declawed'
+        /// </summary>
+        [Test]
+        public void DeclawedTest()
+        {
+            // TODO: unit test for the property 'Declawed'
+        }
+
+    }
+
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/DogTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/DogTests.cs
new file mode 100644
index 00000000000..33aa6cb51af
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/DogTests.cs
@@ -0,0 +1,72 @@
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using IO.Swagger.Api;
+using IO.Swagger.Model;
+using IO.Swagger.Client;
+using System.Reflection;
+
+namespace IO.Swagger.Test
+{
+    /// <summary>
+    ///  Class for testing Dog
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by Swagger Codegen.
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class DogTests
+    {
+        private Dog instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            instance = new Dog();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of Dog
+        /// </summary>
+        [Test]
+        public void DogInstanceTest()
+        {
+            Assert.IsInstanceOf<Dog> (instance, "instance is a Dog");
+        }
+
+        /// <summary>
+        /// Test the property 'ClassName'
+        /// </summary>
+        [Test]
+        public void ClassNameTest()
+        {
+            // TODO: unit test for the property 'ClassName'
+        }
+        /// <summary>
+        /// Test the property 'Breed'
+        /// </summary>
+        [Test]
+        public void BreedTest()
+        {
+            // TODO: unit test for the property 'Breed'
+        }
+
+    }
+
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/FormatTestTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/FormatTestTests.cs
new file mode 100644
index 00000000000..a6eec919779
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/FormatTestTests.cs
@@ -0,0 +1,152 @@
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using IO.Swagger.Api;
+using IO.Swagger.Model;
+using IO.Swagger.Client;
+using System.Reflection;
+
+namespace IO.Swagger.Test
+{
+    /// <summary>
+    ///  Class for testing FormatTest
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by Swagger Codegen.
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class FormatTestTests
+    {
+        private FormatTest instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            instance = new FormatTest();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of FormatTest
+        /// </summary>
+        [Test]
+        public void FormatTestInstanceTest()
+        {
+            Assert.IsInstanceOf<FormatTest> (instance, "instance is a FormatTest");
+        }
+
+        /// <summary>
+        /// Test the property 'Integer'
+        /// </summary>
+        [Test]
+        public void IntegerTest()
+        {
+            // TODO: unit test for the property 'Integer'
+        }
+        /// <summary>
+        /// Test the property 'Int32'
+        /// </summary>
+        [Test]
+        public void Int32Test()
+        {
+            // TODO: unit test for the property 'Int32'
+        }
+        /// <summary>
+        /// Test the property 'Int64'
+        /// </summary>
+        [Test]
+        public void Int64Test()
+        {
+            // TODO: unit test for the property 'Int64'
+        }
+        /// <summary>
+        /// Test the property 'Number'
+        /// </summary>
+        [Test]
+        public void NumberTest()
+        {
+            // TODO: unit test for the property 'Number'
+        }
+        /// <summary>
+        /// Test the property '_Float'
+        /// </summary>
+        [Test]
+        public void _FloatTest()
+        {
+            // TODO: unit test for the property '_Float'
+        }
+        /// <summary>
+        /// Test the property '_Double'
+        /// </summary>
+        [Test]
+        public void _DoubleTest()
+        {
+            // TODO: unit test for the property '_Double'
+        }
+        /// <summary>
+        /// Test the property '_String'
+        /// </summary>
+        [Test]
+        public void _StringTest()
+        {
+            // TODO: unit test for the property '_String'
+        }
+        /// <summary>
+        /// Test the property '_Byte'
+        /// </summary>
+        [Test]
+        public void _ByteTest()
+        {
+            // TODO: unit test for the property '_Byte'
+        }
+        /// <summary>
+        /// Test the property 'Binary'
+        /// </summary>
+        [Test]
+        public void BinaryTest()
+        {
+            // TODO: unit test for the property 'Binary'
+        }
+        /// <summary>
+        /// Test the property 'Date'
+        /// </summary>
+        [Test]
+        public void DateTest()
+        {
+            // TODO: unit test for the property 'Date'
+        }
+        /// <summary>
+        /// Test the property 'DateTime'
+        /// </summary>
+        [Test]
+        public void DateTimeTest()
+        {
+            // TODO: unit test for the property 'DateTime'
+        }
+        /// <summary>
+        /// Test the property 'Password'
+        /// </summary>
+        [Test]
+        public void PasswordTest()
+        {
+            // TODO: unit test for the property 'Password'
+        }
+
+    }
+
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/InlineResponse200Tests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/InlineResponse200Tests.cs
index 4e03a3ef4f9..a4930b02df3 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/InlineResponse200Tests.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/InlineResponse200Tests.cs
@@ -51,12 +51,20 @@ namespace IO.Swagger.Test
         }
 
         /// <summary>
-        /// Test the property 'Tags'
+        /// Test the property 'PhotoUrls'
         /// </summary>
         [Test]
-        public void TagsTest()
+        public void PhotoUrlsTest()
         {
-            // TODO: unit test for the property 'Tags'
+            // TODO: unit test for the property 'PhotoUrls'
+        }
+        /// <summary>
+        /// Test the property 'Name'
+        /// </summary>
+        [Test]
+        public void NameTest()
+        {
+            // TODO: unit test for the property 'Name'
         }
         /// <summary>
         /// Test the property 'Id'
@@ -75,6 +83,14 @@ namespace IO.Swagger.Test
             // TODO: unit test for the property 'Category'
         }
         /// <summary>
+        /// Test the property 'Tags'
+        /// </summary>
+        [Test]
+        public void TagsTest()
+        {
+            // TODO: unit test for the property 'Tags'
+        }
+        /// <summary>
         /// Test the property 'Status'
         /// </summary>
         [Test]
@@ -82,22 +98,6 @@ namespace IO.Swagger.Test
         {
             // TODO: unit test for the property 'Status'
         }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO: unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'PhotoUrls'
-        /// </summary>
-        [Test]
-        public void PhotoUrlsTest()
-        {
-            // TODO: unit test for the property 'PhotoUrls'
-        }
 
     }
 
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/PetApiTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/PetApiTests.cs
index 67d8241ee91..a24e297eea1 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/PetApiTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/PetApiTests.cs
@@ -65,18 +65,6 @@ namespace IO.Swagger.Test
             
         }
         
-        /// <summary>
-        /// Test AddPetUsingByteArray
-        /// </summary>
-        [Test]
-        public void AddPetUsingByteArrayTest()
-        {
-            // TODO: add unit test for the method 'AddPetUsingByteArray'
-            byte[] body = null; // TODO: replace null with proper value
-            instance.AddPetUsingByteArray(body);
-            
-        }
-        
         /// <summary>
         /// Test DeletePet
         /// </summary>
@@ -85,7 +73,7 @@ namespace IO.Swagger.Test
         {
             // TODO: add unit test for the method 'DeletePet'
             long? petId = null; // TODO: replace null with proper value
-string apiKey = null; // TODO: replace null with proper value
+            string apiKey = null; // TODO: replace null with proper value
             instance.DeletePet(petId, apiKey);
             
         }
@@ -126,30 +114,6 @@ string apiKey = null; // TODO: replace null with proper value
             Assert.IsInstanceOf<Pet> (response, "response is Pet");
         }
         
-        /// <summary>
-        /// Test GetPetByIdInObject
-        /// </summary>
-        [Test]
-        public void GetPetByIdInObjectTest()
-        {
-            // TODO: add unit test for the method 'GetPetByIdInObject'
-            long? petId = null; // TODO: replace null with proper value
-            var response = instance.GetPetByIdInObject(petId);
-            Assert.IsInstanceOf<InlineResponse200> (response, "response is InlineResponse200");
-        }
-        
-        /// <summary>
-        /// Test PetPetIdtestingByteArraytrueGet
-        /// </summary>
-        [Test]
-        public void PetPetIdtestingByteArraytrueGetTest()
-        {
-            // TODO: add unit test for the method 'PetPetIdtestingByteArraytrueGet'
-            long? petId = null; // TODO: replace null with proper value
-            var response = instance.PetPetIdtestingByteArraytrueGet(petId);
-            Assert.IsInstanceOf<byte[]> (response, "response is byte[]");
-        }
-        
         /// <summary>
         /// Test UpdatePet
         /// </summary>
@@ -169,9 +133,9 @@ string apiKey = null; // TODO: replace null with proper value
         public void UpdatePetWithFormTest()
         {
             // TODO: add unit test for the method 'UpdatePetWithForm'
-            string petId = null; // TODO: replace null with proper value
-string name = null; // TODO: replace null with proper value
-string status = null; // TODO: replace null with proper value
+            long? petId = null; // TODO: replace null with proper value
+            string name = null; // TODO: replace null with proper value
+            string status = null; // TODO: replace null with proper value
             instance.UpdatePetWithForm(petId, name, status);
             
         }
@@ -184,10 +148,10 @@ string status = null; // TODO: replace null with proper value
         {
             // TODO: add unit test for the method 'UploadFile'
             long? petId = null; // TODO: replace null with proper value
-string additionalMetadata = null; // TODO: replace null with proper value
-Stream file = null; // TODO: replace null with proper value
-            instance.UploadFile(petId, additionalMetadata, file);
-            
+            string additionalMetadata = null; // TODO: replace null with proper value
+            System.IO.Stream file = null; // TODO: replace null with proper value
+            var response = instance.UploadFile(petId, additionalMetadata, file);
+            Assert.IsInstanceOf<ApiResponse> (response, "response is ApiResponse");
         }
         
     }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/StoreApiTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/StoreApiTests.cs
index 1d3e1c53815..5ccac40bbfb 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/StoreApiTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/StoreApiTests.cs
@@ -65,18 +65,6 @@ namespace IO.Swagger.Test
             
         }
         
-        /// <summary>
-        /// Test FindOrdersByStatus
-        /// </summary>
-        [Test]
-        public void FindOrdersByStatusTest()
-        {
-            // TODO: add unit test for the method 'FindOrdersByStatus'
-            string status = null; // TODO: replace null with proper value
-            var response = instance.FindOrdersByStatus(status);
-            Assert.IsInstanceOf<List<Order>> (response, "response is List<Order>");
-        }
-        
         /// <summary>
         /// Test GetInventory
         /// </summary>
@@ -84,21 +72,10 @@ namespace IO.Swagger.Test
         public void GetInventoryTest()
         {
             // TODO: add unit test for the method 'GetInventory'
-                        var response = instance.GetInventory();
+            var response = instance.GetInventory();
             Assert.IsInstanceOf<Dictionary<string, int?>> (response, "response is Dictionary<string, int?>");
         }
         
-        /// <summary>
-        /// Test GetInventoryInObject
-        /// </summary>
-        [Test]
-        public void GetInventoryInObjectTest()
-        {
-            // TODO: add unit test for the method 'GetInventoryInObject'
-                        var response = instance.GetInventoryInObject();
-            Assert.IsInstanceOf<Object> (response, "response is Object");
-        }
-        
         /// <summary>
         /// Test GetOrderById
         /// </summary>
@@ -106,7 +83,7 @@ namespace IO.Swagger.Test
         public void GetOrderByIdTest()
         {
             // TODO: add unit test for the method 'GetOrderById'
-            string orderId = null; // TODO: replace null with proper value
+            long? orderId = null; // TODO: replace null with proper value
             var response = instance.GetOrderById(orderId);
             Assert.IsInstanceOf<Order> (response, "response is Order");
         }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/UserApiTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/UserApiTests.cs
index 10caebdfe4f..ffb0593aa88 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/UserApiTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/UserApiTests.cs
@@ -121,7 +121,7 @@ namespace IO.Swagger.Test
         {
             // TODO: add unit test for the method 'LoginUser'
             string username = null; // TODO: replace null with proper value
-string password = null; // TODO: replace null with proper value
+            string password = null; // TODO: replace null with proper value
             var response = instance.LoginUser(username, password);
             Assert.IsInstanceOf<string> (response, "response is string");
         }
@@ -133,7 +133,7 @@ string password = null; // TODO: replace null with proper value
         public void LogoutUserTest()
         {
             // TODO: add unit test for the method 'LogoutUser'
-                        instance.LogoutUser();
+            instance.LogoutUser();
             
         }
         
@@ -145,7 +145,7 @@ string password = null; // TODO: replace null with proper value
         {
             // TODO: add unit test for the method 'UpdateUser'
             string username = null; // TODO: replace null with proper value
-User body = null; // TODO: replace null with proper value
+            User body = null; // TODO: replace null with proper value
             instance.UpdateUser(username, body);
             
         }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/README.md b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/README.md
index 794a7c49b1b..a73dec9973a 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/README.md
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/README.md
@@ -1,10 +1,20 @@
+# IO.Swagger - the C# library for the Swagger Petstore
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
+
+This C# SDK is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
+
+- API version: 1.0.0
+- Package version: 1.0.0
+- Build date: 2016-04-17T23:54:21.676+08:00
+- Build package: class io.swagger.codegen.languages.CSharpClientCodegen
+
 ## Frameworks supported
 - .NET 4.0 or later
 - Windows Phone 7.1 (Mango)
 
 ## Dependencies
 - [RestSharp] (https://www.nuget.org/packages/RestSharp) - 105.1.0 or later
-- [Json.NET] (https://www.nuget.org/packages/Newtonsoft.Json/) - 7.0.0 or later 
+- [Json.NET] (https://www.nuget.org/packages/Newtonsoft.Json/) - 7.0.0 or later
 
 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:
 ```
@@ -16,7 +26,112 @@ NOTE: RestSharp versions greater than 105.1.0 have a bug which causes file uploa
 
 ## Installation
 Run the following command to generate the DLL
-- [Mac/Linux] compile-mono.sh
-- [Windows] compile.bat
+- [Mac/Linux] `/bin/sh compile-mono.sh`
+- [Windows] `compile.bat`
+
+Then include the DLL (under the `bin` folder) in the C# project, and import the packages:
+```csharp
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+```
+
+## Getting Started
+
+```csharp
+using System;
+using System.Diagnostics;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+
+
+namespace Example
+{
+    public class Example
+    {
+        public void main()
+        {
+            
+            // Configure OAuth2 access token for authorization: petstore_auth
+            Configuration.Default.AccessToken = 'YOUR_ACCESS_TOKEN';
+
+            var apiInstance = new PetApi();
+            var body = new Pet(); // Pet | Pet object that needs to be added to the store
+
+            try
+            {
+                // Add a new pet to the store
+                apiInstance.AddPet(body);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling PetApi.AddPet: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+## Documentation for API Endpoints
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*PetApi* | [**AddPet**](docs/PetApi.md#addpet) | **POST** /pet | Add a new pet to the store
+*PetApi* | [**DeletePet**](docs/PetApi.md#deletepet) | **DELETE** /pet/{petId} | Deletes a pet
+*PetApi* | [**FindPetsByStatus**](docs/PetApi.md#findpetsbystatus) | **GET** /pet/findByStatus | Finds Pets by status
+*PetApi* | [**FindPetsByTags**](docs/PetApi.md#findpetsbytags) | **GET** /pet/findByTags | Finds Pets by tags
+*PetApi* | [**GetPetById**](docs/PetApi.md#getpetbyid) | **GET** /pet/{petId} | Find pet by ID
+*PetApi* | [**UpdatePet**](docs/PetApi.md#updatepet) | **PUT** /pet | Update an existing pet
+*PetApi* | [**UpdatePetWithForm**](docs/PetApi.md#updatepetwithform) | **POST** /pet/{petId} | Updates a pet in the store with form data
+*PetApi* | [**UploadFile**](docs/PetApi.md#uploadfile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*StoreApi* | [**DeleteOrder**](docs/StoreApi.md#deleteorder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
+*StoreApi* | [**GetInventory**](docs/StoreApi.md#getinventory) | **GET** /store/inventory | Returns pet inventories by status
+*StoreApi* | [**GetOrderById**](docs/StoreApi.md#getorderbyid) | **GET** /store/order/{orderId} | Find purchase order by ID
+*StoreApi* | [**PlaceOrder**](docs/StoreApi.md#placeorder) | **POST** /store/order | Place an order for a pet
+*UserApi* | [**CreateUser**](docs/UserApi.md#createuser) | **POST** /user | Create user
+*UserApi* | [**CreateUsersWithArrayInput**](docs/UserApi.md#createuserswitharrayinput) | **POST** /user/createWithArray | Creates list of users with given input array
+*UserApi* | [**CreateUsersWithListInput**](docs/UserApi.md#createuserswithlistinput) | **POST** /user/createWithList | Creates list of users with given input array
+*UserApi* | [**DeleteUser**](docs/UserApi.md#deleteuser) | **DELETE** /user/{username} | Delete user
+*UserApi* | [**GetUserByName**](docs/UserApi.md#getuserbyname) | **GET** /user/{username} | Get user by user name
+*UserApi* | [**LoginUser**](docs/UserApi.md#loginuser) | **GET** /user/login | Logs user into the system
+*UserApi* | [**LogoutUser**](docs/UserApi.md#logoutuser) | **GET** /user/logout | Logs out current logged in user session
+*UserApi* | [**UpdateUser**](docs/UserApi.md#updateuser) | **PUT** /user/{username} | Updated user
+
+
+## Documentation for Models
+
+ - [IO.Swagger.Model.Animal](docs/Animal.md)
+ - [IO.Swagger.Model.ApiResponse](docs/ApiResponse.md)
+ - [IO.Swagger.Model.Cat](docs/Cat.md)
+ - [IO.Swagger.Model.Category](docs/Category.md)
+ - [IO.Swagger.Model.Dog](docs/Dog.md)
+ - [IO.Swagger.Model.FormatTest](docs/FormatTest.md)
+ - [IO.Swagger.Model.Model200Response](docs/Model200Response.md)
+ - [IO.Swagger.Model.ModelReturn](docs/ModelReturn.md)
+ - [IO.Swagger.Model.Name](docs/Name.md)
+ - [IO.Swagger.Model.Order](docs/Order.md)
+ - [IO.Swagger.Model.Pet](docs/Pet.md)
+ - [IO.Swagger.Model.SpecialModelName](docs/SpecialModelName.md)
+ - [IO.Swagger.Model.Tag](docs/Tag.md)
+ - [IO.Swagger.Model.User](docs/User.md)
+
+
+## Documentation for Authorization
+
+
+### api_key
+
+- **Type**: API key
+- **API key parameter name**: api_key
+- **Location**: HTTP header
+
+### petstore_auth
+
+- **Type**: OAuth
+- **Flow**: implicit
+- **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
+- **Scopes**: 
+  - write:pets: modify pets in your account
+  - read:pets: read your pets
 
-Then include the DLL (under the `bin` folder) in the C# project
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/README.mustache b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/README.mustache
new file mode 100644
index 00000000000..d5f5ce413b3
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/README.mustache
@@ -0,0 +1,184 @@
+ - the C# library for the Swagger Petstore
+
+    This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+
+This SDK is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
+
+- API version: 1.0.0
+- Package version: 
+- Build date: 2016-04-14T06:55:47.468-04:00
+- Build package: class io.swagger.codegen.languages.CSharpClientCodegen
+
+## Frameworks supported
+- .NET 4.0 or later
+- Windows Phone 7.1 (Mango)
+
+## Dependencies
+- [RestSharp] (https://www.nuget.org/packages/RestSharp) - 105.1.0 or later
+- [Json.NET] (https://www.nuget.org/packages/Newtonsoft.Json/) - 7.0.0 or later 
+
+The DLLs included in the package may not be the latest version. We recommned using [NuGet] (https://docs.nuget.org/consume/installing-nuget) to obtain the latest version of the packages:
+```
+Install-Package RestSharp
+Install-Package Newtonsoft.Json
+```
+
+NOTE: RestSharp versions greater than 105.1.0 have a bug which causes file uploads to fail. See [RestSharp#742](https://github.com/restsharp/RestSharp/issues/742)
+
+## Installation
+Run the following command to generate the DLL
+- [Mac/Linux] compile-mono.sh
+- [Windows] compile.bat
+
+Then include the DLL (under the `bin` folder) in the C# project
+
+
+```csharp
+using System;
+using System.Diagnostics;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Module;
+
+namespace Example
+{
+public class Example
+{
+public void main(){
+
+    // Configure OAuth2 access token for authorization: petstore_auth
+    Configuration.Default.AccessToken = 'YOUR_ACCESS_TOKEN';
+    // Configure API key authorization: test_api_client_id
+    Configuration.Default.ApiKey.Add('x-test_api_client_id', 'YOUR_API_KEY');
+    // Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+    // Configuration.Default.ApiKeyPrefix.Add('x-test_api_client_id', 'BEARER');
+    // Configure API key authorization: test_api_client_secret
+    Configuration.Default.ApiKey.Add('x-test_api_client_secret', 'YOUR_API_KEY');
+    // Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+    // Configuration.Default.ApiKeyPrefix.Add('x-test_api_client_secret', 'BEARER');
+    // Configure API key authorization: api_key
+    Configuration.Default.ApiKey.Add('api_key', 'YOUR_API_KEY');
+    // Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+    // Configuration.Default.ApiKeyPrefix.Add('api_key', 'BEARER');
+    // Configure HTTP basic authorization: test_http_basic
+    Configuration.Default.Username = 'YOUR_USERNAME';
+    Configuration.Default.Password = 'YOUR_PASSWORD';
+    // Configure API key authorization: test_api_key_query
+    Configuration.Default.ApiKey.Add('test_api_key_query', 'YOUR_API_KEY');
+    // Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+    // Configuration.Default.ApiKeyPrefix.Add('test_api_key_query', 'BEARER');
+    // Configure API key authorization: test_api_key_header
+    Configuration.Default.ApiKey.Add('test_api_key_header', 'YOUR_API_KEY');
+    // Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+    // Configuration.Default.ApiKeyPrefix.Add('test_api_key_header', 'BEARER');
+
+var apiInstance = new ();
+
+try {
+apiInstance.();
+} catch (Exception e) {
+Debug.Print("Exception when calling .: " + e.Message );
+}
+}
+}
+}
+```
+
+## Documentation for API Endpoints
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*::PetApi* | [**AddPet**](docs/PetApi.md#AddPet) | **POST** /pet | Add a new pet to the store
+*::PetApi* | [**AddPetUsingByteArray**](docs/PetApi.md#AddPetUsingByteArray) | **POST** /pet?testing_byte_array&#x3D;true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
+*::PetApi* | [**DeletePet**](docs/PetApi.md#DeletePet) | **DELETE** /pet/{petId} | Deletes a pet
+*::PetApi* | [**FindPetsByStatus**](docs/PetApi.md#FindPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status
+*::PetApi* | [**FindPetsByTags**](docs/PetApi.md#FindPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags
+*::PetApi* | [**GetPetById**](docs/PetApi.md#GetPetById) | **GET** /pet/{petId} | Find pet by ID
+*::PetApi* | [**GetPetByIdInObject**](docs/PetApi.md#GetPetByIdInObject) | **GET** /pet/{petId}?response&#x3D;inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
+*::PetApi* | [**PetPetIdtestingByteArraytrueGet**](docs/PetApi.md#PetPetIdtestingByteArraytrueGet) | **GET** /pet/{petId}?testing_byte_array&#x3D;true | Fake endpoint to test byte array return by 'Find pet by ID'
+*::PetApi* | [**UpdatePet**](docs/PetApi.md#UpdatePet) | **PUT** /pet | Update an existing pet
+*::PetApi* | [**UpdatePetWithForm**](docs/PetApi.md#UpdatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
+*::PetApi* | [**UploadFile**](docs/PetApi.md#UploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*::StoreApi* | [**DeleteOrder**](docs/StoreApi.md#DeleteOrder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
+*::StoreApi* | [**FindOrdersByStatus**](docs/StoreApi.md#FindOrdersByStatus) | **GET** /store/findByStatus | Finds orders by status
+*::StoreApi* | [**GetInventory**](docs/StoreApi.md#GetInventory) | **GET** /store/inventory | Returns pet inventories by status
+*::StoreApi* | [**GetInventoryInObject**](docs/StoreApi.md#GetInventoryInObject) | **GET** /store/inventory?response&#x3D;arbitrary_object | Fake endpoint to test arbitrary object return by 'Get inventory'
+*::StoreApi* | [**GetOrderById**](docs/StoreApi.md#GetOrderById) | **GET** /store/order/{orderId} | Find purchase order by ID
+*::StoreApi* | [**PlaceOrder**](docs/StoreApi.md#PlaceOrder) | **POST** /store/order | Place an order for a pet
+*::UserApi* | [**CreateUser**](docs/UserApi.md#CreateUser) | **POST** /user | Create user
+*::UserApi* | [**CreateUsersWithArrayInput**](docs/UserApi.md#CreateUsersWithArrayInput) | **POST** /user/createWithArray | Creates list of users with given input array
+*::UserApi* | [**CreateUsersWithListInput**](docs/UserApi.md#CreateUsersWithListInput) | **POST** /user/createWithList | Creates list of users with given input array
+*::UserApi* | [**DeleteUser**](docs/UserApi.md#DeleteUser) | **DELETE** /user/{username} | Delete user
+*::UserApi* | [**GetUserByName**](docs/UserApi.md#GetUserByName) | **GET** /user/{username} | Get user by user name
+*::UserApi* | [**LoginUser**](docs/UserApi.md#LoginUser) | **GET** /user/login | Logs user into the system
+*::UserApi* | [**LogoutUser**](docs/UserApi.md#LogoutUser) | **GET** /user/logout | Logs out current logged in user session
+*::UserApi* | [**UpdateUser**](docs/UserApi.md#UpdateUser) | **PUT** /user/{username} | Updated user
+
+
+## Documentation for Models
+
+ - [::Animal](docs/Animal.md)
+ - [::Cat](docs/Cat.md)
+ - [::Category](docs/Category.md)
+ - [::Dog](docs/Dog.md)
+ - [::FormatTest](docs/FormatTest.md)
+ - [::InlineResponse200](docs/InlineResponse200.md)
+ - [::Model200Response](docs/Model200Response.md)
+ - [::ModelReturn](docs/ModelReturn.md)
+ - [::Name](docs/Name.md)
+ - [::Order](docs/Order.md)
+ - [::Pet](docs/Pet.md)
+ - [::SpecialModelName](docs/SpecialModelName.md)
+ - [::Tag](docs/Tag.md)
+ - [::User](docs/User.md)
+
+
+## Documentation for Authorization
+
+
+### petstore_auth
+
+- **Type**: OAuth
+- **Flow**: implicit
+- **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
+- **Scopes**: 
+  - write:pets: modify pets in your account
+  - read:pets: read your pets
+
+### test_api_client_id
+
+- **Type**: API key
+- **API key parameter name**: x-test_api_client_id
+- **Location**: HTTP header
+
+### test_api_client_secret
+
+- **Type**: API key
+- **API key parameter name**: x-test_api_client_secret
+- **Location**: HTTP header
+
+### api_key
+
+- **Type**: API key
+- **API key parameter name**: api_key
+- **Location**: HTTP header
+
+### test_http_basic
+
+- **Type**: HTTP basic authentication
+
+### test_api_key_query
+
+- **Type**: API key
+- **API key parameter name**: test_api_key_query
+- **Location**: URL query string
+
+### test_api_key_header
+
+- **Type**: API key
+- **API key parameter name**: test_api_key_header
+- **Location**: HTTP header
+
+
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/Animal.md b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/Animal.md
new file mode 100644
index 00000000000..ef6727b89c4
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/Animal.md
@@ -0,0 +1,8 @@
+# IO.Swagger.Model.Animal
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**ClassName** | **string** |  | 
+
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/ApiResponse.md b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/ApiResponse.md
new file mode 100644
index 00000000000..4a551f43998
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/ApiResponse.md
@@ -0,0 +1,10 @@
+# IO.Swagger.Model.ApiResponse
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Code** | **int?** |  | [optional] 
+**Type** | **string** |  | [optional] 
+**Message** | **string** |  | [optional] 
+
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/Cat.md b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/Cat.md
new file mode 100644
index 00000000000..0acd66d6530
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/Cat.md
@@ -0,0 +1,9 @@
+# IO.Swagger.Model.Cat
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**ClassName** | **string** |  | 
+**Declawed** | **bool?** |  | [optional] 
+
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/Category.md b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/Category.md
new file mode 100644
index 00000000000..d0ebf1a1ec7
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/Category.md
@@ -0,0 +1,9 @@
+# IO.Swagger.Model.Category
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Id** | **long?** |  | [optional] 
+**Name** | **string** |  | [optional] 
+
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/Dog.md b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/Dog.md
new file mode 100644
index 00000000000..12949333e19
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/Dog.md
@@ -0,0 +1,9 @@
+# IO.Swagger.Model.Dog
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**ClassName** | **string** |  | 
+**Breed** | **string** |  | [optional] 
+
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/FormatTest.md b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/FormatTest.md
new file mode 100644
index 00000000000..b3276355507
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/FormatTest.md
@@ -0,0 +1,19 @@
+# IO.Swagger.Model.FormatTest
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Integer** | **int?** |  | [optional] 
+**Int32** | **int?** |  | [optional] 
+**Int64** | **long?** |  | [optional] 
+**Number** | **double?** |  | 
+**_Float** | **float?** |  | [optional] 
+**_Double** | **double?** |  | [optional] 
+**_String** | **string** |  | [optional] 
+**_Byte** | **byte[]** |  | [optional] 
+**Binary** | **byte[]** |  | [optional] 
+**Date** | **DateTime?** |  | [optional] 
+**DateTime** | **DateTime?** |  | [optional] 
+**Password** | **string** |  | [optional] 
+
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/InlineResponse200.md b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/InlineResponse200.md
new file mode 100644
index 00000000000..6380096b06b
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/InlineResponse200.md
@@ -0,0 +1,14 @@
+# InlineResponse200
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**PhotoUrls** | **List&lt;string&gt;** |  | [optional] 
+**Name** | **string** |  | [optional] 
+**Id** | **long?** |  | 
+**Category** | **Object** |  | [optional] 
+**Tags** | [**List&lt;Tag&gt;**](Tag.md) |  | [optional] 
+**Status** | **string** | pet status in the store | [optional] 
+
+
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/Model200Response.md b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/Model200Response.md
new file mode 100644
index 00000000000..647d981bc52
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/Model200Response.md
@@ -0,0 +1,8 @@
+# IO.Swagger.Model.Model200Response
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **int?** |  | [optional] 
+
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/ModelReturn.md b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/ModelReturn.md
new file mode 100644
index 00000000000..859f217de9d
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/ModelReturn.md
@@ -0,0 +1,8 @@
+# IO.Swagger.Model.ModelReturn
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**_Return** | **int?** |  | [optional] 
+
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/Name.md b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/Name.md
new file mode 100644
index 00000000000..a2b0df80869
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/Name.md
@@ -0,0 +1,9 @@
+# IO.Swagger.Model.Name
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**_Name** | **int?** |  | 
+**SnakeCase** | **int?** |  | [optional] 
+
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/Order.md b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/Order.md
new file mode 100644
index 00000000000..b4ffb22e6bb
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/Order.md
@@ -0,0 +1,13 @@
+# IO.Swagger.Model.Order
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Id** | **long?** |  | [optional] 
+**PetId** | **long?** |  | [optional] 
+**Quantity** | **int?** |  | [optional] 
+**ShipDate** | **DateTime?** |  | [optional] 
+**Status** | **string** | Order Status | [optional] 
+**Complete** | **bool?** |  | [optional] [default to false]
+
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/Pet.md b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/Pet.md
new file mode 100644
index 00000000000..74d7b6caca7
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/Pet.md
@@ -0,0 +1,13 @@
+# IO.Swagger.Model.Pet
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Id** | **long?** |  | [optional] 
+**Category** | [**Category**](Category.md) |  | [optional] 
+**Name** | **string** |  | 
+**PhotoUrls** | **List&lt;string&gt;** |  | 
+**Tags** | [**List&lt;Tag&gt;**](Tag.md) |  | [optional] 
+**Status** | **string** | pet status in the store | [optional] 
+
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/PetApi.md b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/PetApi.md
new file mode 100644
index 00000000000..46b1d566ba1
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/PetApi.md
@@ -0,0 +1,520 @@
+# IO.Swagger.Api.PetApi
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**AddPet**](PetApi.md#addpet) | **POST** /pet | Add a new pet to the store
+[**DeletePet**](PetApi.md#deletepet) | **DELETE** /pet/{petId} | Deletes a pet
+[**FindPetsByStatus**](PetApi.md#findpetsbystatus) | **GET** /pet/findByStatus | Finds Pets by status
+[**FindPetsByTags**](PetApi.md#findpetsbytags) | **GET** /pet/findByTags | Finds Pets by tags
+[**GetPetById**](PetApi.md#getpetbyid) | **GET** /pet/{petId} | Find pet by ID
+[**UpdatePet**](PetApi.md#updatepet) | **PUT** /pet | Update an existing pet
+[**UpdatePetWithForm**](PetApi.md#updatepetwithform) | **POST** /pet/{petId} | Updates a pet in the store with form data
+[**UploadFile**](PetApi.md#uploadfile) | **POST** /pet/{petId}/uploadImage | uploads an image
+
+
+# **AddPet**
+> void AddPet (Pet body)
+
+Add a new pet to the store
+
+
+
+### Example 
+```csharp
+using System;
+using System.Diagnostics;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
+
+namespace Example
+{
+    public class AddPetExample
+    {
+        public void main()
+        {
+            
+            // Configure OAuth2 access token for authorization: petstore_auth
+            Configuration.Default.AccessToken = 'YOUR_ACCESS_TOKEN';
+
+            var apiInstance = new PetApi();
+            var body = new Pet(); // Pet | Pet object that needs to be added to the store
+
+            try
+            {
+                // Add a new pet to the store
+                apiInstance.AddPet(body);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling PetApi.AddPet: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, application/xml
+ - **Accept**: application/xml, application/json
+
+# **DeletePet**
+> void DeletePet (long? petId, string apiKey = null)
+
+Deletes a pet
+
+
+
+### Example 
+```csharp
+using System;
+using System.Diagnostics;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
+
+namespace Example
+{
+    public class DeletePetExample
+    {
+        public void main()
+        {
+            
+            // Configure OAuth2 access token for authorization: petstore_auth
+            Configuration.Default.AccessToken = 'YOUR_ACCESS_TOKEN';
+
+            var apiInstance = new PetApi();
+            var petId = 789;  // long? | Pet id to delete
+            var apiKey = apiKey_example;  // string |  (optional) 
+
+            try
+            {
+                // Deletes a pet
+                apiInstance.DeletePet(petId, apiKey);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling PetApi.DeletePet: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **long?**| Pet id to delete | 
+ **apiKey** | **string**|  | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+# **FindPetsByStatus**
+> List<Pet> FindPetsByStatus (List<string> status)
+
+Finds Pets by status
+
+Multiple status values can be provided with comma separated strings
+
+### Example 
+```csharp
+using System;
+using System.Diagnostics;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
+
+namespace Example
+{
+    public class FindPetsByStatusExample
+    {
+        public void main()
+        {
+            
+            // Configure OAuth2 access token for authorization: petstore_auth
+            Configuration.Default.AccessToken = 'YOUR_ACCESS_TOKEN';
+
+            var apiInstance = new PetApi();
+            var status = new List<string>(); // List<string> | Status values that need to be considered for filter
+
+            try
+            {
+                // Finds Pets by status
+                List&lt;Pet&gt; result = apiInstance.FindPetsByStatus(status);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling PetApi.FindPetsByStatus: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **status** | [**List<string>**](string.md)| Status values that need to be considered for filter | 
+
+### Return type
+
+[**List<Pet>**](Pet.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+# **FindPetsByTags**
+> List<Pet> FindPetsByTags (List<string> tags)
+
+Finds Pets by tags
+
+Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+
+### Example 
+```csharp
+using System;
+using System.Diagnostics;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
+
+namespace Example
+{
+    public class FindPetsByTagsExample
+    {
+        public void main()
+        {
+            
+            // Configure OAuth2 access token for authorization: petstore_auth
+            Configuration.Default.AccessToken = 'YOUR_ACCESS_TOKEN';
+
+            var apiInstance = new PetApi();
+            var tags = new List<string>(); // List<string> | Tags to filter by
+
+            try
+            {
+                // Finds Pets by tags
+                List&lt;Pet&gt; result = apiInstance.FindPetsByTags(tags);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling PetApi.FindPetsByTags: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **tags** | [**List<string>**](string.md)| Tags to filter by | 
+
+### Return type
+
+[**List<Pet>**](Pet.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+# **GetPetById**
+> Pet GetPetById (long? petId)
+
+Find pet by ID
+
+Returns a single pet
+
+### Example 
+```csharp
+using System;
+using System.Diagnostics;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
+
+namespace Example
+{
+    public class GetPetByIdExample
+    {
+        public void main()
+        {
+            
+            // Configure API key authorization: api_key
+            Configuration.Default.ApiKey.Add('api_key', 'YOUR_API_KEY');
+            // Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+            // Configuration.Default.ApiKeyPrefix.Add('api_key', 'BEARER');
+
+            var apiInstance = new PetApi();
+            var petId = 789;  // long? | ID of pet to return
+
+            try
+            {
+                // Find pet by ID
+                Pet result = apiInstance.GetPetById(petId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling PetApi.GetPetById: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **long?**| ID of pet to return | 
+
+### Return type
+
+[**Pet**](Pet.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+# **UpdatePet**
+> void UpdatePet (Pet body)
+
+Update an existing pet
+
+
+
+### Example 
+```csharp
+using System;
+using System.Diagnostics;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
+
+namespace Example
+{
+    public class UpdatePetExample
+    {
+        public void main()
+        {
+            
+            // Configure OAuth2 access token for authorization: petstore_auth
+            Configuration.Default.AccessToken = 'YOUR_ACCESS_TOKEN';
+
+            var apiInstance = new PetApi();
+            var body = new Pet(); // Pet | Pet object that needs to be added to the store
+
+            try
+            {
+                // Update an existing pet
+                apiInstance.UpdatePet(body);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling PetApi.UpdatePet: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, application/xml
+ - **Accept**: application/xml, application/json
+
+# **UpdatePetWithForm**
+> void UpdatePetWithForm (long? petId, string name = null, string status = null)
+
+Updates a pet in the store with form data
+
+
+
+### Example 
+```csharp
+using System;
+using System.Diagnostics;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
+
+namespace Example
+{
+    public class UpdatePetWithFormExample
+    {
+        public void main()
+        {
+            
+            // Configure OAuth2 access token for authorization: petstore_auth
+            Configuration.Default.AccessToken = 'YOUR_ACCESS_TOKEN';
+
+            var apiInstance = new PetApi();
+            var petId = 789;  // long? | ID of pet that needs to be updated
+            var name = name_example;  // string | Updated name of the pet (optional) 
+            var status = status_example;  // string | Updated status of the pet (optional) 
+
+            try
+            {
+                // Updates a pet in the store with form data
+                apiInstance.UpdatePetWithForm(petId, name, status);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling PetApi.UpdatePetWithForm: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **long?**| ID of pet that needs to be updated | 
+ **name** | **string**| Updated name of the pet | [optional] 
+ **status** | **string**| Updated status of the pet | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: application/x-www-form-urlencoded
+ - **Accept**: application/xml, application/json
+
+# **UploadFile**
+> ApiResponse UploadFile (long? petId, string additionalMetadata = null, System.IO.Stream file = null)
+
+uploads an image
+
+
+
+### Example 
+```csharp
+using System;
+using System.Diagnostics;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
+
+namespace Example
+{
+    public class UploadFileExample
+    {
+        public void main()
+        {
+            
+            // Configure OAuth2 access token for authorization: petstore_auth
+            Configuration.Default.AccessToken = 'YOUR_ACCESS_TOKEN';
+
+            var apiInstance = new PetApi();
+            var petId = 789;  // long? | ID of pet to update
+            var additionalMetadata = additionalMetadata_example;  // string | Additional data to pass to server (optional) 
+            var file = new System.IO.Stream(); // System.IO.Stream | file to upload (optional) 
+
+            try
+            {
+                // uploads an image
+                ApiResponse result = apiInstance.UploadFile(petId, additionalMetadata, file);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling PetApi.UploadFile: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **long?**| ID of pet to update | 
+ **additionalMetadata** | **string**| Additional data to pass to server | [optional] 
+ **file** | **System.IO.Stream**| file to upload | [optional] 
+
+### Return type
+
+[**ApiResponse**](ApiResponse.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: multipart/form-data
+ - **Accept**: application/json
+
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/SpecialModelName.md b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/SpecialModelName.md
new file mode 100644
index 00000000000..1d6f2f252de
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/SpecialModelName.md
@@ -0,0 +1,8 @@
+# IO.Swagger.Model.SpecialModelName
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**SpecialPropertyName** | **long?** |  | [optional] 
+
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/StoreApi.md b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/StoreApi.md
new file mode 100644
index 00000000000..382e56160eb
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/StoreApi.md
@@ -0,0 +1,248 @@
+# IO.Swagger.Api.StoreApi
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**DeleteOrder**](StoreApi.md#deleteorder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
+[**GetInventory**](StoreApi.md#getinventory) | **GET** /store/inventory | Returns pet inventories by status
+[**GetOrderById**](StoreApi.md#getorderbyid) | **GET** /store/order/{orderId} | Find purchase order by ID
+[**PlaceOrder**](StoreApi.md#placeorder) | **POST** /store/order | Place an order for a pet
+
+
+# **DeleteOrder**
+> void DeleteOrder (string orderId)
+
+Delete purchase order by ID
+
+For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+
+### Example 
+```csharp
+using System;
+using System.Diagnostics;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
+
+namespace Example
+{
+    public class DeleteOrderExample
+    {
+        public void main()
+        {
+            
+            var apiInstance = new StoreApi();
+            var orderId = orderId_example;  // string | ID of the order that needs to be deleted
+
+            try
+            {
+                // Delete purchase order by ID
+                apiInstance.DeleteOrder(orderId);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling StoreApi.DeleteOrder: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **orderId** | **string**| ID of the order that needs to be deleted | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+# **GetInventory**
+> Dictionary<string, int?> GetInventory ()
+
+Returns pet inventories by status
+
+Returns a map of status codes to quantities
+
+### Example 
+```csharp
+using System;
+using System.Diagnostics;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
+
+namespace Example
+{
+    public class GetInventoryExample
+    {
+        public void main()
+        {
+            
+            // Configure API key authorization: api_key
+            Configuration.Default.ApiKey.Add('api_key', 'YOUR_API_KEY');
+            // Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
+            // Configuration.Default.ApiKeyPrefix.Add('api_key', 'BEARER');
+
+            var apiInstance = new StoreApi();
+
+            try
+            {
+                // Returns pet inventories by status
+                Dictionary&lt;string, int?&gt; result = apiInstance.GetInventory();
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling StoreApi.GetInventory: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+**Dictionary<string, int?>**
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+# **GetOrderById**
+> Order GetOrderById (long? orderId)
+
+Find purchase order by ID
+
+For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+
+### Example 
+```csharp
+using System;
+using System.Diagnostics;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
+
+namespace Example
+{
+    public class GetOrderByIdExample
+    {
+        public void main()
+        {
+            
+            var apiInstance = new StoreApi();
+            var orderId = 789;  // long? | ID of pet that needs to be fetched
+
+            try
+            {
+                // Find purchase order by ID
+                Order result = apiInstance.GetOrderById(orderId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling StoreApi.GetOrderById: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **orderId** | **long?**| ID of pet that needs to be fetched | 
+
+### Return type
+
+[**Order**](Order.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+# **PlaceOrder**
+> Order PlaceOrder (Order body)
+
+Place an order for a pet
+
+
+
+### Example 
+```csharp
+using System;
+using System.Diagnostics;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
+
+namespace Example
+{
+    public class PlaceOrderExample
+    {
+        public void main()
+        {
+            
+            var apiInstance = new StoreApi();
+            var body = new Order(); // Order | order placed for purchasing the pet
+
+            try
+            {
+                // Place an order for a pet
+                Order result = apiInstance.PlaceOrder(body);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling StoreApi.PlaceOrder: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Order**](Order.md)| order placed for purchasing the pet | 
+
+### Return type
+
+[**Order**](Order.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/Tag.md b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/Tag.md
new file mode 100644
index 00000000000..a68cd6f0ecc
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/Tag.md
@@ -0,0 +1,9 @@
+# IO.Swagger.Model.Tag
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Id** | **long?** |  | [optional] 
+**Name** | **string** |  | [optional] 
+
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/User.md b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/User.md
new file mode 100644
index 00000000000..54485476d2f
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/User.md
@@ -0,0 +1,15 @@
+# IO.Swagger.Model.User
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Id** | **long?** |  | [optional] 
+**Username** | **string** |  | [optional] 
+**FirstName** | **string** |  | [optional] 
+**LastName** | **string** |  | [optional] 
+**Email** | **string** |  | [optional] 
+**Password** | **string** |  | [optional] 
+**Phone** | **string** |  | [optional] 
+**UserStatus** | **int?** | User Status | [optional] 
+
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/UserApi.md b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/UserApi.md
new file mode 100644
index 00000000000..11061b7a1e2
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/docs/UserApi.md
@@ -0,0 +1,482 @@
+# IO.Swagger.Api.UserApi
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**CreateUser**](UserApi.md#createuser) | **POST** /user | Create user
+[**CreateUsersWithArrayInput**](UserApi.md#createuserswitharrayinput) | **POST** /user/createWithArray | Creates list of users with given input array
+[**CreateUsersWithListInput**](UserApi.md#createuserswithlistinput) | **POST** /user/createWithList | Creates list of users with given input array
+[**DeleteUser**](UserApi.md#deleteuser) | **DELETE** /user/{username} | Delete user
+[**GetUserByName**](UserApi.md#getuserbyname) | **GET** /user/{username} | Get user by user name
+[**LoginUser**](UserApi.md#loginuser) | **GET** /user/login | Logs user into the system
+[**LogoutUser**](UserApi.md#logoutuser) | **GET** /user/logout | Logs out current logged in user session
+[**UpdateUser**](UserApi.md#updateuser) | **PUT** /user/{username} | Updated user
+
+
+# **CreateUser**
+> void CreateUser (User body)
+
+Create user
+
+This can only be done by the logged in user.
+
+### Example 
+```csharp
+using System;
+using System.Diagnostics;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
+
+namespace Example
+{
+    public class CreateUserExample
+    {
+        public void main()
+        {
+            
+            var apiInstance = new UserApi();
+            var body = new User(); // User | Created user object
+
+            try
+            {
+                // Create user
+                apiInstance.CreateUser(body);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UserApi.CreateUser: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**User**](User.md)| Created user object | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+# **CreateUsersWithArrayInput**
+> void CreateUsersWithArrayInput (List<User> body)
+
+Creates list of users with given input array
+
+
+
+### Example 
+```csharp
+using System;
+using System.Diagnostics;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
+
+namespace Example
+{
+    public class CreateUsersWithArrayInputExample
+    {
+        public void main()
+        {
+            
+            var apiInstance = new UserApi();
+            var body = new List<User>(); // List<User> | List of user object
+
+            try
+            {
+                // Creates list of users with given input array
+                apiInstance.CreateUsersWithArrayInput(body);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UserApi.CreateUsersWithArrayInput: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**List<User>**](User.md)| List of user object | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+# **CreateUsersWithListInput**
+> void CreateUsersWithListInput (List<User> body)
+
+Creates list of users with given input array
+
+
+
+### Example 
+```csharp
+using System;
+using System.Diagnostics;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
+
+namespace Example
+{
+    public class CreateUsersWithListInputExample
+    {
+        public void main()
+        {
+            
+            var apiInstance = new UserApi();
+            var body = new List<User>(); // List<User> | List of user object
+
+            try
+            {
+                // Creates list of users with given input array
+                apiInstance.CreateUsersWithListInput(body);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UserApi.CreateUsersWithListInput: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**List<User>**](User.md)| List of user object | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+# **DeleteUser**
+> void DeleteUser (string username)
+
+Delete user
+
+This can only be done by the logged in user.
+
+### Example 
+```csharp
+using System;
+using System.Diagnostics;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
+
+namespace Example
+{
+    public class DeleteUserExample
+    {
+        public void main()
+        {
+            
+            var apiInstance = new UserApi();
+            var username = username_example;  // string | The name that needs to be deleted
+
+            try
+            {
+                // Delete user
+                apiInstance.DeleteUser(username);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UserApi.DeleteUser: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **string**| The name that needs to be deleted | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+# **GetUserByName**
+> User GetUserByName (string username)
+
+Get user by user name
+
+
+
+### Example 
+```csharp
+using System;
+using System.Diagnostics;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
+
+namespace Example
+{
+    public class GetUserByNameExample
+    {
+        public void main()
+        {
+            
+            var apiInstance = new UserApi();
+            var username = username_example;  // string | The name that needs to be fetched. Use user1 for testing. 
+
+            try
+            {
+                // Get user by user name
+                User result = apiInstance.GetUserByName(username);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UserApi.GetUserByName: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **string**| The name that needs to be fetched. Use user1 for testing.  | 
+
+### Return type
+
+[**User**](User.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+# **LoginUser**
+> string LoginUser (string username, string password)
+
+Logs user into the system
+
+
+
+### Example 
+```csharp
+using System;
+using System.Diagnostics;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
+
+namespace Example
+{
+    public class LoginUserExample
+    {
+        public void main()
+        {
+            
+            var apiInstance = new UserApi();
+            var username = username_example;  // string | The user name for login
+            var password = password_example;  // string | The password for login in clear text
+
+            try
+            {
+                // Logs user into the system
+                string result = apiInstance.LoginUser(username, password);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UserApi.LoginUser: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **string**| The user name for login | 
+ **password** | **string**| The password for login in clear text | 
+
+### Return type
+
+**string**
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+# **LogoutUser**
+> void LogoutUser ()
+
+Logs out current logged in user session
+
+
+
+### Example 
+```csharp
+using System;
+using System.Diagnostics;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
+
+namespace Example
+{
+    public class LogoutUserExample
+    {
+        public void main()
+        {
+            
+            var apiInstance = new UserApi();
+
+            try
+            {
+                // Logs out current logged in user session
+                apiInstance.LogoutUser();
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UserApi.LogoutUser: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+# **UpdateUser**
+> void UpdateUser (string username, User body)
+
+Updated user
+
+This can only be done by the logged in user.
+
+### Example 
+```csharp
+using System;
+using System.Diagnostics;
+using IO.Swagger.Api;
+using IO.Swagger.Client;
+using IO.Swagger.Model;
+
+namespace Example
+{
+    public class UpdateUserExample
+    {
+        public void main()
+        {
+            
+            var apiInstance = new UserApi();
+            var username = username_example;  // string | name that need to be deleted
+            var body = new User(); // User | Updated user object
+
+            try
+            {
+                // Updated user
+                apiInstance.UpdateUser(username, body);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UserApi.UpdateUser: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **string**| name that need to be deleted | 
+ **body** | [**User**](User.md)| Updated user object | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/petstore b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/petstore
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs
index 12aad1b198e..75d8dd830c7 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs
@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
@@ -22,9 +21,9 @@ namespace IO.Swagger.Api
         /// 
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Pet object that needs to be added to the store (optional)</param>
+        /// <param name="body">Pet object that needs to be added to the store</param>
         /// <returns></returns>
-        void AddPet (Pet body = null);
+        void AddPet (Pet body);
 
         /// <summary>
         /// Add a new pet to the store
@@ -33,30 +32,9 @@ namespace IO.Swagger.Api
         /// 
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Pet object that needs to be added to the store (optional)</param>
+        /// <param name="body">Pet object that needs to be added to the store</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> AddPetWithHttpInfo (Pet body = null);
-        /// <summary>
-        /// Fake endpoint to test byte array in body parameter for adding a new pet to the store
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Pet object in the form of byte array (optional)</param>
-        /// <returns></returns>
-        void AddPetUsingByteArray (byte[] body = null);
-
-        /// <summary>
-        /// Fake endpoint to test byte array in body parameter for adding a new pet to the store
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Pet object in the form of byte array (optional)</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> AddPetUsingByteArrayWithHttpInfo (byte[] body = null);
+        ApiResponse<Object> AddPetWithHttpInfo (Pet body);
         /// <summary>
         /// Deletes a pet
         /// </summary>
@@ -87,9 +65,9 @@ namespace IO.Swagger.Api
         /// Multiple status values can be provided with comma separated strings
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="status">Status values that need to be considered for query (optional, default to available)</param>
+        /// <param name="status">Status values that need to be considered for filter</param>
         /// <returns>List&lt;Pet&gt;</returns>
-        List<Pet> FindPetsByStatus (List<string> status = null);
+        List<Pet> FindPetsByStatus (List<string> status);
 
         /// <summary>
         /// Finds Pets by status
@@ -98,38 +76,38 @@ namespace IO.Swagger.Api
         /// Multiple status values can be provided with comma separated strings
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="status">Status values that need to be considered for query (optional, default to available)</param>
+        /// <param name="status">Status values that need to be considered for filter</param>
         /// <returns>ApiResponse of List&lt;Pet&gt;</returns>
-        ApiResponse<List<Pet>> FindPetsByStatusWithHttpInfo (List<string> status = null);
+        ApiResponse<List<Pet>> FindPetsByStatusWithHttpInfo (List<string> status);
         /// <summary>
         /// Finds Pets by tags
         /// </summary>
         /// <remarks>
-        /// Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+        /// Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="tags">Tags to filter by (optional)</param>
+        /// <param name="tags">Tags to filter by</param>
         /// <returns>List&lt;Pet&gt;</returns>
-        List<Pet> FindPetsByTags (List<string> tags = null);
+        List<Pet> FindPetsByTags (List<string> tags);
 
         /// <summary>
         /// Finds Pets by tags
         /// </summary>
         /// <remarks>
-        /// Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+        /// Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="tags">Tags to filter by (optional)</param>
+        /// <param name="tags">Tags to filter by</param>
         /// <returns>ApiResponse of List&lt;Pet&gt;</returns>
-        ApiResponse<List<Pet>> FindPetsByTagsWithHttpInfo (List<string> tags = null);
+        ApiResponse<List<Pet>> FindPetsByTagsWithHttpInfo (List<string> tags);
         /// <summary>
         /// Find pet by ID
         /// </summary>
         /// <remarks>
-        /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// Returns a single pet
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <param name="petId">ID of pet to return</param>
         /// <returns>Pet</returns>
         Pet GetPetById (long? petId);
 
@@ -137,64 +115,22 @@ namespace IO.Swagger.Api
         /// Find pet by ID
         /// </summary>
         /// <remarks>
-        /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// Returns a single pet
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <param name="petId">ID of pet to return</param>
         /// <returns>ApiResponse of Pet</returns>
         ApiResponse<Pet> GetPetByIdWithHttpInfo (long? petId);
         /// <summary>
-        /// Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
-        /// </summary>
-        /// <remarks>
-        /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-        /// </remarks>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
-        /// <returns>InlineResponse200</returns>
-        InlineResponse200 GetPetByIdInObject (long? petId);
-
-        /// <summary>
-        /// Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
-        /// </summary>
-        /// <remarks>
-        /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-        /// </remarks>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
-        /// <returns>ApiResponse of InlineResponse200</returns>
-        ApiResponse<InlineResponse200> GetPetByIdInObjectWithHttpInfo (long? petId);
-        /// <summary>
-        /// Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
-        /// </summary>
-        /// <remarks>
-        /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-        /// </remarks>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
-        /// <returns>byte[]</returns>
-        byte[] PetPetIdtestingByteArraytrueGet (long? petId);
-
-        /// <summary>
-        /// Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
-        /// </summary>
-        /// <remarks>
-        /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-        /// </remarks>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
-        /// <returns>ApiResponse of byte[]</returns>
-        ApiResponse<byte[]> PetPetIdtestingByteArraytrueGetWithHttpInfo (long? petId);
-        /// <summary>
         /// Update an existing pet
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Pet object that needs to be added to the store (optional)</param>
+        /// <param name="body">Pet object that needs to be added to the store</param>
         /// <returns></returns>
-        void UpdatePet (Pet body = null);
+        void UpdatePet (Pet body);
 
         /// <summary>
         /// Update an existing pet
@@ -203,9 +139,9 @@ namespace IO.Swagger.Api
         /// 
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Pet object that needs to be added to the store (optional)</param>
+        /// <param name="body">Pet object that needs to be added to the store</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> UpdatePetWithHttpInfo (Pet body = null);
+        ApiResponse<Object> UpdatePetWithHttpInfo (Pet body);
         /// <summary>
         /// Updates a pet in the store with form data
         /// </summary>
@@ -217,7 +153,7 @@ namespace IO.Swagger.Api
         /// <param name="name">Updated name of the pet (optional)</param>
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <returns></returns>
-        void UpdatePetWithForm (string petId, string name = null, string status = null);
+        void UpdatePetWithForm (long? petId, string name = null, string status = null);
 
         /// <summary>
         /// Updates a pet in the store with form data
@@ -230,7 +166,7 @@ namespace IO.Swagger.Api
         /// <param name="name">Updated name of the pet (optional)</param>
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> UpdatePetWithFormWithHttpInfo (string petId, string name = null, string status = null);
+        ApiResponse<Object> UpdatePetWithFormWithHttpInfo (long? petId, string name = null, string status = null);
         /// <summary>
         /// uploads an image
         /// </summary>
@@ -241,8 +177,8 @@ namespace IO.Swagger.Api
         /// <param name="petId">ID of pet to update</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="file">file to upload (optional)</param>
-        /// <returns></returns>
-        void UploadFile (long? petId, string additionalMetadata = null, Stream file = null);
+        /// <returns>ApiResponse</returns>
+        ApiResponse UploadFile (long? petId, string additionalMetadata = null, System.IO.Stream file = null);
 
         /// <summary>
         /// uploads an image
@@ -254,8 +190,8 @@ namespace IO.Swagger.Api
         /// <param name="petId">ID of pet to update</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="file">file to upload (optional)</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> UploadFileWithHttpInfo (long? petId, string additionalMetadata = null, Stream file = null);
+        /// <returns>ApiResponse of ApiResponse</returns>
+        ApiResponse<ApiResponse> UploadFileWithHttpInfo (long? petId, string additionalMetadata = null, System.IO.Stream file = null);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
@@ -265,9 +201,9 @@ namespace IO.Swagger.Api
         /// 
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Pet object that needs to be added to the store (optional)</param>
+        /// <param name="body">Pet object that needs to be added to the store</param>
         /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task AddPetAsync (Pet body = null);
+        System.Threading.Tasks.Task AddPetAsync (Pet body);
 
         /// <summary>
         /// Add a new pet to the store
@@ -276,30 +212,9 @@ namespace IO.Swagger.Api
         /// 
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Pet object that needs to be added to the store (optional)</param>
+        /// <param name="body">Pet object that needs to be added to the store</param>
         /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> AddPetAsyncWithHttpInfo (Pet body = null);
-        /// <summary>
-        /// Fake endpoint to test byte array in body parameter for adding a new pet to the store
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Pet object in the form of byte array (optional)</param>
-        /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task AddPetUsingByteArrayAsync (byte[] body = null);
-
-        /// <summary>
-        /// Fake endpoint to test byte array in body parameter for adding a new pet to the store
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Pet object in the form of byte array (optional)</param>
-        /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> AddPetUsingByteArrayAsyncWithHttpInfo (byte[] body = null);
+        System.Threading.Tasks.Task<ApiResponse<Object>> AddPetAsyncWithHttpInfo (Pet body);
         /// <summary>
         /// Deletes a pet
         /// </summary>
@@ -330,9 +245,9 @@ namespace IO.Swagger.Api
         /// Multiple status values can be provided with comma separated strings
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="status">Status values that need to be considered for query (optional, default to available)</param>
+        /// <param name="status">Status values that need to be considered for filter</param>
         /// <returns>Task of List&lt;Pet&gt;</returns>
-        System.Threading.Tasks.Task<List<Pet>> FindPetsByStatusAsync (List<string> status = null);
+        System.Threading.Tasks.Task<List<Pet>> FindPetsByStatusAsync (List<string> status);
 
         /// <summary>
         /// Finds Pets by status
@@ -341,38 +256,38 @@ namespace IO.Swagger.Api
         /// Multiple status values can be provided with comma separated strings
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="status">Status values that need to be considered for query (optional, default to available)</param>
+        /// <param name="status">Status values that need to be considered for filter</param>
         /// <returns>Task of ApiResponse (List&lt;Pet&gt;)</returns>
-        System.Threading.Tasks.Task<ApiResponse<List<Pet>>> FindPetsByStatusAsyncWithHttpInfo (List<string> status = null);
+        System.Threading.Tasks.Task<ApiResponse<List<Pet>>> FindPetsByStatusAsyncWithHttpInfo (List<string> status);
         /// <summary>
         /// Finds Pets by tags
         /// </summary>
         /// <remarks>
-        /// Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+        /// Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="tags">Tags to filter by (optional)</param>
+        /// <param name="tags">Tags to filter by</param>
         /// <returns>Task of List&lt;Pet&gt;</returns>
-        System.Threading.Tasks.Task<List<Pet>> FindPetsByTagsAsync (List<string> tags = null);
+        System.Threading.Tasks.Task<List<Pet>> FindPetsByTagsAsync (List<string> tags);
 
         /// <summary>
         /// Finds Pets by tags
         /// </summary>
         /// <remarks>
-        /// Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+        /// Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="tags">Tags to filter by (optional)</param>
+        /// <param name="tags">Tags to filter by</param>
         /// <returns>Task of ApiResponse (List&lt;Pet&gt;)</returns>
-        System.Threading.Tasks.Task<ApiResponse<List<Pet>>> FindPetsByTagsAsyncWithHttpInfo (List<string> tags = null);
+        System.Threading.Tasks.Task<ApiResponse<List<Pet>>> FindPetsByTagsAsyncWithHttpInfo (List<string> tags);
         /// <summary>
         /// Find pet by ID
         /// </summary>
         /// <remarks>
-        /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// Returns a single pet
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <param name="petId">ID of pet to return</param>
         /// <returns>Task of Pet</returns>
         System.Threading.Tasks.Task<Pet> GetPetByIdAsync (long? petId);
 
@@ -380,64 +295,22 @@ namespace IO.Swagger.Api
         /// Find pet by ID
         /// </summary>
         /// <remarks>
-        /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// Returns a single pet
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <param name="petId">ID of pet to return</param>
         /// <returns>Task of ApiResponse (Pet)</returns>
         System.Threading.Tasks.Task<ApiResponse<Pet>> GetPetByIdAsyncWithHttpInfo (long? petId);
         /// <summary>
-        /// Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
-        /// </summary>
-        /// <remarks>
-        /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-        /// </remarks>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
-        /// <returns>Task of InlineResponse200</returns>
-        System.Threading.Tasks.Task<InlineResponse200> GetPetByIdInObjectAsync (long? petId);
-
-        /// <summary>
-        /// Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
-        /// </summary>
-        /// <remarks>
-        /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-        /// </remarks>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
-        /// <returns>Task of ApiResponse (InlineResponse200)</returns>
-        System.Threading.Tasks.Task<ApiResponse<InlineResponse200>> GetPetByIdInObjectAsyncWithHttpInfo (long? petId);
-        /// <summary>
-        /// Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
-        /// </summary>
-        /// <remarks>
-        /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-        /// </remarks>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
-        /// <returns>Task of byte[]</returns>
-        System.Threading.Tasks.Task<byte[]> PetPetIdtestingByteArraytrueGetAsync (long? petId);
-
-        /// <summary>
-        /// Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
-        /// </summary>
-        /// <remarks>
-        /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-        /// </remarks>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
-        /// <returns>Task of ApiResponse (byte[])</returns>
-        System.Threading.Tasks.Task<ApiResponse<byte[]>> PetPetIdtestingByteArraytrueGetAsyncWithHttpInfo (long? petId);
-        /// <summary>
         /// Update an existing pet
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Pet object that needs to be added to the store (optional)</param>
+        /// <param name="body">Pet object that needs to be added to the store</param>
         /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task UpdatePetAsync (Pet body = null);
+        System.Threading.Tasks.Task UpdatePetAsync (Pet body);
 
         /// <summary>
         /// Update an existing pet
@@ -446,9 +319,9 @@ namespace IO.Swagger.Api
         /// 
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Pet object that needs to be added to the store (optional)</param>
+        /// <param name="body">Pet object that needs to be added to the store</param>
         /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> UpdatePetAsyncWithHttpInfo (Pet body = null);
+        System.Threading.Tasks.Task<ApiResponse<Object>> UpdatePetAsyncWithHttpInfo (Pet body);
         /// <summary>
         /// Updates a pet in the store with form data
         /// </summary>
@@ -460,7 +333,7 @@ namespace IO.Swagger.Api
         /// <param name="name">Updated name of the pet (optional)</param>
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task UpdatePetWithFormAsync (string petId, string name = null, string status = null);
+        System.Threading.Tasks.Task UpdatePetWithFormAsync (long? petId, string name = null, string status = null);
 
         /// <summary>
         /// Updates a pet in the store with form data
@@ -473,20 +346,7 @@ namespace IO.Swagger.Api
         /// <param name="name">Updated name of the pet (optional)</param>
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> UpdatePetWithFormAsyncWithHttpInfo (string petId, string name = null, string status = null);
-        /// <summary>
-        /// uploads an image
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet to update</param>
-        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
-        /// <param name="file">file to upload (optional)</param>
-        /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task UploadFileAsync (long? petId, string additionalMetadata = null, Stream file = null);
-
+        System.Threading.Tasks.Task<ApiResponse<Object>> UpdatePetWithFormAsyncWithHttpInfo (long? petId, string name = null, string status = null);
         /// <summary>
         /// uploads an image
         /// </summary>
@@ -498,7 +358,20 @@ namespace IO.Swagger.Api
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="file">file to upload (optional)</param>
         /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> UploadFileAsyncWithHttpInfo (long? petId, string additionalMetadata = null, Stream file = null);
+        System.Threading.Tasks.Task<ApiResponse> UploadFileAsync (long? petId, string additionalMetadata = null, System.IO.Stream file = null);
+
+        /// <summary>
+        /// uploads an image
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet to update</param>
+        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
+        /// <returns>Task of ApiResponse (ApiResponse)</returns>
+        System.Threading.Tasks.Task<ApiResponse<ApiResponse>> UploadFileAsyncWithHttpInfo (long? petId, string additionalMetadata = null, System.IO.Stream file = null);
         #endregion Asynchronous Operations
     }
 
@@ -593,9 +466,9 @@ namespace IO.Swagger.Api
         /// Add a new pet to the store 
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Pet object that needs to be added to the store (optional)</param>
+        /// <param name="body">Pet object that needs to be added to the store</param>
         /// <returns></returns>
-        public void AddPet (Pet body = null)
+        public void AddPet (Pet body)
         {
              AddPetWithHttpInfo(body);
         }
@@ -604,14 +477,15 @@ namespace IO.Swagger.Api
         /// Add a new pet to the store 
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Pet object that needs to be added to the store (optional)</param>
+        /// <param name="body">Pet object that needs to be added to the store</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> AddPetWithHttpInfo (Pet body = null)
+        public ApiResponse<Object> AddPetWithHttpInfo (Pet body)
         {
-            
+            // verify the required parameter 'body' is set
+            if (body == null)
+                throw new ApiException(400, "Missing required parameter 'body' when calling PetApi->AddPet");
 
             var localVarPath = "/pet";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -621,13 +495,15 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                "application/json", "application/xml"
+                "application/json", 
+                "application/xml"
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -636,7 +512,7 @@ namespace IO.Swagger.Api
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
-                                                            if (body.GetType() != typeof(byte[]))
+            if (body.GetType() != typeof(byte[]))
             {
                 localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
             }
@@ -646,7 +522,6 @@ namespace IO.Swagger.Api
             }
 
             // authentication (petstore_auth) required
-            
             // oauth required
             if (!String.IsNullOrEmpty(Configuration.AccessToken))
             {
@@ -675,9 +550,9 @@ namespace IO.Swagger.Api
         /// Add a new pet to the store 
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Pet object that needs to be added to the store (optional)</param>
+        /// <param name="body">Pet object that needs to be added to the store</param>
         /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task AddPetAsync (Pet body = null)
+        public async System.Threading.Tasks.Task AddPetAsync (Pet body)
         {
              await AddPetAsyncWithHttpInfo(body);
 
@@ -687,14 +562,15 @@ namespace IO.Swagger.Api
         /// Add a new pet to the store 
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Pet object that needs to be added to the store (optional)</param>
+        /// <param name="body">Pet object that needs to be added to the store</param>
         /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> AddPetAsyncWithHttpInfo (Pet body = null)
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> AddPetAsyncWithHttpInfo (Pet body)
         {
-            
+            // verify the required parameter 'body' is set
+            if (body == null)
+                throw new ApiException(400, "Missing required parameter 'body' when calling PetApi->AddPet");
 
             var localVarPath = "/pet";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -704,13 +580,15 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                "application/json", "application/xml"
+                "application/json", 
+                "application/xml"
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -719,7 +597,7 @@ namespace IO.Swagger.Api
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
-                                                            if (body.GetType() != typeof(byte[]))
+            if (body.GetType() != typeof(byte[]))
             {
                 localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
             }
@@ -729,7 +607,6 @@ namespace IO.Swagger.Api
             }
 
             // authentication (petstore_auth) required
-            
             // oauth required
             if (!String.IsNullOrEmpty(Configuration.AccessToken))
             {
@@ -753,170 +630,7 @@ namespace IO.Swagger.Api
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
-        /// <summary>
-        /// Fake endpoint to test byte array in body parameter for adding a new pet to the store 
-        /// </summary>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Pet object in the form of byte array (optional)</param>
-        /// <returns></returns>
-        public void AddPetUsingByteArray (byte[] body = null)
-        {
-             AddPetUsingByteArrayWithHttpInfo(body);
-        }
 
-        /// <summary>
-        /// Fake endpoint to test byte array in body parameter for adding a new pet to the store 
-        /// </summary>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Pet object in the form of byte array (optional)</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> AddPetUsingByteArrayWithHttpInfo (byte[] body = null)
-        {
-            
-
-            var localVarPath = "/pet?testing_byte_array&#x3D;true";
-
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new Dictionary<String, String>();
-            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                "application/json", "application/xml"
-            };
-            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            localVarPathParams.Add("format", "json");
-                                                            if (body.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = body; // byte array
-            }
-
-            // authentication (petstore_auth) required
-            
-            // oauth required
-            if (!String.IsNullOrEmpty(Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling AddPetUsingByteArray: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling AddPetUsingByteArray: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
-
-            
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
-        }
-
-        /// <summary>
-        /// Fake endpoint to test byte array in body parameter for adding a new pet to the store 
-        /// </summary>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Pet object in the form of byte array (optional)</param>
-        /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task AddPetUsingByteArrayAsync (byte[] body = null)
-        {
-             await AddPetUsingByteArrayAsyncWithHttpInfo(body);
-
-        }
-
-        /// <summary>
-        /// Fake endpoint to test byte array in body parameter for adding a new pet to the store 
-        /// </summary>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Pet object in the form of byte array (optional)</param>
-        /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> AddPetUsingByteArrayAsyncWithHttpInfo (byte[] body = null)
-        {
-            
-
-            var localVarPath = "/pet?testing_byte_array&#x3D;true";
-
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new Dictionary<String, String>();
-            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                "application/json", "application/xml"
-            };
-            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            localVarPathParams.Add("format", "json");
-                                                            if (body.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = body; // byte array
-            }
-
-            // authentication (petstore_auth) required
-            
-            // oauth required
-            if (!String.IsNullOrEmpty(Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling AddPetUsingByteArray: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling AddPetUsingByteArray: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
-
-            
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
-        }
         /// <summary>
         /// Deletes a pet 
         /// </summary>
@@ -938,14 +652,11 @@ namespace IO.Swagger.Api
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> DeletePetWithHttpInfo (long? petId, string apiKey = null)
         {
-            
             // verify the required parameter 'petId' is set
             if (petId == null)
                 throw new ApiException(400, "Missing required parameter 'petId' when calling PetApi->DeletePet");
-            
 
             var localVarPath = "/pet/{petId}";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -955,13 +666,13 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -971,11 +682,9 @@ namespace IO.Swagger.Api
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
             if (petId != null) localVarPathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
-                        if (apiKey != null) localVarHeaderParams.Add("api_key", Configuration.ApiClient.ParameterToString(apiKey)); // header parameter
-                        
+            if (apiKey != null) localVarHeaderParams.Add("api_key", Configuration.ApiClient.ParameterToString(apiKey)); // header parameter
 
             // authentication (petstore_auth) required
-            
             // oauth required
             if (!String.IsNullOrEmpty(Configuration.AccessToken))
             {
@@ -1023,11 +732,10 @@ namespace IO.Swagger.Api
         public async System.Threading.Tasks.Task<ApiResponse<Object>> DeletePetAsyncWithHttpInfo (long? petId, string apiKey = null)
         {
             // verify the required parameter 'petId' is set
-            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling DeletePet");
-            
+            if (petId == null)
+                throw new ApiException(400, "Missing required parameter 'petId' when calling PetApi->DeletePet");
 
             var localVarPath = "/pet/{petId}";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -1037,13 +745,13 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -1053,11 +761,9 @@ namespace IO.Swagger.Api
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
             if (petId != null) localVarPathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
-                        if (apiKey != null) localVarHeaderParams.Add("api_key", Configuration.ApiClient.ParameterToString(apiKey)); // header parameter
-                        
+            if (apiKey != null) localVarHeaderParams.Add("api_key", Configuration.ApiClient.ParameterToString(apiKey)); // header parameter
 
             // authentication (petstore_auth) required
-            
             // oauth required
             if (!String.IsNullOrEmpty(Configuration.AccessToken))
             {
@@ -1081,13 +787,14 @@ namespace IO.Swagger.Api
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
+
         /// <summary>
         /// Finds Pets by status Multiple status values can be provided with comma separated strings
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="status">Status values that need to be considered for query (optional, default to available)</param>
+        /// <param name="status">Status values that need to be considered for filter</param>
         /// <returns>List&lt;Pet&gt;</returns>
-        public List<Pet> FindPetsByStatus (List<string> status = null)
+        public List<Pet> FindPetsByStatus (List<string> status)
         {
              ApiResponse<List<Pet>> localVarResponse = FindPetsByStatusWithHttpInfo(status);
              return localVarResponse.Data;
@@ -1097,14 +804,15 @@ namespace IO.Swagger.Api
         /// Finds Pets by status Multiple status values can be provided with comma separated strings
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="status">Status values that need to be considered for query (optional, default to available)</param>
+        /// <param name="status">Status values that need to be considered for filter</param>
         /// <returns>ApiResponse of List&lt;Pet&gt;</returns>
-        public ApiResponse< List<Pet> > FindPetsByStatusWithHttpInfo (List<string> status = null)
+        public ApiResponse< List<Pet> > FindPetsByStatusWithHttpInfo (List<string> status)
         {
-            
+            // verify the required parameter 'status' is set
+            if (status == null)
+                throw new ApiException(400, "Missing required parameter 'status' when calling PetApi->FindPetsByStatus");
 
             var localVarPath = "/pet/findByStatus";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -1114,13 +822,13 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -1129,11 +837,9 @@ namespace IO.Swagger.Api
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
-                        if (status != null) localVarQueryParams.Add("status", Configuration.ApiClient.ParameterToString(status)); // query parameter
-                                    
+            if (status != null) localVarQueryParams.Add("status", Configuration.ApiClient.ParameterToString(status)); // query parameter
 
             // authentication (petstore_auth) required
-            
             // oauth required
             if (!String.IsNullOrEmpty(Configuration.AccessToken))
             {
@@ -1162,9 +868,9 @@ namespace IO.Swagger.Api
         /// Finds Pets by status Multiple status values can be provided with comma separated strings
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="status">Status values that need to be considered for query (optional, default to available)</param>
+        /// <param name="status">Status values that need to be considered for filter</param>
         /// <returns>Task of List&lt;Pet&gt;</returns>
-        public async System.Threading.Tasks.Task<List<Pet>> FindPetsByStatusAsync (List<string> status = null)
+        public async System.Threading.Tasks.Task<List<Pet>> FindPetsByStatusAsync (List<string> status)
         {
              ApiResponse<List<Pet>> localVarResponse = await FindPetsByStatusAsyncWithHttpInfo(status);
              return localVarResponse.Data;
@@ -1175,14 +881,15 @@ namespace IO.Swagger.Api
         /// Finds Pets by status Multiple status values can be provided with comma separated strings
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="status">Status values that need to be considered for query (optional, default to available)</param>
+        /// <param name="status">Status values that need to be considered for filter</param>
         /// <returns>Task of ApiResponse (List&lt;Pet&gt;)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<List<Pet>>> FindPetsByStatusAsyncWithHttpInfo (List<string> status = null)
+        public async System.Threading.Tasks.Task<ApiResponse<List<Pet>>> FindPetsByStatusAsyncWithHttpInfo (List<string> status)
         {
-            
+            // verify the required parameter 'status' is set
+            if (status == null)
+                throw new ApiException(400, "Missing required parameter 'status' when calling PetApi->FindPetsByStatus");
 
             var localVarPath = "/pet/findByStatus";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -1192,13 +899,13 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -1207,11 +914,9 @@ namespace IO.Swagger.Api
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
-                        if (status != null) localVarQueryParams.Add("status", Configuration.ApiClient.ParameterToString(status)); // query parameter
-                                    
+            if (status != null) localVarQueryParams.Add("status", Configuration.ApiClient.ParameterToString(status)); // query parameter
 
             // authentication (petstore_auth) required
-            
             // oauth required
             if (!String.IsNullOrEmpty(Configuration.AccessToken))
             {
@@ -1235,30 +940,32 @@ namespace IO.Swagger.Api
                 (List<Pet>) Configuration.ApiClient.Deserialize(localVarResponse, typeof(List<Pet>)));
             
         }
+
         /// <summary>
-        /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+        /// Finds Pets by tags Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="tags">Tags to filter by (optional)</param>
+        /// <param name="tags">Tags to filter by</param>
         /// <returns>List&lt;Pet&gt;</returns>
-        public List<Pet> FindPetsByTags (List<string> tags = null)
+        public List<Pet> FindPetsByTags (List<string> tags)
         {
              ApiResponse<List<Pet>> localVarResponse = FindPetsByTagsWithHttpInfo(tags);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+        /// Finds Pets by tags Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="tags">Tags to filter by (optional)</param>
+        /// <param name="tags">Tags to filter by</param>
         /// <returns>ApiResponse of List&lt;Pet&gt;</returns>
-        public ApiResponse< List<Pet> > FindPetsByTagsWithHttpInfo (List<string> tags = null)
+        public ApiResponse< List<Pet> > FindPetsByTagsWithHttpInfo (List<string> tags)
         {
-            
+            // verify the required parameter 'tags' is set
+            if (tags == null)
+                throw new ApiException(400, "Missing required parameter 'tags' when calling PetApi->FindPetsByTags");
 
             var localVarPath = "/pet/findByTags";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -1268,13 +975,13 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -1283,11 +990,9 @@ namespace IO.Swagger.Api
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
-                        if (tags != null) localVarQueryParams.Add("tags", Configuration.ApiClient.ParameterToString(tags)); // query parameter
-                                    
+            if (tags != null) localVarQueryParams.Add("tags", Configuration.ApiClient.ParameterToString(tags)); // query parameter
 
             // authentication (petstore_auth) required
-            
             // oauth required
             if (!String.IsNullOrEmpty(Configuration.AccessToken))
             {
@@ -1313,12 +1018,12 @@ namespace IO.Swagger.Api
         }
 
         /// <summary>
-        /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+        /// Finds Pets by tags Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="tags">Tags to filter by (optional)</param>
+        /// <param name="tags">Tags to filter by</param>
         /// <returns>Task of List&lt;Pet&gt;</returns>
-        public async System.Threading.Tasks.Task<List<Pet>> FindPetsByTagsAsync (List<string> tags = null)
+        public async System.Threading.Tasks.Task<List<Pet>> FindPetsByTagsAsync (List<string> tags)
         {
              ApiResponse<List<Pet>> localVarResponse = await FindPetsByTagsAsyncWithHttpInfo(tags);
              return localVarResponse.Data;
@@ -1326,17 +1031,18 @@ namespace IO.Swagger.Api
         }
 
         /// <summary>
-        /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+        /// Finds Pets by tags Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="tags">Tags to filter by (optional)</param>
+        /// <param name="tags">Tags to filter by</param>
         /// <returns>Task of ApiResponse (List&lt;Pet&gt;)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<List<Pet>>> FindPetsByTagsAsyncWithHttpInfo (List<string> tags = null)
+        public async System.Threading.Tasks.Task<ApiResponse<List<Pet>>> FindPetsByTagsAsyncWithHttpInfo (List<string> tags)
         {
-            
+            // verify the required parameter 'tags' is set
+            if (tags == null)
+                throw new ApiException(400, "Missing required parameter 'tags' when calling PetApi->FindPetsByTags");
 
             var localVarPath = "/pet/findByTags";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -1346,13 +1052,13 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -1361,11 +1067,9 @@ namespace IO.Swagger.Api
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
-                        if (tags != null) localVarQueryParams.Add("tags", Configuration.ApiClient.ParameterToString(tags)); // query parameter
-                                    
+            if (tags != null) localVarQueryParams.Add("tags", Configuration.ApiClient.ParameterToString(tags)); // query parameter
 
             // authentication (petstore_auth) required
-            
             // oauth required
             if (!String.IsNullOrEmpty(Configuration.AccessToken))
             {
@@ -1389,11 +1093,12 @@ namespace IO.Swagger.Api
                 (List<Pet>) Configuration.ApiClient.Deserialize(localVarResponse, typeof(List<Pet>)));
             
         }
+
         /// <summary>
-        /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// Find pet by ID Returns a single pet
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <param name="petId">ID of pet to return</param>
         /// <returns>Pet</returns>
         public Pet GetPetById (long? petId)
         {
@@ -1402,21 +1107,18 @@ namespace IO.Swagger.Api
         }
 
         /// <summary>
-        /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// Find pet by ID Returns a single pet
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <param name="petId">ID of pet to return</param>
         /// <returns>ApiResponse of Pet</returns>
         public ApiResponse< Pet > GetPetByIdWithHttpInfo (long? petId)
         {
-            
             // verify the required parameter 'petId' is set
             if (petId == null)
                 throw new ApiException(400, "Missing required parameter 'petId' when calling PetApi->GetPetById");
-            
 
             var localVarPath = "/pet/{petId}";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -1426,13 +1128,13 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -1442,21 +1144,13 @@ namespace IO.Swagger.Api
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
             if (petId != null) localVarPathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
-                                                
 
             // authentication (api_key) required
-            
             if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("api_key")))
             {
                 localVarHeaderParams["api_key"] = Configuration.GetApiKeyWithPrefix("api_key");
             }
-// authentication (petstore_auth) required
-            
-            // oauth required
-            if (!String.IsNullOrEmpty(Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
-            }
+
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath,
@@ -1477,10 +1171,10 @@ namespace IO.Swagger.Api
         }
 
         /// <summary>
-        /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// Find pet by ID Returns a single pet
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <param name="petId">ID of pet to return</param>
         /// <returns>Task of Pet</returns>
         public async System.Threading.Tasks.Task<Pet> GetPetByIdAsync (long? petId)
         {
@@ -1490,19 +1184,18 @@ namespace IO.Swagger.Api
         }
 
         /// <summary>
-        /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// Find pet by ID Returns a single pet
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <param name="petId">ID of pet to return</param>
         /// <returns>Task of ApiResponse (Pet)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Pet>> GetPetByIdAsyncWithHttpInfo (long? petId)
         {
             // verify the required parameter 'petId' is set
-            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling GetPetById");
-            
+            if (petId == null)
+                throw new ApiException(400, "Missing required parameter 'petId' when calling PetApi->GetPetById");
 
             var localVarPath = "/pet/{petId}";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -1512,13 +1205,13 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -1528,21 +1221,12 @@ namespace IO.Swagger.Api
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
             if (petId != null) localVarPathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
-                                                
 
             // authentication (api_key) required
-            
             if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("api_key")))
             {
                 localVarHeaderParams["api_key"] = Configuration.GetApiKeyWithPrefix("api_key");
             }
-            // authentication (petstore_auth) required
-            
-            // oauth required
-            if (!String.IsNullOrEmpty(Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
-            }
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath,
@@ -1561,357 +1245,14 @@ namespace IO.Swagger.Api
                 (Pet) Configuration.ApiClient.Deserialize(localVarResponse, typeof(Pet)));
             
         }
-        /// <summary>
-        /// Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39; Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-        /// </summary>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
-        /// <returns>InlineResponse200</returns>
-        public InlineResponse200 GetPetByIdInObject (long? petId)
-        {
-             ApiResponse<InlineResponse200> localVarResponse = GetPetByIdInObjectWithHttpInfo(petId);
-             return localVarResponse.Data;
-        }
 
-        /// <summary>
-        /// Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39; Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-        /// </summary>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
-        /// <returns>ApiResponse of InlineResponse200</returns>
-        public ApiResponse< InlineResponse200 > GetPetByIdInObjectWithHttpInfo (long? petId)
-        {
-            
-            // verify the required parameter 'petId' is set
-            if (petId == null)
-                throw new ApiException(400, "Missing required parameter 'petId' when calling PetApi->GetPetByIdInObject");
-            
-
-            var localVarPath = "/pet/{petId}?response&#x3D;inline_arbitrary_object";
-
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new Dictionary<String, String>();
-            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                
-            };
-            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            localVarPathParams.Add("format", "json");
-            if (petId != null) localVarPathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
-                                                
-
-            // authentication (api_key) required
-            
-            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("api_key")))
-            {
-                localVarHeaderParams["api_key"] = Configuration.GetApiKeyWithPrefix("api_key");
-            }
-// authentication (petstore_auth) required
-            
-            // oauth required
-            if (!String.IsNullOrEmpty(Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling GetPetByIdInObject: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling GetPetByIdInObject: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
-
-            return new ApiResponse<InlineResponse200>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (InlineResponse200) Configuration.ApiClient.Deserialize(localVarResponse, typeof(InlineResponse200)));
-            
-        }
-
-        /// <summary>
-        /// Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39; Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-        /// </summary>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
-        /// <returns>Task of InlineResponse200</returns>
-        public async System.Threading.Tasks.Task<InlineResponse200> GetPetByIdInObjectAsync (long? petId)
-        {
-             ApiResponse<InlineResponse200> localVarResponse = await GetPetByIdInObjectAsyncWithHttpInfo(petId);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39; Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-        /// </summary>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
-        /// <returns>Task of ApiResponse (InlineResponse200)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<InlineResponse200>> GetPetByIdInObjectAsyncWithHttpInfo (long? petId)
-        {
-            // verify the required parameter 'petId' is set
-            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling GetPetByIdInObject");
-            
-
-            var localVarPath = "/pet/{petId}?response&#x3D;inline_arbitrary_object";
-
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new Dictionary<String, String>();
-            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                
-            };
-            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            localVarPathParams.Add("format", "json");
-            if (petId != null) localVarPathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
-                                                
-
-            // authentication (api_key) required
-            
-            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("api_key")))
-            {
-                localVarHeaderParams["api_key"] = Configuration.GetApiKeyWithPrefix("api_key");
-            }
-            // authentication (petstore_auth) required
-            
-            // oauth required
-            if (!String.IsNullOrEmpty(Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling GetPetByIdInObject: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling GetPetByIdInObject: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
-
-            return new ApiResponse<InlineResponse200>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (InlineResponse200) Configuration.ApiClient.Deserialize(localVarResponse, typeof(InlineResponse200)));
-            
-        }
-        /// <summary>
-        /// Fake endpoint to test byte array return by &#39;Find pet by ID&#39; Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-        /// </summary>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
-        /// <returns>byte[]</returns>
-        public byte[] PetPetIdtestingByteArraytrueGet (long? petId)
-        {
-             ApiResponse<byte[]> localVarResponse = PetPetIdtestingByteArraytrueGetWithHttpInfo(petId);
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        /// Fake endpoint to test byte array return by &#39;Find pet by ID&#39; Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-        /// </summary>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
-        /// <returns>ApiResponse of byte[]</returns>
-        public ApiResponse< byte[] > PetPetIdtestingByteArraytrueGetWithHttpInfo (long? petId)
-        {
-            
-            // verify the required parameter 'petId' is set
-            if (petId == null)
-                throw new ApiException(400, "Missing required parameter 'petId' when calling PetApi->PetPetIdtestingByteArraytrueGet");
-            
-
-            var localVarPath = "/pet/{petId}?testing_byte_array&#x3D;true";
-
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new Dictionary<String, String>();
-            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                
-            };
-            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            localVarPathParams.Add("format", "json");
-            if (petId != null) localVarPathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
-                                                
-
-            // authentication (api_key) required
-            
-            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("api_key")))
-            {
-                localVarHeaderParams["api_key"] = Configuration.GetApiKeyWithPrefix("api_key");
-            }
-// authentication (petstore_auth) required
-            
-            // oauth required
-            if (!String.IsNullOrEmpty(Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling PetPetIdtestingByteArraytrueGet: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling PetPetIdtestingByteArraytrueGet: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
-
-            return new ApiResponse<byte[]>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (byte[]) Configuration.ApiClient.Deserialize(localVarResponse, typeof(byte[])));
-            
-        }
-
-        /// <summary>
-        /// Fake endpoint to test byte array return by &#39;Find pet by ID&#39; Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-        /// </summary>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
-        /// <returns>Task of byte[]</returns>
-        public async System.Threading.Tasks.Task<byte[]> PetPetIdtestingByteArraytrueGetAsync (long? petId)
-        {
-             ApiResponse<byte[]> localVarResponse = await PetPetIdtestingByteArraytrueGetAsyncWithHttpInfo(petId);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// Fake endpoint to test byte array return by &#39;Find pet by ID&#39; Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-        /// </summary>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
-        /// <returns>Task of ApiResponse (byte[])</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<byte[]>> PetPetIdtestingByteArraytrueGetAsyncWithHttpInfo (long? petId)
-        {
-            // verify the required parameter 'petId' is set
-            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling PetPetIdtestingByteArraytrueGet");
-            
-
-            var localVarPath = "/pet/{petId}?testing_byte_array&#x3D;true";
-
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new Dictionary<String, String>();
-            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                
-            };
-            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            localVarPathParams.Add("format", "json");
-            if (petId != null) localVarPathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
-                                                
-
-            // authentication (api_key) required
-            
-            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("api_key")))
-            {
-                localVarHeaderParams["api_key"] = Configuration.GetApiKeyWithPrefix("api_key");
-            }
-            // authentication (petstore_auth) required
-            
-            // oauth required
-            if (!String.IsNullOrEmpty(Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling PetPetIdtestingByteArraytrueGet: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling PetPetIdtestingByteArraytrueGet: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
-
-            return new ApiResponse<byte[]>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (byte[]) Configuration.ApiClient.Deserialize(localVarResponse, typeof(byte[])));
-            
-        }
         /// <summary>
         /// Update an existing pet 
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Pet object that needs to be added to the store (optional)</param>
+        /// <param name="body">Pet object that needs to be added to the store</param>
         /// <returns></returns>
-        public void UpdatePet (Pet body = null)
+        public void UpdatePet (Pet body)
         {
              UpdatePetWithHttpInfo(body);
         }
@@ -1920,14 +1261,15 @@ namespace IO.Swagger.Api
         /// Update an existing pet 
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Pet object that needs to be added to the store (optional)</param>
+        /// <param name="body">Pet object that needs to be added to the store</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> UpdatePetWithHttpInfo (Pet body = null)
+        public ApiResponse<Object> UpdatePetWithHttpInfo (Pet body)
         {
-            
+            // verify the required parameter 'body' is set
+            if (body == null)
+                throw new ApiException(400, "Missing required parameter 'body' when calling PetApi->UpdatePet");
 
             var localVarPath = "/pet";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -1937,13 +1279,15 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                "application/json", "application/xml"
+                "application/json", 
+                "application/xml"
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -1952,7 +1296,7 @@ namespace IO.Swagger.Api
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
-                                                            if (body.GetType() != typeof(byte[]))
+            if (body.GetType() != typeof(byte[]))
             {
                 localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
             }
@@ -1962,7 +1306,6 @@ namespace IO.Swagger.Api
             }
 
             // authentication (petstore_auth) required
-            
             // oauth required
             if (!String.IsNullOrEmpty(Configuration.AccessToken))
             {
@@ -1991,9 +1334,9 @@ namespace IO.Swagger.Api
         /// Update an existing pet 
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Pet object that needs to be added to the store (optional)</param>
+        /// <param name="body">Pet object that needs to be added to the store</param>
         /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task UpdatePetAsync (Pet body = null)
+        public async System.Threading.Tasks.Task UpdatePetAsync (Pet body)
         {
              await UpdatePetAsyncWithHttpInfo(body);
 
@@ -2003,14 +1346,15 @@ namespace IO.Swagger.Api
         /// Update an existing pet 
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Pet object that needs to be added to the store (optional)</param>
+        /// <param name="body">Pet object that needs to be added to the store</param>
         /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdatePetAsyncWithHttpInfo (Pet body = null)
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdatePetAsyncWithHttpInfo (Pet body)
         {
-            
+            // verify the required parameter 'body' is set
+            if (body == null)
+                throw new ApiException(400, "Missing required parameter 'body' when calling PetApi->UpdatePet");
 
             var localVarPath = "/pet";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -2020,13 +1364,15 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                "application/json", "application/xml"
+                "application/json", 
+                "application/xml"
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -2035,7 +1381,7 @@ namespace IO.Swagger.Api
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
-                                                            if (body.GetType() != typeof(byte[]))
+            if (body.GetType() != typeof(byte[]))
             {
                 localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
             }
@@ -2045,7 +1391,6 @@ namespace IO.Swagger.Api
             }
 
             // authentication (petstore_auth) required
-            
             // oauth required
             if (!String.IsNullOrEmpty(Configuration.AccessToken))
             {
@@ -2069,6 +1414,7 @@ namespace IO.Swagger.Api
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
+
         /// <summary>
         /// Updates a pet in the store with form data 
         /// </summary>
@@ -2077,7 +1423,7 @@ namespace IO.Swagger.Api
         /// <param name="name">Updated name of the pet (optional)</param>
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <returns></returns>
-        public void UpdatePetWithForm (string petId, string name = null, string status = null)
+        public void UpdatePetWithForm (long? petId, string name = null, string status = null)
         {
              UpdatePetWithFormWithHttpInfo(petId, name, status);
         }
@@ -2090,16 +1436,13 @@ namespace IO.Swagger.Api
         /// <param name="name">Updated name of the pet (optional)</param>
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> UpdatePetWithFormWithHttpInfo (string petId, string name = null, string status = null)
+        public ApiResponse<Object> UpdatePetWithFormWithHttpInfo (long? petId, string name = null, string status = null)
         {
-            
             // verify the required parameter 'petId' is set
             if (petId == null)
                 throw new ApiException(400, "Missing required parameter 'petId' when calling PetApi->UpdatePetWithForm");
-            
 
             var localVarPath = "/pet/{petId}";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -2115,7 +1458,8 @@ namespace IO.Swagger.Api
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -2125,12 +1469,10 @@ namespace IO.Swagger.Api
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
             if (petId != null) localVarPathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
-                                    if (name != null) localVarFormParams.Add("name", Configuration.ApiClient.ParameterToString(name)); // form parameter
-if (status != null) localVarFormParams.Add("status", Configuration.ApiClient.ParameterToString(status)); // form parameter
-            
+            if (name != null) localVarFormParams.Add("name", Configuration.ApiClient.ParameterToString(name)); // form parameter
+            if (status != null) localVarFormParams.Add("status", Configuration.ApiClient.ParameterToString(status)); // form parameter
 
             // authentication (petstore_auth) required
-            
             // oauth required
             if (!String.IsNullOrEmpty(Configuration.AccessToken))
             {
@@ -2163,7 +1505,7 @@ if (status != null) localVarFormParams.Add("status", Configuration.ApiClient.Par
         /// <param name="name">Updated name of the pet (optional)</param>
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task UpdatePetWithFormAsync (string petId, string name = null, string status = null)
+        public async System.Threading.Tasks.Task UpdatePetWithFormAsync (long? petId, string name = null, string status = null)
         {
              await UpdatePetWithFormAsyncWithHttpInfo(petId, name, status);
 
@@ -2177,14 +1519,13 @@ if (status != null) localVarFormParams.Add("status", Configuration.ApiClient.Par
         /// <param name="name">Updated name of the pet (optional)</param>
         /// <param name="status">Updated status of the pet (optional)</param>
         /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdatePetWithFormAsyncWithHttpInfo (string petId, string name = null, string status = null)
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdatePetWithFormAsyncWithHttpInfo (long? petId, string name = null, string status = null)
         {
             // verify the required parameter 'petId' is set
-            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UpdatePetWithForm");
-            
+            if (petId == null)
+                throw new ApiException(400, "Missing required parameter 'petId' when calling PetApi->UpdatePetWithForm");
 
             var localVarPath = "/pet/{petId}";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -2200,7 +1541,8 @@ if (status != null) localVarFormParams.Add("status", Configuration.ApiClient.Par
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -2210,12 +1552,10 @@ if (status != null) localVarFormParams.Add("status", Configuration.ApiClient.Par
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
             if (petId != null) localVarPathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
-                                    if (name != null) localVarFormParams.Add("name", Configuration.ApiClient.ParameterToString(name)); // form parameter
-if (status != null) localVarFormParams.Add("status", Configuration.ApiClient.ParameterToString(status)); // form parameter
-            
+            if (name != null) localVarFormParams.Add("name", Configuration.ApiClient.ParameterToString(name)); // form parameter
+            if (status != null) localVarFormParams.Add("status", Configuration.ApiClient.ParameterToString(status)); // form parameter
 
             // authentication (petstore_auth) required
-            
             // oauth required
             if (!String.IsNullOrEmpty(Configuration.AccessToken))
             {
@@ -2239,6 +1579,7 @@ if (status != null) localVarFormParams.Add("status", Configuration.ApiClient.Par
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
+
         /// <summary>
         /// uploads an image 
         /// </summary>
@@ -2246,10 +1587,11 @@ if (status != null) localVarFormParams.Add("status", Configuration.ApiClient.Par
         /// <param name="petId">ID of pet to update</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="file">file to upload (optional)</param>
-        /// <returns></returns>
-        public void UploadFile (long? petId, string additionalMetadata = null, Stream file = null)
+        /// <returns>ApiResponse</returns>
+        public ApiResponse UploadFile (long? petId, string additionalMetadata = null, System.IO.Stream file = null)
         {
-             UploadFileWithHttpInfo(petId, additionalMetadata, file);
+             ApiResponse<ApiResponse> localVarResponse = UploadFileWithHttpInfo(petId, additionalMetadata, file);
+             return localVarResponse.Data;
         }
 
         /// <summary>
@@ -2259,17 +1601,14 @@ if (status != null) localVarFormParams.Add("status", Configuration.ApiClient.Par
         /// <param name="petId">ID of pet to update</param>
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="file">file to upload (optional)</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> UploadFileWithHttpInfo (long? petId, string additionalMetadata = null, Stream file = null)
+        /// <returns>ApiResponse of ApiResponse</returns>
+        public ApiResponse< ApiResponse > UploadFileWithHttpInfo (long? petId, string additionalMetadata = null, System.IO.Stream file = null)
         {
-            
             // verify the required parameter 'petId' is set
             if (petId == null)
                 throw new ApiException(400, "Missing required parameter 'petId' when calling PetApi->UploadFile");
-            
 
             var localVarPath = "/pet/{petId}/uploadImage";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -2285,7 +1624,7 @@ if (status != null) localVarFormParams.Add("status", Configuration.ApiClient.Par
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -2295,12 +1634,10 @@ if (status != null) localVarFormParams.Add("status", Configuration.ApiClient.Par
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
             if (petId != null) localVarPathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
-                                    if (additionalMetadata != null) localVarFormParams.Add("additionalMetadata", Configuration.ApiClient.ParameterToString(additionalMetadata)); // form parameter
-if (file != null) localVarFileParams.Add("file", Configuration.ApiClient.ParameterToFile("file", file));
-            
+            if (additionalMetadata != null) localVarFormParams.Add("additionalMetadata", Configuration.ApiClient.ParameterToString(additionalMetadata)); // form parameter
+            if (file != null) localVarFileParams.Add("file", Configuration.ApiClient.ParameterToFile("file", file));
 
             // authentication (petstore_auth) required
-            
             // oauth required
             if (!String.IsNullOrEmpty(Configuration.AccessToken))
             {
@@ -2319,24 +1656,10 @@ if (file != null) localVarFileParams.Add("file", Configuration.ApiClient.Paramet
             else if (localVarStatusCode == 0)
                 throw new ApiException (localVarStatusCode, "Error calling UploadFile: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
 
-            
-            return new ApiResponse<Object>(localVarStatusCode,
+            return new ApiResponse<ApiResponse>(localVarStatusCode,
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
-        }
-
-        /// <summary>
-        /// uploads an image 
-        /// </summary>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="petId">ID of pet to update</param>
-        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
-        /// <param name="file">file to upload (optional)</param>
-        /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task UploadFileAsync (long? petId, string additionalMetadata = null, Stream file = null)
-        {
-             await UploadFileAsyncWithHttpInfo(petId, additionalMetadata, file);
-
+                (ApiResponse) Configuration.ApiClient.Deserialize(localVarResponse, typeof(ApiResponse)));
+            
         }
 
         /// <summary>
@@ -2347,14 +1670,28 @@ if (file != null) localVarFileParams.Add("file", Configuration.ApiClient.Paramet
         /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
         /// <param name="file">file to upload (optional)</param>
         /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> UploadFileAsyncWithHttpInfo (long? petId, string additionalMetadata = null, Stream file = null)
+        public async System.Threading.Tasks.Task<ApiResponse> UploadFileAsync (long? petId, string additionalMetadata = null, System.IO.Stream file = null)
+        {
+             ApiResponse<ApiResponse> localVarResponse = await UploadFileAsyncWithHttpInfo(petId, additionalMetadata, file);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        /// uploads an image 
+        /// </summary>
+        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="petId">ID of pet to update</param>
+        /// <param name="additionalMetadata">Additional data to pass to server (optional)</param>
+        /// <param name="file">file to upload (optional)</param>
+        /// <returns>Task of ApiResponse (ApiResponse)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<ApiResponse>> UploadFileAsyncWithHttpInfo (long? petId, string additionalMetadata = null, System.IO.Stream file = null)
         {
             // verify the required parameter 'petId' is set
-            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UploadFile");
-            
+            if (petId == null)
+                throw new ApiException(400, "Missing required parameter 'petId' when calling PetApi->UploadFile");
 
             var localVarPath = "/pet/{petId}/uploadImage";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -2370,7 +1707,7 @@ if (file != null) localVarFileParams.Add("file", Configuration.ApiClient.Paramet
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -2380,12 +1717,10 @@ if (file != null) localVarFileParams.Add("file", Configuration.ApiClient.Paramet
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
             if (petId != null) localVarPathParams.Add("petId", Configuration.ApiClient.ParameterToString(petId)); // path parameter
-                                    if (additionalMetadata != null) localVarFormParams.Add("additionalMetadata", Configuration.ApiClient.ParameterToString(additionalMetadata)); // form parameter
-if (file != null) localVarFileParams.Add("file", Configuration.ApiClient.ParameterToFile("file", file));
-            
+            if (additionalMetadata != null) localVarFormParams.Add("additionalMetadata", Configuration.ApiClient.ParameterToString(additionalMetadata)); // form parameter
+            if (file != null) localVarFileParams.Add("file", Configuration.ApiClient.ParameterToFile("file", file));
 
             // authentication (petstore_auth) required
-            
             // oauth required
             if (!String.IsNullOrEmpty(Configuration.AccessToken))
             {
@@ -2404,10 +1739,11 @@ if (file != null) localVarFileParams.Add("file", Configuration.ApiClient.Paramet
             else if (localVarStatusCode == 0)
                 throw new ApiException (localVarStatusCode, "Error calling UploadFile: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
 
-            
-            return new ApiResponse<Object>(localVarStatusCode,
+            return new ApiResponse<ApiResponse>(localVarStatusCode,
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
+                (ApiResponse) Configuration.ApiClient.Deserialize(localVarResponse, typeof(ApiResponse)));
+            
         }
+
     }
 }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs
index bd611798c6c..a2c32ea3f7e 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs
@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
@@ -37,27 +36,6 @@ namespace IO.Swagger.Api
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> DeleteOrderWithHttpInfo (string orderId);
         /// <summary>
-        /// Finds orders by status
-        /// </summary>
-        /// <remarks>
-        /// A single status value can be provided as a string
-        /// </remarks>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="status">Status value that needs to be considered for query (optional, default to placed)</param>
-        /// <returns>List&lt;Order&gt;</returns>
-        List<Order> FindOrdersByStatus (string status = null);
-
-        /// <summary>
-        /// Finds orders by status
-        /// </summary>
-        /// <remarks>
-        /// A single status value can be provided as a string
-        /// </remarks>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="status">Status value that needs to be considered for query (optional, default to placed)</param>
-        /// <returns>ApiResponse of List&lt;Order&gt;</returns>
-        ApiResponse<List<Order>> FindOrdersByStatusWithHttpInfo (string status = null);
-        /// <summary>
         /// Returns pet inventories by status
         /// </summary>
         /// <remarks>
@@ -77,25 +55,6 @@ namespace IO.Swagger.Api
         /// <returns>ApiResponse of Dictionary&lt;string, int?&gt;</returns>
         ApiResponse<Dictionary<string, int?>> GetInventoryWithHttpInfo ();
         /// <summary>
-        /// Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
-        /// </summary>
-        /// <remarks>
-        /// Returns an arbitrary object which is actually a map of status codes to quantities
-        /// </remarks>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Object</returns>
-        Object GetInventoryInObject ();
-
-        /// <summary>
-        /// Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
-        /// </summary>
-        /// <remarks>
-        /// Returns an arbitrary object which is actually a map of status codes to quantities
-        /// </remarks>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>ApiResponse of Object</returns>
-        ApiResponse<Object> GetInventoryInObjectWithHttpInfo ();
-        /// <summary>
         /// Find purchase order by ID
         /// </summary>
         /// <remarks>
@@ -104,7 +63,7 @@ namespace IO.Swagger.Api
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <returns>Order</returns>
-        Order GetOrderById (string orderId);
+        Order GetOrderById (long? orderId);
 
         /// <summary>
         /// Find purchase order by ID
@@ -115,7 +74,7 @@ namespace IO.Swagger.Api
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <returns>ApiResponse of Order</returns>
-        ApiResponse<Order> GetOrderByIdWithHttpInfo (string orderId);
+        ApiResponse<Order> GetOrderByIdWithHttpInfo (long? orderId);
         /// <summary>
         /// Place an order for a pet
         /// </summary>
@@ -123,9 +82,9 @@ namespace IO.Swagger.Api
         /// 
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">order placed for purchasing the pet (optional)</param>
+        /// <param name="body">order placed for purchasing the pet</param>
         /// <returns>Order</returns>
-        Order PlaceOrder (Order body = null);
+        Order PlaceOrder (Order body);
 
         /// <summary>
         /// Place an order for a pet
@@ -134,9 +93,9 @@ namespace IO.Swagger.Api
         /// 
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">order placed for purchasing the pet (optional)</param>
+        /// <param name="body">order placed for purchasing the pet</param>
         /// <returns>ApiResponse of Order</returns>
-        ApiResponse<Order> PlaceOrderWithHttpInfo (Order body = null);
+        ApiResponse<Order> PlaceOrderWithHttpInfo (Order body);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
@@ -161,27 +120,6 @@ namespace IO.Swagger.Api
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> DeleteOrderAsyncWithHttpInfo (string orderId);
         /// <summary>
-        /// Finds orders by status
-        /// </summary>
-        /// <remarks>
-        /// A single status value can be provided as a string
-        /// </remarks>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="status">Status value that needs to be considered for query (optional, default to placed)</param>
-        /// <returns>Task of List&lt;Order&gt;</returns>
-        System.Threading.Tasks.Task<List<Order>> FindOrdersByStatusAsync (string status = null);
-
-        /// <summary>
-        /// Finds orders by status
-        /// </summary>
-        /// <remarks>
-        /// A single status value can be provided as a string
-        /// </remarks>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="status">Status value that needs to be considered for query (optional, default to placed)</param>
-        /// <returns>Task of ApiResponse (List&lt;Order&gt;)</returns>
-        System.Threading.Tasks.Task<ApiResponse<List<Order>>> FindOrdersByStatusAsyncWithHttpInfo (string status = null);
-        /// <summary>
         /// Returns pet inventories by status
         /// </summary>
         /// <remarks>
@@ -201,25 +139,6 @@ namespace IO.Swagger.Api
         /// <returns>Task of ApiResponse (Dictionary&lt;string, int?&gt;)</returns>
         System.Threading.Tasks.Task<ApiResponse<Dictionary<string, int?>>> GetInventoryAsyncWithHttpInfo ();
         /// <summary>
-        /// Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
-        /// </summary>
-        /// <remarks>
-        /// Returns an arbitrary object which is actually a map of status codes to quantities
-        /// </remarks>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of Object</returns>
-        System.Threading.Tasks.Task<Object> GetInventoryInObjectAsync ();
-
-        /// <summary>
-        /// Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
-        /// </summary>
-        /// <remarks>
-        /// Returns an arbitrary object which is actually a map of status codes to quantities
-        /// </remarks>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of ApiResponse (Object)</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> GetInventoryInObjectAsyncWithHttpInfo ();
-        /// <summary>
         /// Find purchase order by ID
         /// </summary>
         /// <remarks>
@@ -228,7 +147,7 @@ namespace IO.Swagger.Api
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <returns>Task of Order</returns>
-        System.Threading.Tasks.Task<Order> GetOrderByIdAsync (string orderId);
+        System.Threading.Tasks.Task<Order> GetOrderByIdAsync (long? orderId);
 
         /// <summary>
         /// Find purchase order by ID
@@ -239,7 +158,7 @@ namespace IO.Swagger.Api
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <returns>Task of ApiResponse (Order)</returns>
-        System.Threading.Tasks.Task<ApiResponse<Order>> GetOrderByIdAsyncWithHttpInfo (string orderId);
+        System.Threading.Tasks.Task<ApiResponse<Order>> GetOrderByIdAsyncWithHttpInfo (long? orderId);
         /// <summary>
         /// Place an order for a pet
         /// </summary>
@@ -247,9 +166,9 @@ namespace IO.Swagger.Api
         /// 
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">order placed for purchasing the pet (optional)</param>
+        /// <param name="body">order placed for purchasing the pet</param>
         /// <returns>Task of Order</returns>
-        System.Threading.Tasks.Task<Order> PlaceOrderAsync (Order body = null);
+        System.Threading.Tasks.Task<Order> PlaceOrderAsync (Order body);
 
         /// <summary>
         /// Place an order for a pet
@@ -258,9 +177,9 @@ namespace IO.Swagger.Api
         /// 
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">order placed for purchasing the pet (optional)</param>
+        /// <param name="body">order placed for purchasing the pet</param>
         /// <returns>Task of ApiResponse (Order)</returns>
-        System.Threading.Tasks.Task<ApiResponse<Order>> PlaceOrderAsyncWithHttpInfo (Order body = null);
+        System.Threading.Tasks.Task<ApiResponse<Order>> PlaceOrderAsyncWithHttpInfo (Order body);
         #endregion Asynchronous Operations
     }
 
@@ -370,14 +289,11 @@ namespace IO.Swagger.Api
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> DeleteOrderWithHttpInfo (string orderId)
         {
-            
             // verify the required parameter 'orderId' is set
             if (orderId == null)
                 throw new ApiException(400, "Missing required parameter 'orderId' when calling StoreApi->DeleteOrder");
-            
 
             var localVarPath = "/store/order/{orderId}";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -387,13 +303,13 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -403,9 +319,8 @@ namespace IO.Swagger.Api
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
             if (orderId != null) localVarPathParams.Add("orderId", Configuration.ApiClient.ParameterToString(orderId)); // path parameter
-                                                
 
-            
+
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath,
                 Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
@@ -445,11 +360,10 @@ namespace IO.Swagger.Api
         public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteOrderAsyncWithHttpInfo (string orderId)
         {
             // verify the required parameter 'orderId' is set
-            if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling DeleteOrder");
-            
+            if (orderId == null)
+                throw new ApiException(400, "Missing required parameter 'orderId' when calling StoreApi->DeleteOrder");
 
             var localVarPath = "/store/order/{orderId}";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -459,13 +373,13 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -475,7 +389,6 @@ namespace IO.Swagger.Api
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
             if (orderId != null) localVarPathParams.Add("orderId", Configuration.ApiClient.ParameterToString(orderId)); // path parameter
-                                                
 
 
             // make the HTTP request
@@ -495,170 +408,7 @@ namespace IO.Swagger.Api
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
-        /// <summary>
-        /// Finds orders by status A single status value can be provided as a string
-        /// </summary>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="status">Status value that needs to be considered for query (optional, default to placed)</param>
-        /// <returns>List&lt;Order&gt;</returns>
-        public List<Order> FindOrdersByStatus (string status = null)
-        {
-             ApiResponse<List<Order>> localVarResponse = FindOrdersByStatusWithHttpInfo(status);
-             return localVarResponse.Data;
-        }
 
-        /// <summary>
-        /// Finds orders by status A single status value can be provided as a string
-        /// </summary>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="status">Status value that needs to be considered for query (optional, default to placed)</param>
-        /// <returns>ApiResponse of List&lt;Order&gt;</returns>
-        public ApiResponse< List<Order> > FindOrdersByStatusWithHttpInfo (string status = null)
-        {
-            
-
-            var localVarPath = "/store/findByStatus";
-
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new Dictionary<String, String>();
-            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                
-            };
-            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            localVarPathParams.Add("format", "json");
-                        if (status != null) localVarQueryParams.Add("status", Configuration.ApiClient.ParameterToString(status)); // query parameter
-                                    
-
-            // authentication (test_api_client_id) required
-            
-            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("x-test_api_client_id")))
-            {
-                localVarHeaderParams["x-test_api_client_id"] = Configuration.GetApiKeyWithPrefix("x-test_api_client_id");
-            }
-// authentication (test_api_client_secret) required
-            
-            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("x-test_api_client_secret")))
-            {
-                localVarHeaderParams["x-test_api_client_secret"] = Configuration.GetApiKeyWithPrefix("x-test_api_client_secret");
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling FindOrdersByStatus: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling FindOrdersByStatus: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
-
-            return new ApiResponse<List<Order>>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (List<Order>) Configuration.ApiClient.Deserialize(localVarResponse, typeof(List<Order>)));
-            
-        }
-
-        /// <summary>
-        /// Finds orders by status A single status value can be provided as a string
-        /// </summary>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="status">Status value that needs to be considered for query (optional, default to placed)</param>
-        /// <returns>Task of List&lt;Order&gt;</returns>
-        public async System.Threading.Tasks.Task<List<Order>> FindOrdersByStatusAsync (string status = null)
-        {
-             ApiResponse<List<Order>> localVarResponse = await FindOrdersByStatusAsyncWithHttpInfo(status);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// Finds orders by status A single status value can be provided as a string
-        /// </summary>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="status">Status value that needs to be considered for query (optional, default to placed)</param>
-        /// <returns>Task of ApiResponse (List&lt;Order&gt;)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<List<Order>>> FindOrdersByStatusAsyncWithHttpInfo (string status = null)
-        {
-            
-
-            var localVarPath = "/store/findByStatus";
-
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new Dictionary<String, String>();
-            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                
-            };
-            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            localVarPathParams.Add("format", "json");
-                        if (status != null) localVarQueryParams.Add("status", Configuration.ApiClient.ParameterToString(status)); // query parameter
-                                    
-
-            // authentication (test_api_client_id) required
-            
-            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("x-test_api_client_id")))
-            {
-                localVarHeaderParams["x-test_api_client_id"] = Configuration.GetApiKeyWithPrefix("x-test_api_client_id");
-            }
-            // authentication (test_api_client_secret) required
-            
-            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("x-test_api_client_secret")))
-            {
-                localVarHeaderParams["x-test_api_client_secret"] = Configuration.GetApiKeyWithPrefix("x-test_api_client_secret");
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling FindOrdersByStatus: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling FindOrdersByStatus: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
-
-            return new ApiResponse<List<Order>>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (List<Order>) Configuration.ApiClient.Deserialize(localVarResponse, typeof(List<Order>)));
-            
-        }
         /// <summary>
         /// Returns pet inventories by status Returns a map of status codes to quantities
         /// </summary>
@@ -677,10 +427,8 @@ namespace IO.Swagger.Api
         /// <returns>ApiResponse of Dictionary&lt;string, int?&gt;</returns>
         public ApiResponse< Dictionary<string, int?> > GetInventoryWithHttpInfo ()
         {
-            
 
             var localVarPath = "/store/inventory";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -690,13 +438,12 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -705,15 +452,14 @@ namespace IO.Swagger.Api
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
-                                                            
 
             // authentication (api_key) required
-            
             if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("api_key")))
             {
                 localVarHeaderParams["api_key"] = Configuration.GetApiKeyWithPrefix("api_key");
             }
 
+
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath,
                 Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
@@ -751,10 +497,8 @@ namespace IO.Swagger.Api
         /// <returns>Task of ApiResponse (Dictionary&lt;string, int?&gt;)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Dictionary<string, int?>>> GetInventoryAsyncWithHttpInfo ()
         {
-            
 
             var localVarPath = "/store/inventory";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -764,13 +508,12 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -779,10 +522,8 @@ namespace IO.Swagger.Api
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
-                                                            
 
             // authentication (api_key) required
-            
             if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("api_key")))
             {
                 localVarHeaderParams["api_key"] = Configuration.GetApiKeyWithPrefix("api_key");
@@ -805,159 +546,14 @@ namespace IO.Swagger.Api
                 (Dictionary<string, int?>) Configuration.ApiClient.Deserialize(localVarResponse, typeof(Dictionary<string, int?>)));
             
         }
-        /// <summary>
-        /// Fake endpoint to test arbitrary object return by &#39;Get inventory&#39; Returns an arbitrary object which is actually a map of status codes to quantities
-        /// </summary>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Object</returns>
-        public Object GetInventoryInObject ()
-        {
-             ApiResponse<Object> localVarResponse = GetInventoryInObjectWithHttpInfo();
-             return localVarResponse.Data;
-        }
 
-        /// <summary>
-        /// Fake endpoint to test arbitrary object return by &#39;Get inventory&#39; Returns an arbitrary object which is actually a map of status codes to quantities
-        /// </summary>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>ApiResponse of Object</returns>
-        public ApiResponse< Object > GetInventoryInObjectWithHttpInfo ()
-        {
-            
-
-            var localVarPath = "/store/inventory?response&#x3D;arbitrary_object";
-
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new Dictionary<String, String>();
-            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                
-            };
-            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            localVarPathParams.Add("format", "json");
-                                                            
-
-            // authentication (api_key) required
-            
-            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("api_key")))
-            {
-                localVarHeaderParams["api_key"] = Configuration.GetApiKeyWithPrefix("api_key");
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling GetInventoryInObject: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling GetInventoryInObject: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
-
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (Object) Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
-            
-        }
-
-        /// <summary>
-        /// Fake endpoint to test arbitrary object return by &#39;Get inventory&#39; Returns an arbitrary object which is actually a map of status codes to quantities
-        /// </summary>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of Object</returns>
-        public async System.Threading.Tasks.Task<Object> GetInventoryInObjectAsync ()
-        {
-             ApiResponse<Object> localVarResponse = await GetInventoryInObjectAsyncWithHttpInfo();
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// Fake endpoint to test arbitrary object return by &#39;Get inventory&#39; Returns an arbitrary object which is actually a map of status codes to quantities
-        /// </summary>
-        /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of ApiResponse (Object)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> GetInventoryInObjectAsyncWithHttpInfo ()
-        {
-            
-
-            var localVarPath = "/store/inventory?response&#x3D;arbitrary_object";
-
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new Dictionary<String, String>();
-            var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                
-            };
-            String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
-            };
-            String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            // set "format" to json by default
-            // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
-            localVarPathParams.Add("format", "json");
-                                                            
-
-            // authentication (api_key) required
-            
-            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("api_key")))
-            {
-                localVarHeaderParams["api_key"] = Configuration.GetApiKeyWithPrefix("api_key");
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling GetInventoryInObject: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling GetInventoryInObject: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
-
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (Object) Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
-            
-        }
         /// <summary>
         /// Find purchase order by ID For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <returns>Order</returns>
-        public Order GetOrderById (string orderId)
+        public Order GetOrderById (long? orderId)
         {
              ApiResponse<Order> localVarResponse = GetOrderByIdWithHttpInfo(orderId);
              return localVarResponse.Data;
@@ -969,16 +565,13 @@ namespace IO.Swagger.Api
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <returns>ApiResponse of Order</returns>
-        public ApiResponse< Order > GetOrderByIdWithHttpInfo (string orderId)
+        public ApiResponse< Order > GetOrderByIdWithHttpInfo (long? orderId)
         {
-            
             // verify the required parameter 'orderId' is set
             if (orderId == null)
                 throw new ApiException(400, "Missing required parameter 'orderId' when calling StoreApi->GetOrderById");
-            
 
             var localVarPath = "/store/order/{orderId}";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -988,13 +581,13 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -1004,20 +597,7 @@ namespace IO.Swagger.Api
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
             if (orderId != null) localVarPathParams.Add("orderId", Configuration.ApiClient.ParameterToString(orderId)); // path parameter
-                                                
 
-            // authentication (test_api_key_header) required
-            
-            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("test_api_key_header")))
-            {
-                localVarHeaderParams["test_api_key_header"] = Configuration.GetApiKeyWithPrefix("test_api_key_header");
-            }
-// authentication (test_api_key_query) required
-            
-            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("test_api_key_query")))
-            {
-                localVarQueryParams["test_api_key_query"] = Configuration.GetApiKeyWithPrefix("test_api_key_query");
-            }
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath,
@@ -1043,7 +623,7 @@ namespace IO.Swagger.Api
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <returns>Task of Order</returns>
-        public async System.Threading.Tasks.Task<Order> GetOrderByIdAsync (string orderId)
+        public async System.Threading.Tasks.Task<Order> GetOrderByIdAsync (long? orderId)
         {
              ApiResponse<Order> localVarResponse = await GetOrderByIdAsyncWithHttpInfo(orderId);
              return localVarResponse.Data;
@@ -1056,14 +636,13 @@ namespace IO.Swagger.Api
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <returns>Task of ApiResponse (Order)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Order>> GetOrderByIdAsyncWithHttpInfo (string orderId)
+        public async System.Threading.Tasks.Task<ApiResponse<Order>> GetOrderByIdAsyncWithHttpInfo (long? orderId)
         {
             // verify the required parameter 'orderId' is set
-            if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling GetOrderById");
-            
+            if (orderId == null)
+                throw new ApiException(400, "Missing required parameter 'orderId' when calling StoreApi->GetOrderById");
 
             var localVarPath = "/store/order/{orderId}";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -1073,13 +652,13 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -1089,20 +668,7 @@ namespace IO.Swagger.Api
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
             if (orderId != null) localVarPathParams.Add("orderId", Configuration.ApiClient.ParameterToString(orderId)); // path parameter
-                                                
 
-            // authentication (test_api_key_header) required
-            
-            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("test_api_key_header")))
-            {
-                localVarHeaderParams["test_api_key_header"] = Configuration.GetApiKeyWithPrefix("test_api_key_header");
-            }
-            // authentication (test_api_key_query) required
-            
-            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("test_api_key_query")))
-            {
-                localVarQueryParams["test_api_key_query"] = Configuration.GetApiKeyWithPrefix("test_api_key_query");
-            }
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath,
@@ -1121,13 +687,14 @@ namespace IO.Swagger.Api
                 (Order) Configuration.ApiClient.Deserialize(localVarResponse, typeof(Order)));
             
         }
+
         /// <summary>
         /// Place an order for a pet 
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">order placed for purchasing the pet (optional)</param>
+        /// <param name="body">order placed for purchasing the pet</param>
         /// <returns>Order</returns>
-        public Order PlaceOrder (Order body = null)
+        public Order PlaceOrder (Order body)
         {
              ApiResponse<Order> localVarResponse = PlaceOrderWithHttpInfo(body);
              return localVarResponse.Data;
@@ -1137,14 +704,15 @@ namespace IO.Swagger.Api
         /// Place an order for a pet 
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">order placed for purchasing the pet (optional)</param>
+        /// <param name="body">order placed for purchasing the pet</param>
         /// <returns>ApiResponse of Order</returns>
-        public ApiResponse< Order > PlaceOrderWithHttpInfo (Order body = null)
+        public ApiResponse< Order > PlaceOrderWithHttpInfo (Order body)
         {
-            
+            // verify the required parameter 'body' is set
+            if (body == null)
+                throw new ApiException(400, "Missing required parameter 'body' when calling StoreApi->PlaceOrder");
 
             var localVarPath = "/store/order";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -1154,13 +722,13 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -1169,7 +737,7 @@ namespace IO.Swagger.Api
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
-                                                            if (body.GetType() != typeof(byte[]))
+            if (body.GetType() != typeof(byte[]))
             {
                 localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
             }
@@ -1178,18 +746,6 @@ namespace IO.Swagger.Api
                 localVarPostBody = body; // byte array
             }
 
-            // authentication (test_api_client_id) required
-            
-            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("x-test_api_client_id")))
-            {
-                localVarHeaderParams["x-test_api_client_id"] = Configuration.GetApiKeyWithPrefix("x-test_api_client_id");
-            }
-// authentication (test_api_client_secret) required
-            
-            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("x-test_api_client_secret")))
-            {
-                localVarHeaderParams["x-test_api_client_secret"] = Configuration.GetApiKeyWithPrefix("x-test_api_client_secret");
-            }
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath,
@@ -1213,9 +769,9 @@ namespace IO.Swagger.Api
         /// Place an order for a pet 
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">order placed for purchasing the pet (optional)</param>
+        /// <param name="body">order placed for purchasing the pet</param>
         /// <returns>Task of Order</returns>
-        public async System.Threading.Tasks.Task<Order> PlaceOrderAsync (Order body = null)
+        public async System.Threading.Tasks.Task<Order> PlaceOrderAsync (Order body)
         {
              ApiResponse<Order> localVarResponse = await PlaceOrderAsyncWithHttpInfo(body);
              return localVarResponse.Data;
@@ -1226,14 +782,15 @@ namespace IO.Swagger.Api
         /// Place an order for a pet 
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">order placed for purchasing the pet (optional)</param>
+        /// <param name="body">order placed for purchasing the pet</param>
         /// <returns>Task of ApiResponse (Order)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Order>> PlaceOrderAsyncWithHttpInfo (Order body = null)
+        public async System.Threading.Tasks.Task<ApiResponse<Order>> PlaceOrderAsyncWithHttpInfo (Order body)
         {
-            
+            // verify the required parameter 'body' is set
+            if (body == null)
+                throw new ApiException(400, "Missing required parameter 'body' when calling StoreApi->PlaceOrder");
 
             var localVarPath = "/store/order";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -1243,13 +800,13 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -1258,7 +815,7 @@ namespace IO.Swagger.Api
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
-                                                            if (body.GetType() != typeof(byte[]))
+            if (body.GetType() != typeof(byte[]))
             {
                 localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
             }
@@ -1267,18 +824,6 @@ namespace IO.Swagger.Api
                 localVarPostBody = body; // byte array
             }
 
-            // authentication (test_api_client_id) required
-            
-            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("x-test_api_client_id")))
-            {
-                localVarHeaderParams["x-test_api_client_id"] = Configuration.GetApiKeyWithPrefix("x-test_api_client_id");
-            }
-            // authentication (test_api_client_secret) required
-            
-            if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("x-test_api_client_secret")))
-            {
-                localVarHeaderParams["x-test_api_client_secret"] = Configuration.GetApiKeyWithPrefix("x-test_api_client_secret");
-            }
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath,
@@ -1297,5 +842,6 @@ namespace IO.Swagger.Api
                 (Order) Configuration.ApiClient.Deserialize(localVarResponse, typeof(Order)));
             
         }
+
     }
 }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs
index 80297f069db..a94b733e44b 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs
@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
@@ -22,9 +21,9 @@ namespace IO.Swagger.Api
         /// This can only be done by the logged in user.
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Created user object (optional)</param>
+        /// <param name="body">Created user object</param>
         /// <returns></returns>
-        void CreateUser (User body = null);
+        void CreateUser (User body);
 
         /// <summary>
         /// Create user
@@ -33,9 +32,9 @@ namespace IO.Swagger.Api
         /// This can only be done by the logged in user.
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Created user object (optional)</param>
+        /// <param name="body">Created user object</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> CreateUserWithHttpInfo (User body = null);
+        ApiResponse<Object> CreateUserWithHttpInfo (User body);
         /// <summary>
         /// Creates list of users with given input array
         /// </summary>
@@ -43,9 +42,9 @@ namespace IO.Swagger.Api
         /// 
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">List of user object (optional)</param>
+        /// <param name="body">List of user object</param>
         /// <returns></returns>
-        void CreateUsersWithArrayInput (List<User> body = null);
+        void CreateUsersWithArrayInput (List<User> body);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -54,9 +53,9 @@ namespace IO.Swagger.Api
         /// 
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">List of user object (optional)</param>
+        /// <param name="body">List of user object</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> CreateUsersWithArrayInputWithHttpInfo (List<User> body = null);
+        ApiResponse<Object> CreateUsersWithArrayInputWithHttpInfo (List<User> body);
         /// <summary>
         /// Creates list of users with given input array
         /// </summary>
@@ -64,9 +63,9 @@ namespace IO.Swagger.Api
         /// 
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">List of user object (optional)</param>
+        /// <param name="body">List of user object</param>
         /// <returns></returns>
-        void CreateUsersWithListInput (List<User> body = null);
+        void CreateUsersWithListInput (List<User> body);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -75,9 +74,9 @@ namespace IO.Swagger.Api
         /// 
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">List of user object (optional)</param>
+        /// <param name="body">List of user object</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> CreateUsersWithListInputWithHttpInfo (List<User> body = null);
+        ApiResponse<Object> CreateUsersWithListInputWithHttpInfo (List<User> body);
         /// <summary>
         /// Delete user
         /// </summary>
@@ -127,10 +126,10 @@ namespace IO.Swagger.Api
         /// 
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="username">The user name for login (optional)</param>
-        /// <param name="password">The password for login in clear text (optional)</param>
+        /// <param name="username">The user name for login</param>
+        /// <param name="password">The password for login in clear text</param>
         /// <returns>string</returns>
-        string LoginUser (string username = null, string password = null);
+        string LoginUser (string username, string password);
 
         /// <summary>
         /// Logs user into the system
@@ -139,10 +138,10 @@ namespace IO.Swagger.Api
         /// 
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="username">The user name for login (optional)</param>
-        /// <param name="password">The password for login in clear text (optional)</param>
+        /// <param name="username">The user name for login</param>
+        /// <param name="password">The password for login in clear text</param>
         /// <returns>ApiResponse of string</returns>
-        ApiResponse<string> LoginUserWithHttpInfo (string username = null, string password = null);
+        ApiResponse<string> LoginUserWithHttpInfo (string username, string password);
         /// <summary>
         /// Logs out current logged in user session
         /// </summary>
@@ -170,9 +169,9 @@ namespace IO.Swagger.Api
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="username">name that need to be deleted</param>
-        /// <param name="body">Updated user object (optional)</param>
+        /// <param name="body">Updated user object</param>
         /// <returns></returns>
-        void UpdateUser (string username, User body = null);
+        void UpdateUser (string username, User body);
 
         /// <summary>
         /// Updated user
@@ -182,9 +181,9 @@ namespace IO.Swagger.Api
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="username">name that need to be deleted</param>
-        /// <param name="body">Updated user object (optional)</param>
+        /// <param name="body">Updated user object</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> UpdateUserWithHttpInfo (string username, User body = null);
+        ApiResponse<Object> UpdateUserWithHttpInfo (string username, User body);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
@@ -194,9 +193,9 @@ namespace IO.Swagger.Api
         /// This can only be done by the logged in user.
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Created user object (optional)</param>
+        /// <param name="body">Created user object</param>
         /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task CreateUserAsync (User body = null);
+        System.Threading.Tasks.Task CreateUserAsync (User body);
 
         /// <summary>
         /// Create user
@@ -205,9 +204,9 @@ namespace IO.Swagger.Api
         /// This can only be done by the logged in user.
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Created user object (optional)</param>
+        /// <param name="body">Created user object</param>
         /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> CreateUserAsyncWithHttpInfo (User body = null);
+        System.Threading.Tasks.Task<ApiResponse<Object>> CreateUserAsyncWithHttpInfo (User body);
         /// <summary>
         /// Creates list of users with given input array
         /// </summary>
@@ -215,9 +214,9 @@ namespace IO.Swagger.Api
         /// 
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">List of user object (optional)</param>
+        /// <param name="body">List of user object</param>
         /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task CreateUsersWithArrayInputAsync (List<User> body = null);
+        System.Threading.Tasks.Task CreateUsersWithArrayInputAsync (List<User> body);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -226,9 +225,9 @@ namespace IO.Swagger.Api
         /// 
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">List of user object (optional)</param>
+        /// <param name="body">List of user object</param>
         /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> CreateUsersWithArrayInputAsyncWithHttpInfo (List<User> body = null);
+        System.Threading.Tasks.Task<ApiResponse<Object>> CreateUsersWithArrayInputAsyncWithHttpInfo (List<User> body);
         /// <summary>
         /// Creates list of users with given input array
         /// </summary>
@@ -236,9 +235,9 @@ namespace IO.Swagger.Api
         /// 
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">List of user object (optional)</param>
+        /// <param name="body">List of user object</param>
         /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task CreateUsersWithListInputAsync (List<User> body = null);
+        System.Threading.Tasks.Task CreateUsersWithListInputAsync (List<User> body);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -247,9 +246,9 @@ namespace IO.Swagger.Api
         /// 
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">List of user object (optional)</param>
+        /// <param name="body">List of user object</param>
         /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> CreateUsersWithListInputAsyncWithHttpInfo (List<User> body = null);
+        System.Threading.Tasks.Task<ApiResponse<Object>> CreateUsersWithListInputAsyncWithHttpInfo (List<User> body);
         /// <summary>
         /// Delete user
         /// </summary>
@@ -299,10 +298,10 @@ namespace IO.Swagger.Api
         /// 
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="username">The user name for login (optional)</param>
-        /// <param name="password">The password for login in clear text (optional)</param>
+        /// <param name="username">The user name for login</param>
+        /// <param name="password">The password for login in clear text</param>
         /// <returns>Task of string</returns>
-        System.Threading.Tasks.Task<string> LoginUserAsync (string username = null, string password = null);
+        System.Threading.Tasks.Task<string> LoginUserAsync (string username, string password);
 
         /// <summary>
         /// Logs user into the system
@@ -311,10 +310,10 @@ namespace IO.Swagger.Api
         /// 
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="username">The user name for login (optional)</param>
-        /// <param name="password">The password for login in clear text (optional)</param>
+        /// <param name="username">The user name for login</param>
+        /// <param name="password">The password for login in clear text</param>
         /// <returns>Task of ApiResponse (string)</returns>
-        System.Threading.Tasks.Task<ApiResponse<string>> LoginUserAsyncWithHttpInfo (string username = null, string password = null);
+        System.Threading.Tasks.Task<ApiResponse<string>> LoginUserAsyncWithHttpInfo (string username, string password);
         /// <summary>
         /// Logs out current logged in user session
         /// </summary>
@@ -342,9 +341,9 @@ namespace IO.Swagger.Api
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="username">name that need to be deleted</param>
-        /// <param name="body">Updated user object (optional)</param>
+        /// <param name="body">Updated user object</param>
         /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task UpdateUserAsync (string username, User body = null);
+        System.Threading.Tasks.Task UpdateUserAsync (string username, User body);
 
         /// <summary>
         /// Updated user
@@ -354,9 +353,9 @@ namespace IO.Swagger.Api
         /// </remarks>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="username">name that need to be deleted</param>
-        /// <param name="body">Updated user object (optional)</param>
+        /// <param name="body">Updated user object</param>
         /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> UpdateUserAsyncWithHttpInfo (string username, User body = null);
+        System.Threading.Tasks.Task<ApiResponse<Object>> UpdateUserAsyncWithHttpInfo (string username, User body);
         #endregion Asynchronous Operations
     }
 
@@ -451,9 +450,9 @@ namespace IO.Swagger.Api
         /// Create user This can only be done by the logged in user.
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Created user object (optional)</param>
+        /// <param name="body">Created user object</param>
         /// <returns></returns>
-        public void CreateUser (User body = null)
+        public void CreateUser (User body)
         {
              CreateUserWithHttpInfo(body);
         }
@@ -462,14 +461,15 @@ namespace IO.Swagger.Api
         /// Create user This can only be done by the logged in user.
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Created user object (optional)</param>
+        /// <param name="body">Created user object</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> CreateUserWithHttpInfo (User body = null)
+        public ApiResponse<Object> CreateUserWithHttpInfo (User body)
         {
-            
+            // verify the required parameter 'body' is set
+            if (body == null)
+                throw new ApiException(400, "Missing required parameter 'body' when calling UserApi->CreateUser");
 
             var localVarPath = "/user";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -479,13 +479,13 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -494,7 +494,7 @@ namespace IO.Swagger.Api
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
-                                                            if (body.GetType() != typeof(byte[]))
+            if (body.GetType() != typeof(byte[]))
             {
                 localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
             }
@@ -503,7 +503,7 @@ namespace IO.Swagger.Api
                 localVarPostBody = body; // byte array
             }
 
-            
+
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath,
                 Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
@@ -526,9 +526,9 @@ namespace IO.Swagger.Api
         /// Create user This can only be done by the logged in user.
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Created user object (optional)</param>
+        /// <param name="body">Created user object</param>
         /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task CreateUserAsync (User body = null)
+        public async System.Threading.Tasks.Task CreateUserAsync (User body)
         {
              await CreateUserAsyncWithHttpInfo(body);
 
@@ -538,14 +538,15 @@ namespace IO.Swagger.Api
         /// Create user This can only be done by the logged in user.
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">Created user object (optional)</param>
+        /// <param name="body">Created user object</param>
         /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateUserAsyncWithHttpInfo (User body = null)
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateUserAsyncWithHttpInfo (User body)
         {
-            
+            // verify the required parameter 'body' is set
+            if (body == null)
+                throw new ApiException(400, "Missing required parameter 'body' when calling UserApi->CreateUser");
 
             var localVarPath = "/user";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -555,13 +556,13 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -570,7 +571,7 @@ namespace IO.Swagger.Api
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
-                                                            if (body.GetType() != typeof(byte[]))
+            if (body.GetType() != typeof(byte[]))
             {
                 localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
             }
@@ -597,13 +598,14 @@ namespace IO.Swagger.Api
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
+
         /// <summary>
         /// Creates list of users with given input array 
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">List of user object (optional)</param>
+        /// <param name="body">List of user object</param>
         /// <returns></returns>
-        public void CreateUsersWithArrayInput (List<User> body = null)
+        public void CreateUsersWithArrayInput (List<User> body)
         {
              CreateUsersWithArrayInputWithHttpInfo(body);
         }
@@ -612,14 +614,15 @@ namespace IO.Swagger.Api
         /// Creates list of users with given input array 
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">List of user object (optional)</param>
+        /// <param name="body">List of user object</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> CreateUsersWithArrayInputWithHttpInfo (List<User> body = null)
+        public ApiResponse<Object> CreateUsersWithArrayInputWithHttpInfo (List<User> body)
         {
-            
+            // verify the required parameter 'body' is set
+            if (body == null)
+                throw new ApiException(400, "Missing required parameter 'body' when calling UserApi->CreateUsersWithArrayInput");
 
             var localVarPath = "/user/createWithArray";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -629,13 +632,13 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -644,7 +647,7 @@ namespace IO.Swagger.Api
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
-                                                            if (body.GetType() != typeof(byte[]))
+            if (body.GetType() != typeof(byte[]))
             {
                 localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
             }
@@ -653,7 +656,7 @@ namespace IO.Swagger.Api
                 localVarPostBody = body; // byte array
             }
 
-            
+
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath,
                 Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
@@ -676,9 +679,9 @@ namespace IO.Swagger.Api
         /// Creates list of users with given input array 
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">List of user object (optional)</param>
+        /// <param name="body">List of user object</param>
         /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task CreateUsersWithArrayInputAsync (List<User> body = null)
+        public async System.Threading.Tasks.Task CreateUsersWithArrayInputAsync (List<User> body)
         {
              await CreateUsersWithArrayInputAsyncWithHttpInfo(body);
 
@@ -688,14 +691,15 @@ namespace IO.Swagger.Api
         /// Creates list of users with given input array 
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">List of user object (optional)</param>
+        /// <param name="body">List of user object</param>
         /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateUsersWithArrayInputAsyncWithHttpInfo (List<User> body = null)
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateUsersWithArrayInputAsyncWithHttpInfo (List<User> body)
         {
-            
+            // verify the required parameter 'body' is set
+            if (body == null)
+                throw new ApiException(400, "Missing required parameter 'body' when calling UserApi->CreateUsersWithArrayInput");
 
             var localVarPath = "/user/createWithArray";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -705,13 +709,13 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -720,7 +724,7 @@ namespace IO.Swagger.Api
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
-                                                            if (body.GetType() != typeof(byte[]))
+            if (body.GetType() != typeof(byte[]))
             {
                 localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
             }
@@ -747,13 +751,14 @@ namespace IO.Swagger.Api
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
+
         /// <summary>
         /// Creates list of users with given input array 
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">List of user object (optional)</param>
+        /// <param name="body">List of user object</param>
         /// <returns></returns>
-        public void CreateUsersWithListInput (List<User> body = null)
+        public void CreateUsersWithListInput (List<User> body)
         {
              CreateUsersWithListInputWithHttpInfo(body);
         }
@@ -762,14 +767,15 @@ namespace IO.Swagger.Api
         /// Creates list of users with given input array 
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">List of user object (optional)</param>
+        /// <param name="body">List of user object</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> CreateUsersWithListInputWithHttpInfo (List<User> body = null)
+        public ApiResponse<Object> CreateUsersWithListInputWithHttpInfo (List<User> body)
         {
-            
+            // verify the required parameter 'body' is set
+            if (body == null)
+                throw new ApiException(400, "Missing required parameter 'body' when calling UserApi->CreateUsersWithListInput");
 
             var localVarPath = "/user/createWithList";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -779,13 +785,13 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -794,7 +800,7 @@ namespace IO.Swagger.Api
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
-                                                            if (body.GetType() != typeof(byte[]))
+            if (body.GetType() != typeof(byte[]))
             {
                 localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
             }
@@ -803,7 +809,7 @@ namespace IO.Swagger.Api
                 localVarPostBody = body; // byte array
             }
 
-            
+
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath,
                 Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
@@ -826,9 +832,9 @@ namespace IO.Swagger.Api
         /// Creates list of users with given input array 
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">List of user object (optional)</param>
+        /// <param name="body">List of user object</param>
         /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task CreateUsersWithListInputAsync (List<User> body = null)
+        public async System.Threading.Tasks.Task CreateUsersWithListInputAsync (List<User> body)
         {
              await CreateUsersWithListInputAsyncWithHttpInfo(body);
 
@@ -838,14 +844,15 @@ namespace IO.Swagger.Api
         /// Creates list of users with given input array 
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="body">List of user object (optional)</param>
+        /// <param name="body">List of user object</param>
         /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateUsersWithListInputAsyncWithHttpInfo (List<User> body = null)
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateUsersWithListInputAsyncWithHttpInfo (List<User> body)
         {
-            
+            // verify the required parameter 'body' is set
+            if (body == null)
+                throw new ApiException(400, "Missing required parameter 'body' when calling UserApi->CreateUsersWithListInput");
 
             var localVarPath = "/user/createWithList";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -855,13 +862,13 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -870,7 +877,7 @@ namespace IO.Swagger.Api
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
-                                                            if (body.GetType() != typeof(byte[]))
+            if (body.GetType() != typeof(byte[]))
             {
                 localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
             }
@@ -897,6 +904,7 @@ namespace IO.Swagger.Api
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
+
         /// <summary>
         /// Delete user This can only be done by the logged in user.
         /// </summary>
@@ -916,14 +924,11 @@ namespace IO.Swagger.Api
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> DeleteUserWithHttpInfo (string username)
         {
-            
             // verify the required parameter 'username' is set
             if (username == null)
                 throw new ApiException(400, "Missing required parameter 'username' when calling UserApi->DeleteUser");
-            
 
             var localVarPath = "/user/{username}";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -933,13 +938,13 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -949,15 +954,7 @@ namespace IO.Swagger.Api
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
             if (username != null) localVarPathParams.Add("username", Configuration.ApiClient.ParameterToString(username)); // path parameter
-                                                
 
-            // authentication (test_http_basic) required
-            
-            // http basic authentication required
-            if (!String.IsNullOrEmpty(Configuration.Username) || !String.IsNullOrEmpty(Configuration.Password))
-            {
-                localVarHeaderParams["Authorization"] = "Basic " + ApiClient.Base64Encode(Configuration.Username + ":" + Configuration.Password);
-            }
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath,
@@ -998,11 +995,10 @@ namespace IO.Swagger.Api
         public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteUserAsyncWithHttpInfo (string username)
         {
             // verify the required parameter 'username' is set
-            if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling DeleteUser");
-            
+            if (username == null)
+                throw new ApiException(400, "Missing required parameter 'username' when calling UserApi->DeleteUser");
 
             var localVarPath = "/user/{username}";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -1012,13 +1008,13 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -1028,15 +1024,7 @@ namespace IO.Swagger.Api
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
             if (username != null) localVarPathParams.Add("username", Configuration.ApiClient.ParameterToString(username)); // path parameter
-                                                
 
-            // authentication (test_http_basic) required
-            
-            // http basic authentication required
-            if (!String.IsNullOrEmpty(Configuration.Username) || !String.IsNullOrEmpty(Configuration.Password))
-            {
-                localVarHeaderParams["Authorization"] = "Basic " + ApiClient.Base64Encode(Configuration.Username + ":" + Configuration.Password);
-            }
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) await Configuration.ApiClient.CallApiAsync(localVarPath,
@@ -1055,6 +1043,7 @@ namespace IO.Swagger.Api
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
+
         /// <summary>
         /// Get user by user name 
         /// </summary>
@@ -1075,14 +1064,11 @@ namespace IO.Swagger.Api
         /// <returns>ApiResponse of User</returns>
         public ApiResponse< User > GetUserByNameWithHttpInfo (string username)
         {
-            
             // verify the required parameter 'username' is set
             if (username == null)
                 throw new ApiException(400, "Missing required parameter 'username' when calling UserApi->GetUserByName");
-            
 
             var localVarPath = "/user/{username}";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -1092,13 +1078,13 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -1108,9 +1094,8 @@ namespace IO.Swagger.Api
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
             if (username != null) localVarPathParams.Add("username", Configuration.ApiClient.ParameterToString(username)); // path parameter
-                                                
 
-            
+
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath,
                 Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
@@ -1151,11 +1136,10 @@ namespace IO.Swagger.Api
         public async System.Threading.Tasks.Task<ApiResponse<User>> GetUserByNameAsyncWithHttpInfo (string username)
         {
             // verify the required parameter 'username' is set
-            if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling GetUserByName");
-            
+            if (username == null)
+                throw new ApiException(400, "Missing required parameter 'username' when calling UserApi->GetUserByName");
 
             var localVarPath = "/user/{username}";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -1165,13 +1149,13 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -1181,7 +1165,6 @@ namespace IO.Swagger.Api
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
             if (username != null) localVarPathParams.Add("username", Configuration.ApiClient.ParameterToString(username)); // path parameter
-                                                
 
 
             // make the HTTP request
@@ -1201,14 +1184,15 @@ namespace IO.Swagger.Api
                 (User) Configuration.ApiClient.Deserialize(localVarResponse, typeof(User)));
             
         }
+
         /// <summary>
         /// Logs user into the system 
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="username">The user name for login (optional)</param>
-        /// <param name="password">The password for login in clear text (optional)</param>
+        /// <param name="username">The user name for login</param>
+        /// <param name="password">The password for login in clear text</param>
         /// <returns>string</returns>
-        public string LoginUser (string username = null, string password = null)
+        public string LoginUser (string username, string password)
         {
              ApiResponse<string> localVarResponse = LoginUserWithHttpInfo(username, password);
              return localVarResponse.Data;
@@ -1218,15 +1202,19 @@ namespace IO.Swagger.Api
         /// Logs user into the system 
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="username">The user name for login (optional)</param>
-        /// <param name="password">The password for login in clear text (optional)</param>
+        /// <param name="username">The user name for login</param>
+        /// <param name="password">The password for login in clear text</param>
         /// <returns>ApiResponse of string</returns>
-        public ApiResponse< string > LoginUserWithHttpInfo (string username = null, string password = null)
+        public ApiResponse< string > LoginUserWithHttpInfo (string username, string password)
         {
-            
+            // verify the required parameter 'username' is set
+            if (username == null)
+                throw new ApiException(400, "Missing required parameter 'username' when calling UserApi->LoginUser");
+            // verify the required parameter 'password' is set
+            if (password == null)
+                throw new ApiException(400, "Missing required parameter 'password' when calling UserApi->LoginUser");
 
             var localVarPath = "/user/login";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -1236,13 +1224,13 @@ namespace IO.Swagger.Api
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -1251,11 +1239,10 @@ namespace IO.Swagger.Api
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
-                        if (username != null) localVarQueryParams.Add("username", Configuration.ApiClient.ParameterToString(username)); // query parameter
-if (password != null) localVarQueryParams.Add("password", Configuration.ApiClient.ParameterToString(password)); // query parameter
-                                    
+            if (username != null) localVarQueryParams.Add("username", Configuration.ApiClient.ParameterToString(username)); // query parameter
+            if (password != null) localVarQueryParams.Add("password", Configuration.ApiClient.ParameterToString(password)); // query parameter
+
 
-            
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath,
                 Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
@@ -1278,10 +1265,10 @@ if (password != null) localVarQueryParams.Add("password", Configuration.ApiClien
         /// Logs user into the system 
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="username">The user name for login (optional)</param>
-        /// <param name="password">The password for login in clear text (optional)</param>
+        /// <param name="username">The user name for login</param>
+        /// <param name="password">The password for login in clear text</param>
         /// <returns>Task of string</returns>
-        public async System.Threading.Tasks.Task<string> LoginUserAsync (string username = null, string password = null)
+        public async System.Threading.Tasks.Task<string> LoginUserAsync (string username, string password)
         {
              ApiResponse<string> localVarResponse = await LoginUserAsyncWithHttpInfo(username, password);
              return localVarResponse.Data;
@@ -1292,15 +1279,19 @@ if (password != null) localVarQueryParams.Add("password", Configuration.ApiClien
         /// Logs user into the system 
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="username">The user name for login (optional)</param>
-        /// <param name="password">The password for login in clear text (optional)</param>
+        /// <param name="username">The user name for login</param>
+        /// <param name="password">The password for login in clear text</param>
         /// <returns>Task of ApiResponse (string)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<string>> LoginUserAsyncWithHttpInfo (string username = null, string password = null)
+        public async System.Threading.Tasks.Task<ApiResponse<string>> LoginUserAsyncWithHttpInfo (string username, string password)
         {
-            
+            // verify the required parameter 'username' is set
+            if (username == null)
+                throw new ApiException(400, "Missing required parameter 'username' when calling UserApi->LoginUser");
+            // verify the required parameter 'password' is set
+            if (password == null)
+                throw new ApiException(400, "Missing required parameter 'password' when calling UserApi->LoginUser");
 
             var localVarPath = "/user/login";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -1310,13 +1301,13 @@ if (password != null) localVarQueryParams.Add("password", Configuration.ApiClien
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -1325,9 +1316,8 @@ if (password != null) localVarQueryParams.Add("password", Configuration.ApiClien
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
-                        if (username != null) localVarQueryParams.Add("username", Configuration.ApiClient.ParameterToString(username)); // query parameter
-if (password != null) localVarQueryParams.Add("password", Configuration.ApiClient.ParameterToString(password)); // query parameter
-                                    
+            if (username != null) localVarQueryParams.Add("username", Configuration.ApiClient.ParameterToString(username)); // query parameter
+            if (password != null) localVarQueryParams.Add("password", Configuration.ApiClient.ParameterToString(password)); // query parameter
 
 
             // make the HTTP request
@@ -1347,6 +1337,7 @@ if (password != null) localVarQueryParams.Add("password", Configuration.ApiClien
                 (string) Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
             
         }
+
         /// <summary>
         /// Logs out current logged in user session 
         /// </summary>
@@ -1364,10 +1355,8 @@ if (password != null) localVarQueryParams.Add("password", Configuration.ApiClien
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> LogoutUserWithHttpInfo ()
         {
-            
 
             var localVarPath = "/user/logout";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -1377,13 +1366,13 @@ if (password != null) localVarQueryParams.Add("password", Configuration.ApiClien
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -1392,9 +1381,8 @@ if (password != null) localVarQueryParams.Add("password", Configuration.ApiClien
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
-                                                            
 
-            
+
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath,
                 Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
@@ -1431,10 +1419,8 @@ if (password != null) localVarQueryParams.Add("password", Configuration.ApiClien
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> LogoutUserAsyncWithHttpInfo ()
         {
-            
 
             var localVarPath = "/user/logout";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -1444,13 +1430,13 @@ if (password != null) localVarQueryParams.Add("password", Configuration.ApiClien
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -1459,7 +1445,6 @@ if (password != null) localVarQueryParams.Add("password", Configuration.ApiClien
             // set "format" to json by default
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
-                                                            
 
 
             // make the HTTP request
@@ -1479,14 +1464,15 @@ if (password != null) localVarQueryParams.Add("password", Configuration.ApiClien
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
+
         /// <summary>
         /// Updated user This can only be done by the logged in user.
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="username">name that need to be deleted</param>
-        /// <param name="body">Updated user object (optional)</param>
+        /// <param name="body">Updated user object</param>
         /// <returns></returns>
-        public void UpdateUser (string username, User body = null)
+        public void UpdateUser (string username, User body)
         {
              UpdateUserWithHttpInfo(username, body);
         }
@@ -1496,18 +1482,18 @@ if (password != null) localVarQueryParams.Add("password", Configuration.ApiClien
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="username">name that need to be deleted</param>
-        /// <param name="body">Updated user object (optional)</param>
+        /// <param name="body">Updated user object</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> UpdateUserWithHttpInfo (string username, User body = null)
+        public ApiResponse<Object> UpdateUserWithHttpInfo (string username, User body)
         {
-            
             // verify the required parameter 'username' is set
             if (username == null)
                 throw new ApiException(400, "Missing required parameter 'username' when calling UserApi->UpdateUser");
-            
+            // verify the required parameter 'body' is set
+            if (body == null)
+                throw new ApiException(400, "Missing required parameter 'body' when calling UserApi->UpdateUser");
 
             var localVarPath = "/user/{username}";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -1517,13 +1503,13 @@ if (password != null) localVarQueryParams.Add("password", Configuration.ApiClien
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -1533,7 +1519,7 @@ if (password != null) localVarQueryParams.Add("password", Configuration.ApiClien
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
             if (username != null) localVarPathParams.Add("username", Configuration.ApiClient.ParameterToString(username)); // path parameter
-                                                if (body.GetType() != typeof(byte[]))
+            if (body.GetType() != typeof(byte[]))
             {
                 localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
             }
@@ -1542,7 +1528,7 @@ if (password != null) localVarQueryParams.Add("password", Configuration.ApiClien
                 localVarPostBody = body; // byte array
             }
 
-            
+
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath,
                 Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
@@ -1566,9 +1552,9 @@ if (password != null) localVarQueryParams.Add("password", Configuration.ApiClien
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="username">name that need to be deleted</param>
-        /// <param name="body">Updated user object (optional)</param>
+        /// <param name="body">Updated user object</param>
         /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task UpdateUserAsync (string username, User body = null)
+        public async System.Threading.Tasks.Task UpdateUserAsync (string username, User body)
         {
              await UpdateUserAsyncWithHttpInfo(username, body);
 
@@ -1579,16 +1565,18 @@ if (password != null) localVarQueryParams.Add("password", Configuration.ApiClien
         /// </summary>
         /// <exception cref="IO.Swagger.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="username">name that need to be deleted</param>
-        /// <param name="body">Updated user object (optional)</param>
+        /// <param name="body">Updated user object</param>
         /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateUserAsyncWithHttpInfo (string username, User body = null)
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateUserAsyncWithHttpInfo (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");
-            
+            if (username == null)
+                throw new ApiException(400, "Missing required parameter 'username' when calling UserApi->UpdateUser");
+            // verify the required parameter 'body' is set
+            if (body == null)
+                throw new ApiException(400, "Missing required parameter 'body' when calling UserApi->UpdateUser");
 
             var localVarPath = "/user/{username}";
-
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new Dictionary<String, String>();
             var localVarHeaderParams = new Dictionary<String, String>(Configuration.DefaultHeader);
@@ -1598,13 +1586,13 @@ if (password != null) localVarQueryParams.Add("password", Configuration.ApiClien
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                
             };
             String localVarHttpContentType = Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
             // to determine the Accept header
             String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json", "application/xml"
+                "application/xml", 
+                "application/json"
             };
             String localVarHttpHeaderAccept = Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
             if (localVarHttpHeaderAccept != null)
@@ -1614,7 +1602,7 @@ if (password != null) localVarQueryParams.Add("password", Configuration.ApiClien
             // e.g. /pet/{petId}.{format} becomes /pet/{petId}.json
             localVarPathParams.Add("format", "json");
             if (username != null) localVarPathParams.Add("username", Configuration.ApiClient.ParameterToString(username)); // path parameter
-                                                if (body.GetType() != typeof(byte[]))
+            if (body.GetType() != typeof(byte[]))
             {
                 localVarPostBody = Configuration.ApiClient.Serialize(body); // http body (model) parameter
             }
@@ -1641,5 +1629,6 @@ if (password != null) localVarQueryParams.Add("password", Configuration.ApiClien
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
+
     }
 }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs
index ec9c793b7d3..42299503d2a 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs
@@ -103,7 +103,9 @@ namespace IO.Swagger.Client
 
             // 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 or byte[]) parameter
             {
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/ApiResponse.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/ApiResponse.cs
new file mode 100644
index 00000000000..de8b24e69e9
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/ApiResponse.cs
@@ -0,0 +1,142 @@
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace IO.Swagger.Model
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [DataContract]
+    public partial class ApiResponse :  IEquatable<ApiResponse>
+    { 
+    
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApiResponse" /> class.
+        /// Initializes a new instance of the <see cref="ApiResponse" />class.
+        /// </summary>
+        /// <param name="Code">Code.</param>
+        /// <param name="Type">Type.</param>
+        /// <param name="Message">Message.</param>
+
+        public ApiResponse(int? Code = null, string Type = null, string Message = null)
+        {
+            this.Code = Code;
+            this.Type = Type;
+            this.Message = Message;
+            
+        }
+
+    
+        /// <summary>
+        /// Gets or Sets Code
+        /// </summary>
+        [DataMember(Name="code", EmitDefaultValue=false)]
+        public int? Code { get; set; }
+    
+        /// <summary>
+        /// Gets or Sets Type
+        /// </summary>
+        [DataMember(Name="type", EmitDefaultValue=false)]
+        public string Type { get; set; }
+    
+        /// <summary>
+        /// Gets or Sets Message
+        /// </summary>
+        [DataMember(Name="message", EmitDefaultValue=false)]
+        public string Message { get; set; }
+    
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class ApiResponse {\n");
+            sb.Append("  Code: ").Append(Code).Append("\n");
+            sb.Append("  Type: ").Append(Type).Append("\n");
+            sb.Append("  Message: ").Append(Message).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="obj">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object obj)
+        {
+            // credit: http://stackoverflow.com/a/10454552/677735
+            return this.Equals(obj as ApiResponse);
+        }
+
+        /// <summary>
+        /// Returns true if ApiResponse instances are equal
+        /// </summary>
+        /// <param name="other">Instance of ApiResponse to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(ApiResponse other)
+        {
+            // credit: http://stackoverflow.com/a/10454552/677735
+            if (other == null)
+                return false;
+
+            return 
+                (
+                    this.Code == other.Code ||
+                    this.Code != null &&
+                    this.Code.Equals(other.Code)
+                ) && 
+                (
+                    this.Type == other.Type ||
+                    this.Type != null &&
+                    this.Type.Equals(other.Type)
+                ) && 
+                (
+                    this.Message == other.Message ||
+                    this.Message != null &&
+                    this.Message.Equals(other.Message)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            // credit: http://stackoverflow.com/a/263416/677735
+            unchecked // Overflow is fine, just wrap
+            {
+                int hash = 41;
+                // Suitable nullity checks etc, of course :)
+                if (this.Code != null)
+                    hash = hash * 59 + this.Code.GetHashCode();
+                if (this.Type != null)
+                    hash = hash * 59 + this.Type.GetHashCode();
+                if (this.Message != null)
+                    hash = hash * 59 + this.Message.GetHashCode();
+                return hash;
+            }
+        }
+
+    }
+}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Cat.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Cat.cs
index 7fe58ce7f38..3b05bcc0338 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Cat.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Cat.cs
@@ -62,7 +62,7 @@ namespace IO.Swagger.Model
             var sb = new StringBuilder();
             sb.Append("class Cat {\n");
             sb.Append("  ClassName: ").Append(ClassName).Append("\n");
-sb.Append("  Declawed: ").Append(Declawed).Append("\n");
+            sb.Append("  Declawed: ").Append(Declawed).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Category.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Category.cs
index ded3e525318..f5dd0154fbc 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Category.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Category.cs
@@ -54,7 +54,7 @@ namespace IO.Swagger.Model
             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("  Name: ").Append(Name).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Dog.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Dog.cs
index 5e40e848243..4d753963816 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Dog.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Dog.cs
@@ -62,7 +62,7 @@ namespace IO.Swagger.Model
             var sb = new StringBuilder();
             sb.Append("class Dog {\n");
             sb.Append("  ClassName: ").Append(ClassName).Append("\n");
-sb.Append("  Breed: ").Append(Breed).Append("\n");
+            sb.Append("  Breed: ").Append(Breed).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/FormatTest.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/FormatTest.cs
index 4985f365053..6d50426bad0 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/FormatTest.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/FormatTest.cs
@@ -33,8 +33,9 @@ namespace IO.Swagger.Model
         /// <param name="Binary">Binary.</param>
         /// <param name="Date">Date.</param>
         /// <param name="DateTime">DateTime.</param>
+        /// <param name="Password">Password.</param>
 
-        public FormatTest(int? Integer = null, int? Int32 = null, long? Int64 = null, double? Number = null, float? _Float = null, double? _Double = null, string _String = null, byte[] _Byte = null, byte[] Binary = null, DateTime? Date = null, string DateTime = null)
+        public FormatTest(int? Integer = null, int? Int32 = null, long? Int64 = null, double? Number = null, float? _Float = null, double? _Double = null, string _String = null, byte[] _Byte = null, byte[] Binary = null, DateTime? Date = null, DateTime? DateTime = null, string Password = null)
         {
             // to ensure "Number" is required (not null)
             if (Number == null)
@@ -55,6 +56,7 @@ namespace IO.Swagger.Model
             this.Binary = Binary;
             this.Date = Date;
             this.DateTime = DateTime;
+            this.Password = Password;
             
         }
 
@@ -123,7 +125,13 @@ namespace IO.Swagger.Model
         /// Gets or Sets DateTime
         /// </summary>
         [DataMember(Name="dateTime", EmitDefaultValue=false)]
-        public string DateTime { get; set; }
+        public DateTime? DateTime { get; set; }
+    
+        /// <summary>
+        /// Gets or Sets Password
+        /// </summary>
+        [DataMember(Name="password", EmitDefaultValue=false)]
+        public string Password { get; set; }
     
         /// <summary>
         /// Returns the string presentation of the object
@@ -134,16 +142,17 @@ namespace IO.Swagger.Model
             var sb = new StringBuilder();
             sb.Append("class FormatTest {\n");
             sb.Append("  Integer: ").Append(Integer).Append("\n");
-sb.Append("  Int32: ").Append(Int32).Append("\n");
-sb.Append("  Int64: ").Append(Int64).Append("\n");
-sb.Append("  Number: ").Append(Number).Append("\n");
-sb.Append("  _Float: ").Append(_Float).Append("\n");
-sb.Append("  _Double: ").Append(_Double).Append("\n");
-sb.Append("  _String: ").Append(_String).Append("\n");
-sb.Append("  _Byte: ").Append(_Byte).Append("\n");
-sb.Append("  Binary: ").Append(Binary).Append("\n");
-sb.Append("  Date: ").Append(Date).Append("\n");
-sb.Append("  DateTime: ").Append(DateTime).Append("\n");
+            sb.Append("  Int32: ").Append(Int32).Append("\n");
+            sb.Append("  Int64: ").Append(Int64).Append("\n");
+            sb.Append("  Number: ").Append(Number).Append("\n");
+            sb.Append("  _Float: ").Append(_Float).Append("\n");
+            sb.Append("  _Double: ").Append(_Double).Append("\n");
+            sb.Append("  _String: ").Append(_String).Append("\n");
+            sb.Append("  _Byte: ").Append(_Byte).Append("\n");
+            sb.Append("  Binary: ").Append(Binary).Append("\n");
+            sb.Append("  Date: ").Append(Date).Append("\n");
+            sb.Append("  DateTime: ").Append(DateTime).Append("\n");
+            sb.Append("  Password: ").Append(Password).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -234,6 +243,11 @@ sb.Append("  DateTime: ").Append(DateTime).Append("\n");
                     this.DateTime == other.DateTime ||
                     this.DateTime != null &&
                     this.DateTime.Equals(other.DateTime)
+                ) && 
+                (
+                    this.Password == other.Password ||
+                    this.Password != null &&
+                    this.Password.Equals(other.Password)
                 );
         }
 
@@ -270,6 +284,8 @@ sb.Append("  DateTime: ").Append(DateTime).Append("\n");
                     hash = hash * 59 + this.Date.GetHashCode();
                 if (this.DateTime != null)
                     hash = hash * 59 + this.DateTime.GetHashCode();
+                if (this.Password != null)
+                    hash = hash * 59 + this.Password.GetHashCode();
                 return hash;
             }
         }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/InlineResponse200.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/InlineResponse200.cs
index e58dd38354d..e98ca7342cc 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/InlineResponse200.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/InlineResponse200.cs
@@ -47,14 +47,14 @@ namespace IO.Swagger.Model
         /// Initializes a new instance of the <see cref="InlineResponse200" /> class.
         /// Initializes a new instance of the <see cref="InlineResponse200" />class.
         /// </summary>
-        /// <param name="Tags">Tags.</param>
+        /// <param name="PhotoUrls">PhotoUrls.</param>
+        /// <param name="Name">Name.</param>
         /// <param name="Id">Id (required).</param>
         /// <param name="Category">Category.</param>
+        /// <param name="Tags">Tags.</param>
         /// <param name="Status">pet status in the store.</param>
-        /// <param name="Name">Name.</param>
-        /// <param name="PhotoUrls">PhotoUrls.</param>
 
-        public InlineResponse200(List<Tag> Tags = null, long? Id = null, Object Category = null, StatusEnum? Status = null, string Name = null, List<string> PhotoUrls = null)
+        public InlineResponse200(List<string> PhotoUrls = null, string Name = null, long? Id = null, Object Category = null, List<Tag> Tags = null, StatusEnum? Status = null)
         {
             // to ensure "Id" is required (not null)
             if (Id == null)
@@ -65,20 +65,26 @@ namespace IO.Swagger.Model
             {
                 this.Id = Id;
             }
-            this.Tags = Tags;
-            this.Category = Category;
-            this.Status = Status;
-            this.Name = Name;
             this.PhotoUrls = PhotoUrls;
+            this.Name = Name;
+            this.Category = Category;
+            this.Tags = Tags;
+            this.Status = Status;
             
         }
 
     
         /// <summary>
-        /// Gets or Sets Tags
+        /// Gets or Sets PhotoUrls
         /// </summary>
-        [DataMember(Name="tags", EmitDefaultValue=false)]
-        public List<Tag> Tags { get; set; }
+        [DataMember(Name="photoUrls", EmitDefaultValue=false)]
+        public List<string> PhotoUrls { get; set; }
+    
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        [DataMember(Name="name", EmitDefaultValue=false)]
+        public string Name { get; set; }
     
         /// <summary>
         /// Gets or Sets Id
@@ -93,16 +99,10 @@ namespace IO.Swagger.Model
         public Object Category { get; set; }
     
         /// <summary>
-        /// Gets or Sets Name
+        /// Gets or Sets Tags
         /// </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; }
+        [DataMember(Name="tags", EmitDefaultValue=false)]
+        public List<Tag> Tags { get; set; }
     
         /// <summary>
         /// Returns the string presentation of the object
@@ -112,12 +112,12 @@ namespace IO.Swagger.Model
         {
             var sb = new StringBuilder();
             sb.Append("class InlineResponse200 {\n");
+            sb.Append("  PhotoUrls: ").Append(PhotoUrls).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  Category: ").Append(Category).Append("\n");
             sb.Append("  Tags: ").Append(Tags).Append("\n");
-sb.Append("  Id: ").Append(Id).Append("\n");
-sb.Append("  Category: ").Append(Category).Append("\n");
-sb.Append("  Status: ").Append(Status).Append("\n");
-sb.Append("  Name: ").Append(Name).Append("\n");
-sb.Append("  PhotoUrls: ").Append(PhotoUrls).Append("\n");
+            sb.Append("  Status: ").Append(Status).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -155,9 +155,14 @@ sb.Append("  PhotoUrls: ").Append(PhotoUrls).Append("\n");
 
             return 
                 (
-                    this.Tags == other.Tags ||
-                    this.Tags != null &&
-                    this.Tags.SequenceEqual(other.Tags)
+                    this.PhotoUrls == other.PhotoUrls ||
+                    this.PhotoUrls != null &&
+                    this.PhotoUrls.SequenceEqual(other.PhotoUrls)
+                ) && 
+                (
+                    this.Name == other.Name ||
+                    this.Name != null &&
+                    this.Name.Equals(other.Name)
                 ) && 
                 (
                     this.Id == other.Id ||
@@ -169,20 +174,15 @@ sb.Append("  PhotoUrls: ").Append(PhotoUrls).Append("\n");
                     this.Category != null &&
                     this.Category.Equals(other.Category)
                 ) && 
+                (
+                    this.Tags == other.Tags ||
+                    this.Tags != null &&
+                    this.Tags.SequenceEqual(other.Tags)
+                ) && 
                 (
                     this.Status == other.Status ||
                     this.Status != null &&
                     this.Status.Equals(other.Status)
-                ) && 
-                (
-                    this.Name == other.Name ||
-                    this.Name != null &&
-                    this.Name.Equals(other.Name)
-                ) && 
-                (
-                    this.PhotoUrls == other.PhotoUrls ||
-                    this.PhotoUrls != null &&
-                    this.PhotoUrls.SequenceEqual(other.PhotoUrls)
                 );
         }
 
@@ -197,18 +197,18 @@ sb.Append("  PhotoUrls: ").Append(PhotoUrls).Append("\n");
             {
                 int hash = 41;
                 // Suitable nullity checks etc, of course :)
-                if (this.Tags != null)
-                    hash = hash * 59 + this.Tags.GetHashCode();
+                if (this.PhotoUrls != null)
+                    hash = hash * 59 + this.PhotoUrls.GetHashCode();
+                if (this.Name != null)
+                    hash = hash * 59 + this.Name.GetHashCode();
                 if (this.Id != null)
                     hash = hash * 59 + this.Id.GetHashCode();
                 if (this.Category != null)
                     hash = hash * 59 + this.Category.GetHashCode();
+                if (this.Tags != null)
+                    hash = hash * 59 + this.Tags.GetHashCode();
                 if (this.Status != null)
                     hash = hash * 59 + this.Status.GetHashCode();
-                if (this.Name != null)
-                    hash = hash * 59 + this.Name.GetHashCode();
-                if (this.PhotoUrls != null)
-                    hash = hash * 59 + this.PhotoUrls.GetHashCode();
                 return hash;
             }
         }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Name.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Name.cs
index 663e9d88e4c..f9138390e3e 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Name.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Name.cs
@@ -60,7 +60,7 @@ namespace IO.Swagger.Model
             var sb = new StringBuilder();
             sb.Append("class Name {\n");
             sb.Append("  _Name: ").Append(_Name).Append("\n");
-sb.Append("  SnakeCase: ").Append(SnakeCase).Append("\n");
+            sb.Append("  SnakeCase: ").Append(SnakeCase).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs
index 7942042e0e0..78276f0e313 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs
@@ -47,19 +47,29 @@ namespace IO.Swagger.Model
         /// Initializes a new instance of the <see cref="Order" /> class.
         /// Initializes a new instance of the <see cref="Order" />class.
         /// </summary>
+        /// <param name="Id">Id.</param>
         /// <param name="PetId">PetId.</param>
         /// <param name="Quantity">Quantity.</param>
         /// <param name="ShipDate">ShipDate.</param>
         /// <param name="Status">Order Status.</param>
-        /// <param name="Complete">Complete.</param>
+        /// <param name="Complete">Complete (default to false).</param>
 
-        public Order(long? PetId = null, int? Quantity = null, DateTime? ShipDate = null, StatusEnum? Status = null, bool? Complete = null)
+        public Order(long? Id = null, long? PetId = null, int? Quantity = null, DateTime? ShipDate = null, StatusEnum? Status = null, bool? Complete = null)
         {
+            this.Id = Id;
             this.PetId = PetId;
             this.Quantity = Quantity;
             this.ShipDate = ShipDate;
             this.Status = Status;
-            this.Complete = Complete;
+            // use default value if no "Complete" provided
+            if (Complete == null)
+            {
+                this.Complete = false;
+            }
+            else
+            {
+                this.Complete = Complete;
+            }
             
         }
 
@@ -68,7 +78,7 @@ namespace IO.Swagger.Model
         /// Gets or Sets Id
         /// </summary>
         [DataMember(Name="id", EmitDefaultValue=false)]
-        public long? Id { get; private set; }
+        public long? Id { get; set; }
     
         /// <summary>
         /// Gets or Sets PetId
@@ -103,11 +113,11 @@ namespace IO.Swagger.Model
             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("  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/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs
index 534dd6fd42d..a878f83be04 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs
@@ -121,11 +121,11 @@ namespace IO.Swagger.Model
             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("  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/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Tag.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Tag.cs
index 84b6091bf7a..6824a99836c 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Tag.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Tag.cs
@@ -54,7 +54,7 @@ namespace IO.Swagger.Model
             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("  Name: ").Append(Name).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/User.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/User.cs
index 3563543b81c..d8b8c491a18 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/User.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/User.cs
@@ -103,13 +103,13 @@ namespace IO.Swagger.Model
             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("  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/csharp/SwaggerClientTest/SwaggerClientTest.csproj b/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.csproj
index 67c8e73b6e5..7b777ba6a27 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.csproj
+++ b/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.csproj
@@ -70,6 +70,7 @@
     <Compile Include="Lib\SwaggerClient\src\main\csharp\IO\Swagger\Model\Cat.cs" />
     <Compile Include="Lib\SwaggerClient\src\main\csharp\IO\Swagger\Model\Dog.cs" />
     <Compile Include="Lib\SwaggerClient\src\main\csharp\IO\Swagger\Model\FormatTest.cs" />
+    <Compile Include="Lib\SwaggerClient\src\main\csharp\IO\Swagger\Model\ApiResponse.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs b/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs
index d261de4844c..0b91bb4ae32 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs
@@ -1,12 +1,28 @@
 <Properties StartupItem="SwaggerClientTest.csproj">
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Name.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="TestPet.cs">
     <Files>
-      <File FileName="TestPet.cs" Line="1" Column="1" />
-      <File FileName="TestOrder.cs" Line="1" Column="1" />
-      <File FileName="Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Cat.cs" Line="1" Column="1" />
-      <File FileName="Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Name.cs" Line="18" Column="50" />
+      <File FileName="TestPet.cs" Line="29" Column="39" />
+      <File FileName="TestOrder.cs" Line="99" Column="6" />
+      <File FileName="Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs" Line="711" Column="1" />
     </Files>
+    <Pads>
+      <Pad Id="MonoDevelop.NUnit.TestPad">
+        <State name="__root__">
+          <Node name="SwaggerClientTest" expanded="True">
+            <Node name="SwaggerClientTest" expanded="True">
+              <Node name="SwaggerClientTest" expanded="True">
+                <Node name="TestPet" expanded="True">
+                  <Node name="TestPet" expanded="True">
+                    <Node name="TestGetPetByIdAsyncWithHttpInfo" selected="True" />
+                  </Node>
+                </Node>
+              </Node>
+            </Node>
+          </Node>
+        </State>
+      </Pad>
+    </Pads>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
     <BreakpointStore />
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/TestOrder.cs b/samples/client/petstore/csharp/SwaggerClientTest/TestOrder.cs
index f66e34a5e9e..6af386ff2ba 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/TestOrder.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/TestOrder.cs
@@ -73,6 +73,9 @@ namespace SwaggerClientTest.TestOrder
 				
 		}
 
+		/* comment out the test case as the method is not defined in original petstore spec
+		 * we will re-enable this after updating the petstore server
+		 * 
 		/// <summary>
 		/// Test GetInvetoryInObject
 		/// </summary>
@@ -93,7 +96,7 @@ namespace SwaggerClientTest.TestOrder
 				Assert.IsInstanceOf (typeof(int?), Int32.Parse(entry.Value));
 			}
 
-		}
+		}*/
 
 	}
 }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/TestPet.cs b/samples/client/petstore/csharp/SwaggerClientTest/TestPet.cs
index 0b04ca72b05..25d2255542a 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/TestPet.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/TestPet.cs
@@ -158,6 +158,9 @@ namespace SwaggerClientTest.TestPet
 
 		}
 
+		/* comment out the test case as the method is not defined in original petstore spec
+		 * we will re-enable this after updating the petstore server
+		 * 
 		/// <summary>
 		/// Test GetPetByIdInObject
 		/// </summary>
@@ -187,8 +190,11 @@ namespace SwaggerClientTest.TestPet
 			Assert.AreEqual (56, (int)category ["id"]);
 			Assert.AreEqual ("sample category name2", (string) category["name"]);
 
-		}
+		}*/
 
+		/* comment out the test case as the method is not defined in original petstore spec
+		* we will re-enable this after updating the petstore server
+		* 
 		/// <summary>
 		/// Test GetPetByIdWithByteArray
 		/// </summary>
@@ -201,8 +207,11 @@ namespace SwaggerClientTest.TestPet
 			PetApi petApi = new PetApi (c1);
 			byte[] response = petApi.PetPetIdtestingByteArraytrueGet (petId);
 			Assert.IsInstanceOf<byte[]> (response, "Response is byte array");
-		}
+		}*/
 
+		/* comment out the test case as the method is not defined in original petstore spec
+		* we will re-enable this after updating the petstore server
+		* 
 		/// <summary>
 		/// Test AddPetUsingByteArray
 		/// </summary>
@@ -216,7 +225,7 @@ namespace SwaggerClientTest.TestPet
 			Pet p = createPet ();
 			byte[] petByteArray = GetBytes ((string)petApi.Configuration.ApiClient.Serialize (p));
 			petApi.AddPetUsingByteArray (petByteArray);
-		}
+		}*/
 
 		/// <summary>
 		/// Test UpdatePetWithForm
@@ -225,7 +234,7 @@ namespace SwaggerClientTest.TestPet
 		public void TestUpdatePetWithForm ()
 		{
 			PetApi petApi = new PetApi ();
-			petApi.UpdatePetWithForm (petId.ToString(), "new form name", "pending");
+			petApi.UpdatePetWithForm (petId, "new form name", "pending");
 
 			Pet response = petApi.GetPetById (petId);
 			Assert.IsInstanceOf<Pet> (response, "Response is a Pet");
@@ -239,7 +248,7 @@ namespace SwaggerClientTest.TestPet
 			Assert.AreEqual (56, response.Category.Id);
 
 			// test optional parameter
-			petApi.UpdatePetWithForm (petId.ToString(), "new form name2");
+			petApi.UpdatePetWithForm (petId, "new form name2");
 			Pet response2 = petApi.GetPetById (petId);
 			Assert.AreEqual ("new form name2", response2.Name);
 		}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.csproj.FilesWrittenAbsolute.txt b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.csproj.FilesWrittenAbsolute.txt
index 323cad108c6..0991d15f118 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.csproj.FilesWrittenAbsolute.txt
+++ b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.csproj.FilesWrittenAbsolute.txt
@@ -1,9 +1,9 @@
 /Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttribute.cs
 /Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.swagger-logo.png
+/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/Newtonsoft.Json.dll
+/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/nunit.framework.dll
+/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/RestSharp.dll
 /Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll.mdb
 /Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll
 /Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll
 /Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll.mdb
-/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/Newtonsoft.Json.dll
-/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/nunit.framework.dll
-/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/RestSharp.dll
diff --git a/samples/client/petstore/dart/.gitignore b/samples/client/petstore/dart/.gitignore
new file mode 100644
index 00000000000..7c280441649
--- /dev/null
+++ b/samples/client/petstore/dart/.gitignore
@@ -0,0 +1,27 @@
+# See https://www.dartlang.org/tools/private-files.html
+
+# Files and directories created by pub
+.buildlog
+.packages
+.project
+.pub/
+build/
+**/packages/
+
+# Files created by dart2js
+# (Most Dart developers will use pub build to compile Dart, use/modify these 
+#  rules if you intend to use dart2js directly
+#  Convention is to use extension '.dart.js' for Dart compiled to Javascript to
+#  differentiate from explicit Javascript files)
+*.dart.js
+*.part.js
+*.js.deps
+*.js.map
+*.info.json
+
+# Directory created by dartdoc
+doc/api/
+
+# Don't commit pubspec lock file 
+# (Library packages only! Remove pattern if developing an application package)
+pubspec.lock
diff --git a/samples/client/petstore/dart/git_push.sh b/samples/client/petstore/dart/git_push.sh
new file mode 100644
index 00000000000..1a36388db02
--- /dev/null
+++ b/samples/client/petstore/dart/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="YOUR_GIT_USR_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="YOUR_GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/client/petstore/dart/lib/api.dart b/samples/client/petstore/dart/lib/api.dart
index 3dba4e66eef..c296270af64 100644
--- a/samples/client/petstore/dart/lib/api.dart
+++ b/samples/client/petstore/dart/lib/api.dart
@@ -16,12 +16,14 @@ part 'auth/api_key_auth.dart';
 part 'auth/oauth.dart';
 part 'auth/http_basic_auth.dart';
 
-part 'api/user_api.dart';
-part 'api/store_api.dart';
 part 'api/pet_api.dart';
+part 'api/store_api.dart';
+part 'api/user_api.dart';
 
-part 'model/user.dart';
+part 'model/api_response.dart';
 part 'model/category.dart';
+part 'model/order.dart';
 part 'model/pet.dart';
 part 'model/tag.dart';
-part 'model/order.dart';
+part 'model/user.dart';
+
diff --git a/samples/client/petstore/dart/lib/api/pet_api.dart b/samples/client/petstore/dart/lib/api/pet_api.dart
index b800b535d84..b6c807e72f0 100644
--- a/samples/client/petstore/dart/lib/api/pet_api.dart
+++ b/samples/client/petstore/dart/lib/api/pet_api.dart
@@ -1,7 +1,6 @@
 part of api;
 
 
-
 class PetApi {
   String basePath = "http://petstore.swagger.io/v2";
   ApiClient apiClient = ApiClient.defaultApiClient;
@@ -12,59 +11,15 @@ class PetApi {
     }
   }
 
-  
-  /// Update an existing pet
-  ///
-  /// 
-  Future updatePet(Pet body) {
-    Object postBody = body;
-    
-
-    // create path and map variables
-    String path = "/pet".replaceAll("{format}","json");
-
-    // query params
-    Map<String, String> queryParams = {};
-    Map<String, String> headerParams = {};
-    Map<String, String> formParams = {};
-    
-    
-
-    List<String> contentTypes = ["application/json","application/xml"];
-
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-    List<String> authNames = ["petstore_auth"];
-
-    if(contentType.startsWith("multipart/form-data")) {
-      bool hasFields = false;
-      MultipartRequest mp = new MultipartRequest(null, null);
-      
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      
-    }
-
-    return apiClient.invokeAPI(basePath, path, 'PUT', queryParams, postBody, headerParams, formParams, contentType, authNames).then((response) {
-      if(response.statusCode >= 400) {
-        throw new ApiException(response.statusCode, response.body);
-      }
-      else if(response.body != null){
-        return ;
-      }
-      else {
-        return ;
-      }
-    });
-  }
-  
   /// Add a new pet to the store
   ///
   /// 
   Future addPet(Pet body) {
     Object postBody = body;
-    
+    // verify required params are set
+    if() {
+       throw new ApiException(400, "missing required params");
+    }
 
     // create path and map variables
     String path = "/pet".replaceAll("{format}","json");
@@ -73,9 +28,7 @@ class PetApi {
     Map<String, String> queryParams = {};
     Map<String, String> headerParams = {};
     Map<String, String> formParams = {};
-    
-    
-
+        
     List<String> contentTypes = ["application/json","application/xml"];
 
     String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
@@ -89,8 +42,7 @@ class PetApi {
         postBody = mp;
     }
     else {
-      
-    }
+          }
 
     return apiClient.invokeAPI(basePath, path, 'POST', queryParams, postBody, headerParams, formParams, contentType, authNames).then((response) {
       if(response.statusCode >= 400) {
@@ -104,13 +56,64 @@ class PetApi {
       }
     });
   }
-  
+  /// Deletes a pet
+  ///
+  /// 
+  Future deletePet(int petId, String apiKey) {
+    Object postBody = null;
+    // verify required params are set
+    if(    // verify required params are set
+    if() {
+       throw new ApiException(400, "missing required params");
+    }) {
+       throw new ApiException(400, "missing required params");
+    }
+
+    // create path and map variables
+    String path = "/pet/{petId}".replaceAll("{format}","json").replaceAll("{" + "petId" + "}", petId.toString());
+
+    // query params
+    Map<String, String> queryParams = {};
+    Map<String, String> headerParams = {};
+    Map<String, String> formParams = {};
+        headerParams["api_key"] = apiKey;
+
+    List<String> contentTypes = [];
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    List<String> authNames = ["petstore_auth"];
+
+    if(contentType.startsWith("multipart/form-data")) {
+      bool hasFields = false;
+      MultipartRequest mp = new MultipartRequest(null, null);
+      
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+          }
+
+    return apiClient.invokeAPI(basePath, path, 'DELETE', queryParams, postBody, headerParams, formParams, contentType, authNames).then((response) {
+      if(response.statusCode >= 400) {
+        throw new ApiException(response.statusCode, response.body);
+      }
+      else if(response.body != null){
+        return ;
+      }
+      else {
+        return ;
+      }
+    });
+  }
   /// Finds Pets by status
   ///
-  /// Multiple status values can be provided with comma seperated strings
+  /// Multiple status values can be provided with comma separated strings
   Future<List<Pet>> findPetsByStatus(List<String> status) {
     Object postBody = null;
-    
+    // verify required params are set
+    if() {
+       throw new ApiException(400, "missing required params");
+    }
 
     // create path and map variables
     String path = "/pet/findByStatus".replaceAll("{format}","json");
@@ -122,8 +125,6 @@ class PetApi {
     if("null" != status)
       queryParams["status"] = status is List ? status.join(',') : status;
     
-    
-
     List<String> contentTypes = [];
 
     String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
@@ -137,8 +138,7 @@ class PetApi {
         postBody = mp;
     }
     else {
-      
-    }
+          }
 
     return apiClient.invokeAPI(basePath, path, 'GET', queryParams, postBody, headerParams, formParams, contentType, authNames).then((response) {
       if(response.statusCode >= 400) {
@@ -152,13 +152,15 @@ class PetApi {
       }
     });
   }
-  
   /// Finds Pets by tags
   ///
-  /// Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+  /// Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
   Future<List<Pet>> findPetsByTags(List<String> tags) {
     Object postBody = null;
-    
+    // verify required params are set
+    if() {
+       throw new ApiException(400, "missing required params");
+    }
 
     // create path and map variables
     String path = "/pet/findByTags".replaceAll("{format}","json");
@@ -170,8 +172,6 @@ class PetApi {
     if("null" != tags)
       queryParams["tags"] = tags is List ? tags.join(',') : tags;
     
-    
-
     List<String> contentTypes = [];
 
     String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
@@ -185,8 +185,7 @@ class PetApi {
         postBody = mp;
     }
     else {
-      
-    }
+          }
 
     return apiClient.invokeAPI(basePath, path, 'GET', queryParams, postBody, headerParams, formParams, contentType, authNames).then((response) {
       if(response.statusCode >= 400) {
@@ -200,13 +199,15 @@ class PetApi {
       }
     });
   }
-  
   /// Find pet by ID
   ///
-  /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+  /// Returns a single pet
   Future<Pet> getPetById(int petId) {
     Object postBody = null;
-    
+    // verify required params are set
+    if() {
+       throw new ApiException(400, "missing required params");
+    }
 
     // create path and map variables
     String path = "/pet/{petId}".replaceAll("{format}","json").replaceAll("{" + "petId" + "}", petId.toString());
@@ -215,13 +216,11 @@ class PetApi {
     Map<String, String> queryParams = {};
     Map<String, String> headerParams = {};
     Map<String, String> formParams = {};
-    
-    
-
+        
     List<String> contentTypes = [];
 
     String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-    List<String> authNames = ["petstore_auth", "api_key"];
+    List<String> authNames = ["api_key"];
 
     if(contentType.startsWith("multipart/form-data")) {
       bool hasFields = false;
@@ -231,8 +230,7 @@ class PetApi {
         postBody = mp;
     }
     else {
-      
-    }
+          }
 
     return apiClient.invokeAPI(basePath, path, 'GET', queryParams, postBody, headerParams, formParams, contentType, authNames).then((response) {
       if(response.statusCode >= 400) {
@@ -246,13 +244,66 @@ class PetApi {
       }
     });
   }
-  
+  /// Update an existing pet
+  ///
+  /// 
+  Future updatePet(Pet body) {
+    Object postBody = body;
+    // verify required params are set
+    if() {
+       throw new ApiException(400, "missing required params");
+    }
+
+    // create path and map variables
+    String path = "/pet".replaceAll("{format}","json");
+
+    // query params
+    Map<String, String> queryParams = {};
+    Map<String, String> headerParams = {};
+    Map<String, String> formParams = {};
+        
+    List<String> contentTypes = ["application/json","application/xml"];
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    List<String> authNames = ["petstore_auth"];
+
+    if(contentType.startsWith("multipart/form-data")) {
+      bool hasFields = false;
+      MultipartRequest mp = new MultipartRequest(null, null);
+      
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+          }
+
+    return apiClient.invokeAPI(basePath, path, 'PUT', queryParams, postBody, headerParams, formParams, contentType, authNames).then((response) {
+      if(response.statusCode >= 400) {
+        throw new ApiException(response.statusCode, response.body);
+      }
+      else if(response.body != null){
+        return ;
+      }
+      else {
+        return ;
+      }
+    });
+  }
   /// Updates a pet in the store with form data
   ///
   /// 
-  Future updatePetWithForm(String petId, String name, String status) {
+  Future updatePetWithForm(int petId, String name, String status) {
     Object postBody = null;
-    
+    // verify required params are set
+    if(    // verify required params are set
+    if(    // verify required params are set
+    if() {
+       throw new ApiException(400, "missing required params");
+    }) {
+       throw new ApiException(400, "missing required params");
+    }) {
+       throw new ApiException(400, "missing required params");
+    }
 
     // create path and map variables
     String path = "/pet/{petId}".replaceAll("{format}","json").replaceAll("{" + "petId" + "}", petId.toString());
@@ -261,9 +312,7 @@ class PetApi {
     Map<String, String> queryParams = {};
     Map<String, String> headerParams = {};
     Map<String, String> formParams = {};
-    
-    
-
+        
     List<String> contentTypes = ["application/x-www-form-urlencoded"];
 
     String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
@@ -289,9 +338,8 @@ class PetApi {
     else {
       if (name != null)
         formParams['name'] = apiClient.parameterToString(name);
-      if (status != null)
+if (status != null)
         formParams['status'] = apiClient.parameterToString(status);
-      
     }
 
     return apiClient.invokeAPI(basePath, path, 'POST', queryParams, postBody, headerParams, formParams, contentType, authNames).then((response) {
@@ -306,60 +354,21 @@ class PetApi {
       }
     });
   }
-  
-  /// Deletes a pet
-  ///
-  /// 
-  Future deletePet(int petId, String apiKey) {
-    Object postBody = null;
-    
-
-    // create path and map variables
-    String path = "/pet/{petId}".replaceAll("{format}","json").replaceAll("{" + "petId" + "}", petId.toString());
-
-    // query params
-    Map<String, String> queryParams = {};
-    Map<String, String> headerParams = {};
-    Map<String, String> formParams = {};
-    
-    headerParams["api_key"] = apiKey;
-    
-
-    List<String> contentTypes = [];
-
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-    List<String> authNames = ["petstore_auth"];
-
-    if(contentType.startsWith("multipart/form-data")) {
-      bool hasFields = false;
-      MultipartRequest mp = new MultipartRequest(null, null);
-      
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      
-    }
-
-    return apiClient.invokeAPI(basePath, path, 'DELETE', queryParams, postBody, headerParams, formParams, contentType, authNames).then((response) {
-      if(response.statusCode >= 400) {
-        throw new ApiException(response.statusCode, response.body);
-      }
-      else if(response.body != null){
-        return ;
-      }
-      else {
-        return ;
-      }
-    });
-  }
-  
   /// uploads an image
   ///
   /// 
-  Future uploadFile(int petId, String additionalMetadata, MultipartFile file) {
+  Future<ApiResponse> uploadFile(int petId, String additionalMetadata, MultipartFile file) {
     Object postBody = null;
-    
+    // verify required params are set
+    if(    // verify required params are set
+    if(    // verify required params are set
+    if() {
+       throw new ApiException(400, "missing required params");
+    }) {
+       throw new ApiException(400, "missing required params");
+    }) {
+       throw new ApiException(400, "missing required params");
+    }
 
     // create path and map variables
     String path = "/pet/{petId}/uploadImage".replaceAll("{format}","json").replaceAll("{" + "petId" + "}", petId.toString());
@@ -368,9 +377,7 @@ class PetApi {
     Map<String, String> queryParams = {};
     Map<String, String> headerParams = {};
     Map<String, String> formParams = {};
-    
-    
-
+        
     List<String> contentTypes = ["multipart/form-data"];
 
     String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
@@ -397,8 +404,7 @@ class PetApi {
     else {
       if (additionalMetadata != null)
         formParams['additionalMetadata'] = apiClient.parameterToString(additionalMetadata);
-      
-      
+
     }
 
     return apiClient.invokeAPI(basePath, path, 'POST', queryParams, postBody, headerParams, formParams, contentType, authNames).then((response) {
@@ -406,13 +412,11 @@ class PetApi {
         throw new ApiException(response.statusCode, response.body);
       }
       else if(response.body != null){
-        return ;
+        return ApiClient.deserialize(response.body, ApiResponse);
       }
       else {
-        return ;
+        return null;
       }
     });
   }
-  
 }
-
diff --git a/samples/client/petstore/dart/lib/api/store_api.dart b/samples/client/petstore/dart/lib/api/store_api.dart
index fb346e317ee..25e3ccfcf6e 100644
--- a/samples/client/petstore/dart/lib/api/store_api.dart
+++ b/samples/client/petstore/dart/lib/api/store_api.dart
@@ -1,7 +1,6 @@
 part of api;
 
 
-
 class StoreApi {
   String basePath = "http://petstore.swagger.io/v2";
   ApiClient apiClient = ApiClient.defaultApiClient;
@@ -12,151 +11,15 @@ class StoreApi {
     }
   }
 
-  
-  /// Returns pet inventories by status
-  ///
-  /// Returns a map of status codes to quantities
-  Future<Map<String, int>> getInventory() {
-    Object postBody = null;
-    
-
-    // create path and map variables
-    String path = "/store/inventory".replaceAll("{format}","json");
-
-    // query params
-    Map<String, String> queryParams = {};
-    Map<String, String> headerParams = {};
-    Map<String, String> formParams = {};
-    
-    
-
-    List<String> contentTypes = [];
-
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-    List<String> authNames = ["api_key"];
-
-    if(contentType.startsWith("multipart/form-data")) {
-      bool hasFields = false;
-      MultipartRequest mp = new MultipartRequest(null, null);
-      
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      
-    }
-
-    return apiClient.invokeAPI(basePath, path, 'GET', queryParams, postBody, headerParams, formParams, contentType, authNames).then((response) {
-      if(response.statusCode >= 400) {
-        throw new ApiException(response.statusCode, response.body);
-      }
-      else if(response.body != null){
-        return ApiClient.deserialize(response.body, Map);
-      }
-      else {
-        return null;
-      }
-    });
-  }
-  
-  /// Place an order for a pet
-  ///
-  /// 
-  Future<Order> placeOrder(Order body) {
-    Object postBody = body;
-    
-
-    // create path and map variables
-    String path = "/store/order".replaceAll("{format}","json");
-
-    // query params
-    Map<String, String> queryParams = {};
-    Map<String, String> headerParams = {};
-    Map<String, String> formParams = {};
-    
-    
-
-    List<String> contentTypes = [];
-
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-    List<String> authNames = [];
-
-    if(contentType.startsWith("multipart/form-data")) {
-      bool hasFields = false;
-      MultipartRequest mp = new MultipartRequest(null, null);
-      
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      
-    }
-
-    return apiClient.invokeAPI(basePath, path, 'POST', queryParams, postBody, headerParams, formParams, contentType, authNames).then((response) {
-      if(response.statusCode >= 400) {
-        throw new ApiException(response.statusCode, response.body);
-      }
-      else if(response.body != null){
-        return ApiClient.deserialize(response.body, Order);
-      }
-      else {
-        return null;
-      }
-    });
-  }
-  
-  /// Find purchase order by ID
-  ///
-  /// For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-  Future<Order> getOrderById(String orderId) {
-    Object postBody = null;
-    
-
-    // create path and map variables
-    String path = "/store/order/{orderId}".replaceAll("{format}","json").replaceAll("{" + "orderId" + "}", orderId.toString());
-
-    // query params
-    Map<String, String> queryParams = {};
-    Map<String, String> headerParams = {};
-    Map<String, String> formParams = {};
-    
-    
-
-    List<String> contentTypes = [];
-
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-    List<String> authNames = [];
-
-    if(contentType.startsWith("multipart/form-data")) {
-      bool hasFields = false;
-      MultipartRequest mp = new MultipartRequest(null, null);
-      
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      
-    }
-
-    return apiClient.invokeAPI(basePath, path, 'GET', queryParams, postBody, headerParams, formParams, contentType, authNames).then((response) {
-      if(response.statusCode >= 400) {
-        throw new ApiException(response.statusCode, response.body);
-      }
-      else if(response.body != null){
-        return ApiClient.deserialize(response.body, Order);
-      }
-      else {
-        return null;
-      }
-    });
-  }
-  
   /// Delete purchase order by ID
   ///
   /// For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
   Future deleteOrder(String orderId) {
     Object postBody = null;
-    
+    // verify required params are set
+    if() {
+       throw new ApiException(400, "missing required params");
+    }
 
     // create path and map variables
     String path = "/store/order/{orderId}".replaceAll("{format}","json").replaceAll("{" + "orderId" + "}", orderId.toString());
@@ -165,9 +28,7 @@ class StoreApi {
     Map<String, String> queryParams = {};
     Map<String, String> headerParams = {};
     Map<String, String> formParams = {};
-    
-    
-
+        
     List<String> contentTypes = [];
 
     String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
@@ -181,8 +42,7 @@ class StoreApi {
         postBody = mp;
     }
     else {
-      
-    }
+          }
 
     return apiClient.invokeAPI(basePath, path, 'DELETE', queryParams, postBody, headerParams, formParams, contentType, authNames).then((response) {
       if(response.statusCode >= 400) {
@@ -196,6 +56,136 @@ class StoreApi {
       }
     });
   }
-  
-}
+  /// Returns pet inventories by status
+  ///
+  /// Returns a map of status codes to quantities
+  Future<Map<String, int>> getInventory() {
+    Object postBody = null;
 
+
+    // create path and map variables
+    String path = "/store/inventory".replaceAll("{format}","json");
+
+    // query params
+    Map<String, String> queryParams = {};
+    Map<String, String> headerParams = {};
+    Map<String, String> formParams = {};
+        
+    List<String> contentTypes = [];
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    List<String> authNames = ["api_key"];
+
+    if(contentType.startsWith("multipart/form-data")) {
+      bool hasFields = false;
+      MultipartRequest mp = new MultipartRequest(null, null);
+      
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+          }
+
+    return apiClient.invokeAPI(basePath, path, 'GET', queryParams, postBody, headerParams, formParams, contentType, authNames).then((response) {
+      if(response.statusCode >= 400) {
+        throw new ApiException(response.statusCode, response.body);
+      }
+      else if(response.body != null){
+        return ApiClient.deserialize(response.body, Map);
+      }
+      else {
+        return null;
+      }
+    });
+  }
+  /// Find purchase order by ID
+  ///
+  /// For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+  Future<Order> getOrderById(int orderId) {
+    Object postBody = null;
+    // verify required params are set
+    if() {
+       throw new ApiException(400, "missing required params");
+    }
+
+    // create path and map variables
+    String path = "/store/order/{orderId}".replaceAll("{format}","json").replaceAll("{" + "orderId" + "}", orderId.toString());
+
+    // query params
+    Map<String, String> queryParams = {};
+    Map<String, String> headerParams = {};
+    Map<String, String> formParams = {};
+        
+    List<String> contentTypes = [];
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    List<String> authNames = [];
+
+    if(contentType.startsWith("multipart/form-data")) {
+      bool hasFields = false;
+      MultipartRequest mp = new MultipartRequest(null, null);
+      
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+          }
+
+    return apiClient.invokeAPI(basePath, path, 'GET', queryParams, postBody, headerParams, formParams, contentType, authNames).then((response) {
+      if(response.statusCode >= 400) {
+        throw new ApiException(response.statusCode, response.body);
+      }
+      else if(response.body != null){
+        return ApiClient.deserialize(response.body, Order);
+      }
+      else {
+        return null;
+      }
+    });
+  }
+  /// Place an order for a pet
+  ///
+  /// 
+  Future<Order> placeOrder(Order body) {
+    Object postBody = body;
+    // verify required params are set
+    if() {
+       throw new ApiException(400, "missing required params");
+    }
+
+    // create path and map variables
+    String path = "/store/order".replaceAll("{format}","json");
+
+    // query params
+    Map<String, String> queryParams = {};
+    Map<String, String> headerParams = {};
+    Map<String, String> formParams = {};
+        
+    List<String> contentTypes = [];
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    List<String> authNames = [];
+
+    if(contentType.startsWith("multipart/form-data")) {
+      bool hasFields = false;
+      MultipartRequest mp = new MultipartRequest(null, null);
+      
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+          }
+
+    return apiClient.invokeAPI(basePath, path, 'POST', queryParams, postBody, headerParams, formParams, contentType, authNames).then((response) {
+      if(response.statusCode >= 400) {
+        throw new ApiException(response.statusCode, response.body);
+      }
+      else if(response.body != null){
+        return ApiClient.deserialize(response.body, Order);
+      }
+      else {
+        return null;
+      }
+    });
+  }
+}
diff --git a/samples/client/petstore/dart/lib/api/user_api.dart b/samples/client/petstore/dart/lib/api/user_api.dart
index b8e7bc0f149..d774ea1f931 100644
--- a/samples/client/petstore/dart/lib/api/user_api.dart
+++ b/samples/client/petstore/dart/lib/api/user_api.dart
@@ -1,7 +1,6 @@
 part of api;
 
 
-
 class UserApi {
   String basePath = "http://petstore.swagger.io/v2";
   ApiClient apiClient = ApiClient.defaultApiClient;
@@ -12,13 +11,15 @@ class UserApi {
     }
   }
 
-  
   /// Create user
   ///
   /// This can only be done by the logged in user.
   Future createUser(User body) {
     Object postBody = body;
-    
+    // verify required params are set
+    if() {
+       throw new ApiException(400, "missing required params");
+    }
 
     // create path and map variables
     String path = "/user".replaceAll("{format}","json");
@@ -27,9 +28,7 @@ class UserApi {
     Map<String, String> queryParams = {};
     Map<String, String> headerParams = {};
     Map<String, String> formParams = {};
-    
-    
-
+        
     List<String> contentTypes = [];
 
     String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
@@ -43,8 +42,7 @@ class UserApi {
         postBody = mp;
     }
     else {
-      
-    }
+          }
 
     return apiClient.invokeAPI(basePath, path, 'POST', queryParams, postBody, headerParams, formParams, contentType, authNames).then((response) {
       if(response.statusCode >= 400) {
@@ -58,13 +56,15 @@ class UserApi {
       }
     });
   }
-  
   /// Creates list of users with given input array
   ///
   /// 
   Future createUsersWithArrayInput(List<User> body) {
     Object postBody = body;
-    
+    // verify required params are set
+    if() {
+       throw new ApiException(400, "missing required params");
+    }
 
     // create path and map variables
     String path = "/user/createWithArray".replaceAll("{format}","json");
@@ -73,9 +73,7 @@ class UserApi {
     Map<String, String> queryParams = {};
     Map<String, String> headerParams = {};
     Map<String, String> formParams = {};
-    
-    
-
+        
     List<String> contentTypes = [];
 
     String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
@@ -89,8 +87,7 @@ class UserApi {
         postBody = mp;
     }
     else {
-      
-    }
+          }
 
     return apiClient.invokeAPI(basePath, path, 'POST', queryParams, postBody, headerParams, formParams, contentType, authNames).then((response) {
       if(response.statusCode >= 400) {
@@ -104,13 +101,15 @@ class UserApi {
       }
     });
   }
-  
   /// Creates list of users with given input array
   ///
   /// 
   Future createUsersWithListInput(List<User> body) {
     Object postBody = body;
-    
+    // verify required params are set
+    if() {
+       throw new ApiException(400, "missing required params");
+    }
 
     // create path and map variables
     String path = "/user/createWithList".replaceAll("{format}","json");
@@ -119,9 +118,7 @@ class UserApi {
     Map<String, String> queryParams = {};
     Map<String, String> headerParams = {};
     Map<String, String> formParams = {};
-    
-    
-
+        
     List<String> contentTypes = [];
 
     String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
@@ -135,8 +132,7 @@ class UserApi {
         postBody = mp;
     }
     else {
-      
-    }
+          }
 
     return apiClient.invokeAPI(basePath, path, 'POST', queryParams, postBody, headerParams, formParams, contentType, authNames).then((response) {
       if(response.statusCode >= 400) {
@@ -150,201 +146,15 @@ class UserApi {
       }
     });
   }
-  
-  /// Logs user into the system
-  ///
-  /// 
-  Future<String> loginUser(String username, String password) {
-    Object postBody = null;
-    
-
-    // create path and map variables
-    String path = "/user/login".replaceAll("{format}","json");
-
-    // query params
-    Map<String, String> queryParams = {};
-    Map<String, String> headerParams = {};
-    Map<String, String> formParams = {};
-    if("null" != username)
-      queryParams["username"] = username is List ? username.join(',') : username;
-    if("null" != password)
-      queryParams["password"] = password is List ? password.join(',') : password;
-    
-    
-
-    List<String> contentTypes = [];
-
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-    List<String> authNames = [];
-
-    if(contentType.startsWith("multipart/form-data")) {
-      bool hasFields = false;
-      MultipartRequest mp = new MultipartRequest(null, null);
-      
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      
-    }
-
-    return apiClient.invokeAPI(basePath, path, 'GET', queryParams, postBody, headerParams, formParams, contentType, authNames).then((response) {
-      if(response.statusCode >= 400) {
-        throw new ApiException(response.statusCode, response.body);
-      }
-      else if(response.body != null){
-        return ApiClient.deserialize(response.body, String);
-      }
-      else {
-        return null;
-      }
-    });
-  }
-  
-  /// Logs out current logged in user session
-  ///
-  /// 
-  Future logoutUser() {
-    Object postBody = null;
-    
-
-    // create path and map variables
-    String path = "/user/logout".replaceAll("{format}","json");
-
-    // query params
-    Map<String, String> queryParams = {};
-    Map<String, String> headerParams = {};
-    Map<String, String> formParams = {};
-    
-    
-
-    List<String> contentTypes = [];
-
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-    List<String> authNames = [];
-
-    if(contentType.startsWith("multipart/form-data")) {
-      bool hasFields = false;
-      MultipartRequest mp = new MultipartRequest(null, null);
-      
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      
-    }
-
-    return apiClient.invokeAPI(basePath, path, 'GET', queryParams, postBody, headerParams, formParams, contentType, authNames).then((response) {
-      if(response.statusCode >= 400) {
-        throw new ApiException(response.statusCode, response.body);
-      }
-      else if(response.body != null){
-        return ;
-      }
-      else {
-        return ;
-      }
-    });
-  }
-  
-  /// Get user by user name
-  ///
-  /// 
-  Future<User> getUserByName(String username) {
-    Object postBody = null;
-    
-
-    // create path and map variables
-    String path = "/user/{username}".replaceAll("{format}","json").replaceAll("{" + "username" + "}", username.toString());
-
-    // query params
-    Map<String, String> queryParams = {};
-    Map<String, String> headerParams = {};
-    Map<String, String> formParams = {};
-    
-    
-
-    List<String> contentTypes = [];
-
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-    List<String> authNames = [];
-
-    if(contentType.startsWith("multipart/form-data")) {
-      bool hasFields = false;
-      MultipartRequest mp = new MultipartRequest(null, null);
-      
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      
-    }
-
-    return apiClient.invokeAPI(basePath, path, 'GET', queryParams, postBody, headerParams, formParams, contentType, authNames).then((response) {
-      if(response.statusCode >= 400) {
-        throw new ApiException(response.statusCode, response.body);
-      }
-      else if(response.body != null){
-        return ApiClient.deserialize(response.body, User);
-      }
-      else {
-        return null;
-      }
-    });
-  }
-  
-  /// Updated user
-  ///
-  /// This can only be done by the logged in user.
-  Future updateUser(String username, User body) {
-    Object postBody = body;
-    
-
-    // create path and map variables
-    String path = "/user/{username}".replaceAll("{format}","json").replaceAll("{" + "username" + "}", username.toString());
-
-    // query params
-    Map<String, String> queryParams = {};
-    Map<String, String> headerParams = {};
-    Map<String, String> formParams = {};
-    
-    
-
-    List<String> contentTypes = [];
-
-    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
-    List<String> authNames = [];
-
-    if(contentType.startsWith("multipart/form-data")) {
-      bool hasFields = false;
-      MultipartRequest mp = new MultipartRequest(null, null);
-      
-      if(hasFields)
-        postBody = mp;
-    }
-    else {
-      
-    }
-
-    return apiClient.invokeAPI(basePath, path, 'PUT', queryParams, postBody, headerParams, formParams, contentType, authNames).then((response) {
-      if(response.statusCode >= 400) {
-        throw new ApiException(response.statusCode, response.body);
-      }
-      else if(response.body != null){
-        return ;
-      }
-      else {
-        return ;
-      }
-    });
-  }
-  
   /// Delete user
   ///
   /// This can only be done by the logged in user.
   Future deleteUser(String username) {
     Object postBody = null;
-    
+    // verify required params are set
+    if() {
+       throw new ApiException(400, "missing required params");
+    }
 
     // create path and map variables
     String path = "/user/{username}".replaceAll("{format}","json").replaceAll("{" + "username" + "}", username.toString());
@@ -353,9 +163,7 @@ class UserApi {
     Map<String, String> queryParams = {};
     Map<String, String> headerParams = {};
     Map<String, String> formParams = {};
-    
-    
-
+        
     List<String> contentTypes = [];
 
     String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
@@ -369,8 +177,7 @@ class UserApi {
         postBody = mp;
     }
     else {
-      
-    }
+          }
 
     return apiClient.invokeAPI(basePath, path, 'DELETE', queryParams, postBody, headerParams, formParams, contentType, authNames).then((response) {
       if(response.statusCode >= 400) {
@@ -384,6 +191,191 @@ class UserApi {
       }
     });
   }
-  
-}
+  /// Get user by user name
+  ///
+  /// 
+  Future<User> getUserByName(String username) {
+    Object postBody = null;
+    // verify required params are set
+    if() {
+       throw new ApiException(400, "missing required params");
+    }
 
+    // create path and map variables
+    String path = "/user/{username}".replaceAll("{format}","json").replaceAll("{" + "username" + "}", username.toString());
+
+    // query params
+    Map<String, String> queryParams = {};
+    Map<String, String> headerParams = {};
+    Map<String, String> formParams = {};
+        
+    List<String> contentTypes = [];
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    List<String> authNames = [];
+
+    if(contentType.startsWith("multipart/form-data")) {
+      bool hasFields = false;
+      MultipartRequest mp = new MultipartRequest(null, null);
+      
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+          }
+
+    return apiClient.invokeAPI(basePath, path, 'GET', queryParams, postBody, headerParams, formParams, contentType, authNames).then((response) {
+      if(response.statusCode >= 400) {
+        throw new ApiException(response.statusCode, response.body);
+      }
+      else if(response.body != null){
+        return ApiClient.deserialize(response.body, User);
+      }
+      else {
+        return null;
+      }
+    });
+  }
+  /// Logs user into the system
+  ///
+  /// 
+  Future<String> loginUser(String username, String password) {
+    Object postBody = null;
+    // verify required params are set
+    if(    // verify required params are set
+    if() {
+       throw new ApiException(400, "missing required params");
+    }) {
+       throw new ApiException(400, "missing required params");
+    }
+
+    // create path and map variables
+    String path = "/user/login".replaceAll("{format}","json");
+
+    // query params
+    Map<String, String> queryParams = {};
+    Map<String, String> headerParams = {};
+    Map<String, String> formParams = {};
+    if("null" != username)
+      queryParams["username"] = username is List ? username.join(',') : username;
+if("null" != password)
+      queryParams["password"] = password is List ? password.join(',') : password;
+    
+    List<String> contentTypes = [];
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    List<String> authNames = [];
+
+    if(contentType.startsWith("multipart/form-data")) {
+      bool hasFields = false;
+      MultipartRequest mp = new MultipartRequest(null, null);
+      
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+          }
+
+    return apiClient.invokeAPI(basePath, path, 'GET', queryParams, postBody, headerParams, formParams, contentType, authNames).then((response) {
+      if(response.statusCode >= 400) {
+        throw new ApiException(response.statusCode, response.body);
+      }
+      else if(response.body != null){
+        return ApiClient.deserialize(response.body, String);
+      }
+      else {
+        return null;
+      }
+    });
+  }
+  /// Logs out current logged in user session
+  ///
+  /// 
+  Future logoutUser() {
+    Object postBody = null;
+
+
+    // create path and map variables
+    String path = "/user/logout".replaceAll("{format}","json");
+
+    // query params
+    Map<String, String> queryParams = {};
+    Map<String, String> headerParams = {};
+    Map<String, String> formParams = {};
+        
+    List<String> contentTypes = [];
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    List<String> authNames = [];
+
+    if(contentType.startsWith("multipart/form-data")) {
+      bool hasFields = false;
+      MultipartRequest mp = new MultipartRequest(null, null);
+      
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+          }
+
+    return apiClient.invokeAPI(basePath, path, 'GET', queryParams, postBody, headerParams, formParams, contentType, authNames).then((response) {
+      if(response.statusCode >= 400) {
+        throw new ApiException(response.statusCode, response.body);
+      }
+      else if(response.body != null){
+        return ;
+      }
+      else {
+        return ;
+      }
+    });
+  }
+  /// Updated user
+  ///
+  /// This can only be done by the logged in user.
+  Future updateUser(String username, User body) {
+    Object postBody = body;
+    // verify required params are set
+    if(    // verify required params are set
+    if() {
+       throw new ApiException(400, "missing required params");
+    }) {
+       throw new ApiException(400, "missing required params");
+    }
+
+    // create path and map variables
+    String path = "/user/{username}".replaceAll("{format}","json").replaceAll("{" + "username" + "}", username.toString());
+
+    // query params
+    Map<String, String> queryParams = {};
+    Map<String, String> headerParams = {};
+    Map<String, String> formParams = {};
+        
+    List<String> contentTypes = [];
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    List<String> authNames = [];
+
+    if(contentType.startsWith("multipart/form-data")) {
+      bool hasFields = false;
+      MultipartRequest mp = new MultipartRequest(null, null);
+      
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+          }
+
+    return apiClient.invokeAPI(basePath, path, 'PUT', queryParams, postBody, headerParams, formParams, contentType, authNames).then((response) {
+      if(response.statusCode >= 400) {
+        throw new ApiException(response.statusCode, response.body);
+      }
+      else if(response.body != null){
+        return ;
+      }
+      else {
+        return ;
+      }
+    });
+  }
+}
diff --git a/samples/client/petstore/dart/lib/api_client.dart b/samples/client/petstore/dart/lib/api_client.dart
index 82cecd7db49..7cd93d13e61 100644
--- a/samples/client/petstore/dart/lib/api_client.dart
+++ b/samples/client/petstore/dart/lib/api_client.dart
@@ -61,32 +61,18 @@ class ApiClient {
     bool isMap = json is Map;
 
     switch(clazz) {
-      
-      
-      case User:
-        return isMap ? dson.map(json, new User()) : dson.decode(json, new User());
-      
-      
-      
+      case ApiResponse:
+        return isMap ? dson.map(json, new ApiResponse()) : dson.decode(json, new ApiResponse());
       case Category:
         return isMap ? dson.map(json, new Category()) : dson.decode(json, new Category());
-      
-      
-      
-      case Pet:
-        return isMap ? dson.map(json, new Pet()) : dson.decode(json, new Pet());
-      
-      
-      
-      case Tag:
-        return isMap ? dson.map(json, new Tag()) : dson.decode(json, new Tag());
-      
-      
-      
       case Order:
         return isMap ? dson.map(json, new Order()) : dson.decode(json, new Order());
-      
-      
+      case Pet:
+        return isMap ? dson.map(json, new Pet()) : dson.decode(json, new Pet());
+      case Tag:
+        return isMap ? dson.map(json, new Tag()) : dson.decode(json, new Tag());
+      case User:
+        return isMap ? dson.map(json, new User()) : dson.decode(json, new User());
       default:
         throw new ApiException(500, 'Could not find a suitable class for deserialization');
     }
diff --git a/samples/client/petstore/dart/lib/model/api_response.dart b/samples/client/petstore/dart/lib/model/api_response.dart
new file mode 100644
index 00000000000..e9746c587b0
--- /dev/null
+++ b/samples/client/petstore/dart/lib/model/api_response.dart
@@ -0,0 +1,23 @@
+part of api;
+
+
+@Entity()
+class ApiResponse {
+  
+  int code = null;
+  
+
+  String type = null;
+  
+
+  String message = null;
+  
+  ApiResponse();
+
+  @override
+  String toString()  {
+    return 'ApiResponse[code=$code, type=$type, message=$message, ]';
+  }
+
+}
+
diff --git a/samples/client/petstore/dart/lib/model/category.dart b/samples/client/petstore/dart/lib/model/category.dart
index d036a2b186a..8b4c9b47f8b 100644
--- a/samples/client/petstore/dart/lib/model/category.dart
+++ b/samples/client/petstore/dart/lib/model/category.dart
@@ -6,10 +6,9 @@ class Category {
   
   int id = null;
   
-  
+
   String name = null;
   
-  
   Category();
 
   @override
diff --git a/samples/client/petstore/dart/lib/model/order.dart b/samples/client/petstore/dart/lib/model/order.dart
index 487f5fad644..a3c37e839d6 100644
--- a/samples/client/petstore/dart/lib/model/order.dart
+++ b/samples/client/petstore/dart/lib/model/order.dart
@@ -6,22 +6,21 @@ class Order {
   
   int id = null;
   
-  
+
   int petId = null;
   
-  
+
   int quantity = null;
   
-  
+
   DateTime shipDate = null;
   
-  /* Order Status */
+/* Order Status */
   String status = null;
   //enum statusEnum {  placed,  approved,  delivered,  };
-  
+
   bool complete = null;
   
-  
   Order();
 
   @override
diff --git a/samples/client/petstore/dart/lib/model/pet.dart b/samples/client/petstore/dart/lib/model/pet.dart
index 133cc2eb4ad..649e99527dd 100644
--- a/samples/client/petstore/dart/lib/model/pet.dart
+++ b/samples/client/petstore/dart/lib/model/pet.dart
@@ -6,22 +6,21 @@ class Pet {
   
   int id = null;
   
-  
+
   Category category = null;
   
-  
+
   String name = null;
   
-  
+
   List<String> photoUrls = [];
   
-  
+
   List<Tag> tags = [];
   
-  /* pet status in the store */
+/* pet status in the store */
   String status = null;
   //enum statusEnum {  available,  pending,  sold,  };
-  
   Pet();
 
   @override
diff --git a/samples/client/petstore/dart/lib/model/tag.dart b/samples/client/petstore/dart/lib/model/tag.dart
index 36cbb19a796..68214cd49f5 100644
--- a/samples/client/petstore/dart/lib/model/tag.dart
+++ b/samples/client/petstore/dart/lib/model/tag.dart
@@ -6,10 +6,9 @@ class Tag {
   
   int id = null;
   
-  
+
   String name = null;
   
-  
   Tag();
 
   @override
diff --git a/samples/client/petstore/dart/lib/model/user.dart b/samples/client/petstore/dart/lib/model/user.dart
index 4e09c455941..7cd314f7b25 100644
--- a/samples/client/petstore/dart/lib/model/user.dart
+++ b/samples/client/petstore/dart/lib/model/user.dart
@@ -6,28 +6,27 @@ class User {
   
   int id = null;
   
-  
+
   String username = null;
   
-  
+
   String firstName = null;
   
-  
+
   String lastName = null;
   
-  
+
   String email = null;
   
-  
+
   String password = null;
   
-  
+
   String phone = null;
   
-  /* User Status */
+/* User Status */
   int userStatus = null;
   
-  
   User();
 
   @override
diff --git a/samples/client/petstore/dart/test/packages b/samples/client/petstore/dart/test/packages
new file mode 120000
index 00000000000..a16c4050155
--- /dev/null
+++ b/samples/client/petstore/dart/test/packages
@@ -0,0 +1 @@
+../packages
\ No newline at end of file
diff --git a/samples/client/petstore/flash/.gitignore b/samples/client/petstore/flash/.gitignore
new file mode 100644
index 00000000000..f112f7fb78f
--- /dev/null
+++ b/samples/client/petstore/flash/.gitignore
@@ -0,0 +1,11 @@
+# Build and Release Folders
+bin/
+bin-debug/
+bin-release/
+
+# Other files and folders
+.settings/
+
+# Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties`
+# should NOT be excluded as they contain compiler settings and other important
+# information for Eclipse / Flash Builder.
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/api/PetApi.as b/samples/client/petstore/flash/flash/src/io/swagger/client/api/PetApi.as
index b35cd5efdc9..6d44370b732 100644
--- a/samples/client/petstore/flash/flash/src/io/swagger/client/api/PetApi.as
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/api/PetApi.as
@@ -7,6 +7,7 @@ import io.swagger.common.ApiUserCredentials;
 import io.swagger.event.Response;
 import io.swagger.common.SwaggerApi;
 import io.swagger.client.model.Pet;
+import io.swagger.client.model.ApiResponse;
 import flash.filesystem.File;
 
 import mx.rpc.AsyncToken;
@@ -24,47 +25,16 @@ public class PetApi extends SwaggerApi {
         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_delete_pet: String = "delete_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: String = "update_pet";
         public static const event_update_pet_with_form: String = "update_pet_with_form";
-        public static const event_delete_pet: String = "delete_pet";
         public static const event_upload_file: String = "upload_file";
-        public static const event_get_pet_by_id_with_byte_array: String = "get_pet_by_id_with_byte_array";
-        public static const event_add_pet_using_byte_array: String = "add_pet_using_byte_array";
 
 
-    /*
-     * Returns void 
-     */
-    public function update_pet (body: Pet): String {
-        // create path and map variables
-        var path: String = "/pet".replace(/{format}/g,"xml");
-
-        // query params
-        var queryParams: Dictionary = new Dictionary();
-        var headerParams: Dictionary = new Dictionary();
-
-        
-
-        
-
-        
-
-        var token:AsyncToken = getApiInvoker().invokeAPI(path, "PUT", queryParams, body, headerParams);
-
-        var requestId: String = getUniqueId();
-
-        token.requestId = requestId;
-        token.completionEventType = "update_pet";
-
-        token.returnType = null ;
-        return requestId;
-
-    }
-    
     /*
      * Returns void 
      */
@@ -76,12 +46,13 @@ public class PetApi extends SwaggerApi {
         var queryParams: Dictionary = new Dictionary();
         var headerParams: Dictionary = new Dictionary();
 
-        
+        // verify required params are set
+        if() {
+            throw new ApiError(400, "missing required params");
+        }
 
         
-
         
-
         var token:AsyncToken = getApiInvoker().invokeAPI(path, "POST", queryParams, body, headerParams);
 
         var requestId: String = getUniqueId();
@@ -93,127 +64,7 @@ public class PetApi extends SwaggerApi {
         return requestId;
 
     }
-    
-    /*
-     * Returns Array 
-     */
-    public function find_pets_by_status (status: Array): String {
-        // create path and map variables
-        var path: String = "/pet/findByStatus".replace(/{format}/g,"xml");
 
-        // query params
-        var queryParams: Dictionary = new Dictionary();
-        var headerParams: Dictionary = new Dictionary();
-
-        
-
-        if("null" != String(status))
-            queryParams["status"] = toPathValue(status);
-        
-
-        
-
-        var token:AsyncToken = getApiInvoker().invokeAPI(path, "GET", queryParams, null, headerParams);
-
-        var requestId: String = getUniqueId();
-
-        token.requestId = requestId;
-        token.completionEventType = "find_pets_by_status";
-
-        token.returnType = Array;
-        return requestId;
-
-    }
-    
-    /*
-     * Returns Array 
-     */
-    public function find_pets_by_tags (tags: Array): String {
-        // create path and map variables
-        var path: String = "/pet/findByTags".replace(/{format}/g,"xml");
-
-        // query params
-        var queryParams: Dictionary = new Dictionary();
-        var headerParams: Dictionary = new Dictionary();
-
-        
-
-        if("null" != String(tags))
-            queryParams["tags"] = toPathValue(tags);
-        
-
-        
-
-        var token:AsyncToken = getApiInvoker().invokeAPI(path, "GET", queryParams, null, headerParams);
-
-        var requestId: String = getUniqueId();
-
-        token.requestId = requestId;
-        token.completionEventType = "find_pets_by_tags";
-
-        token.returnType = Array;
-        return requestId;
-
-    }
-    
-    /*
-     * Returns Pet 
-     */
-    public function get_pet_by_id (petId: Number): String {
-        // create path and map variables
-        var path: String = "/pet/{petId}".replace(/{format}/g,"xml").replace("{" + "petId" + "}", getApiInvoker().escapeString(petId));
-
-        // query params
-        var queryParams: Dictionary = new Dictionary();
-        var headerParams: Dictionary = new Dictionary();
-
-        
-
-        
-
-        
-
-        var token:AsyncToken = getApiInvoker().invokeAPI(path, "GET", queryParams, null, headerParams);
-
-        var requestId: String = getUniqueId();
-
-        token.requestId = requestId;
-        token.completionEventType = "get_pet_by_id";
-
-        token.returnType = Pet;
-        return requestId;
-
-    }
-    
-    /*
-     * Returns void 
-     */
-    public function update_pet_with_form (petId: String, name: String, status: String): String {
-        // create path and map variables
-        var path: String = "/pet/{petId}".replace(/{format}/g,"xml").replace("{" + "petId" + "}", getApiInvoker().escapeString(petId));
-
-        // query params
-        var queryParams: Dictionary = new Dictionary();
-        var headerParams: Dictionary = new Dictionary();
-
-        
-
-        
-
-        
-
-        var token:AsyncToken = getApiInvoker().invokeAPI(path, "POST", queryParams, null, headerParams);
-
-        var requestId: String = getUniqueId();
-
-        token.requestId = requestId;
-        token.completionEventType = "update_pet_with_form";
-
-        token.returnType = null ;
-        return requestId;
-
-    }
-    
     /*
      * Returns void 
      */
@@ -225,12 +76,17 @@ public class PetApi extends SwaggerApi {
         var queryParams: Dictionary = new Dictionary();
         var headerParams: Dictionary = new Dictionary();
 
-        
+        // verify required params are set
+        if(        // verify required params are set
+        if() {
+            throw new ApiError(400, "missing required params");
+        }
+) {
+            throw new ApiError(400, "missing required params");
+        }
 
         
-
         headerParams["apiKey"] = toPathValue(apiKey);
-        
 
         var token:AsyncToken = getApiInvoker().invokeAPI(path, "DELETE", queryParams, null, headerParams);
 
@@ -243,10 +99,172 @@ public class PetApi extends SwaggerApi {
         return requestId;
 
     }
-    
+
+    /*
+     * Returns Array 
+     */
+    public function find_pets_by_status (status: Array): String {
+        // create path and map variables
+        var path: String = "/pet/findByStatus".replace(/{format}/g,"xml");
+
+        // query params
+        var queryParams: Dictionary = new Dictionary();
+        var headerParams: Dictionary = new Dictionary();
+
+        // verify required params are set
+        if() {
+            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 = "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();
+
+        // verify required params are set
+        if() {
+            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 = "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();
+
+        // verify required params are set
+        if() {
+            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 = "get_pet_by_id";
+
+        token.returnType = Pet;
+        return requestId;
+
+    }
+
     /*
      * 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();
+
+        // verify required params are set
+        if() {
+            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 = "update_pet";
+
+        token.returnType = null ;
+        return requestId;
+
+    }
+
+    /*
+     * Returns void 
+     */
+    public function update_pet_with_form (petId: Number, 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(        // verify required params are set
+        if(        // verify required params are set
+        if() {
+            throw new ApiError(400, "missing required params");
+        }
+) {
+            throw new ApiError(400, "missing required params");
+        }
+) {
+            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 = "update_pet_with_form";
+
+        token.returnType = null ;
+        return requestId;
+
+    }
+
+    /*
+     * Returns ApiResponse 
+     */
     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));
@@ -255,12 +273,21 @@ public class PetApi extends SwaggerApi {
         var queryParams: Dictionary = new Dictionary();
         var headerParams: Dictionary = new Dictionary();
 
-        
+        // verify required params are set
+        if(        // verify required params are set
+        if(        // verify required params are set
+        if() {
+            throw new ApiError(400, "missing required params");
+        }
+) {
+            throw new ApiError(400, "missing required params");
+        }
+) {
+            throw new ApiError(400, "missing required params");
+        }
 
         
-
         
-
         var token:AsyncToken = getApiInvoker().invokeAPI(path, "POST", queryParams, null, headerParams);
 
         var requestId: String = getUniqueId();
@@ -268,69 +295,9 @@ public class PetApi extends SwaggerApi {
         token.requestId = requestId;
         token.completionEventType = "upload_file";
 
-        token.returnType = null ;
+        token.returnType = ApiResponse;
         return requestId;
 
     }
-    
-    /*
-     * Returns String 
-     */
-    public function get_pet_by_id_with_byte_array (petId: Number): String {
-        // create path and map variables
-        var path: String = "/pet/{petId}?testing_byte_array=true".replace(/{format}/g,"xml").replace("{" + "petId" + "}", getApiInvoker().escapeString(petId));
-
-        // query params
-        var queryParams: Dictionary = new Dictionary();
-        var headerParams: Dictionary = new Dictionary();
-
-        
-
-        
-
-        
-
-        var token:AsyncToken = getApiInvoker().invokeAPI(path, "GET", queryParams, null, headerParams);
-
-        var requestId: String = getUniqueId();
-
-        token.requestId = requestId;
-        token.completionEventType = "get_pet_by_id_with_byte_array";
-
-        token.returnType = String;
-        return requestId;
-
-    }
-    
-    /*
-     * Returns void 
-     */
-    public function add_pet_using_byte_array (body: String): String {
-        // create path and map variables
-        var path: String = "/pet?testing_byte_array=true".replace(/{format}/g,"xml");
-
-        // query params
-        var queryParams: Dictionary = new Dictionary();
-        var headerParams: Dictionary = new Dictionary();
-
-        
-
-        
-
-        
-
-        var token:AsyncToken = getApiInvoker().invokeAPI(path, "POST", queryParams, body, headerParams);
-
-        var requestId: String = getUniqueId();
-
-        token.requestId = requestId;
-        token.completionEventType = "add_pet_using_byte_array";
-
-        token.returnType = null ;
-        return requestId;
-
-    }
-    
 }
-        
 }
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/api/StoreApi.as b/samples/client/petstore/flash/flash/src/io/swagger/client/api/StoreApi.as
index 061878ad257..d4f7fc43d9f 100644
--- a/samples/client/petstore/flash/flash/src/io/swagger/client/api/StoreApi.as
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/api/StoreApi.as
@@ -23,12 +23,42 @@ public class StoreApi extends SwaggerApi {
         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";
+        public static const event_get_inventory: String = "get_inventory";
+        public static const event_get_order_by_id: String = "get_order_by_id";
+        public static const event_place_order: String = "place_order";
 
 
+    /*
+     * 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();
+
+        // verify required params are set
+        if() {
+            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 = "delete_order";
+
+        token.returnType = null ;
+        return requestId;
+
+    }
+
     /*
      * Returns Dictionary 
      */
@@ -40,12 +70,9 @@ public class StoreApi extends SwaggerApi {
         var queryParams: Dictionary = new Dictionary();
         var headerParams: Dictionary = new Dictionary();
 
-        
 
         
-
         
-
         var token:AsyncToken = getApiInvoker().invokeAPI(path, "GET", queryParams, null, headerParams);
 
         var requestId: String = getUniqueId();
@@ -57,40 +84,11 @@ public class StoreApi extends SwaggerApi {
         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 {
+    public function get_order_by_id (orderId: Number): String {
         // create path and map variables
         var path: String = "/store/order/{orderId}".replace(/{format}/g,"xml").replace("{" + "orderId" + "}", getApiInvoker().escapeString(orderId));
 
@@ -98,12 +96,13 @@ public class StoreApi extends SwaggerApi {
         var queryParams: Dictionary = new Dictionary();
         var headerParams: Dictionary = new Dictionary();
 
-        
+        // verify required params are set
+        if() {
+            throw new ApiError(400, "missing required params");
+        }
 
         
-
         
-
         var token:AsyncToken = getApiInvoker().invokeAPI(path, "GET", queryParams, null, headerParams);
 
         var requestId: String = getUniqueId();
@@ -115,36 +114,35 @@ public class StoreApi extends SwaggerApi {
         return requestId;
 
     }
-    
+
     /*
-     * Returns void 
+     * Returns Order 
      */
-    public function delete_order (orderId: String): String {
+    public function place_order (body: Order): String {
         // create path and map variables
-        var path: String = "/store/order/{orderId}".replace(/{format}/g,"xml").replace("{" + "orderId" + "}", getApiInvoker().escapeString(orderId));
+        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() {
+            throw new ApiError(400, "missing required params");
+        }
 
         
-
         
-
-        var token:AsyncToken = getApiInvoker().invokeAPI(path, "DELETE", queryParams, null, headerParams);
+        var token:AsyncToken = getApiInvoker().invokeAPI(path, "POST", queryParams, body, headerParams);
 
         var requestId: String = getUniqueId();
 
         token.requestId = requestId;
-        token.completionEventType = "delete_order";
+        token.completionEventType = "place_order";
 
-        token.returnType = null ;
+        token.returnType = Order;
         return requestId;
 
     }
-    
 }
-        
 }
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/api/UserApi.as b/samples/client/petstore/flash/flash/src/io/swagger/client/api/UserApi.as
index 06b0d079799..bdb91069461 100644
--- a/samples/client/petstore/flash/flash/src/io/swagger/client/api/UserApi.as
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/api/UserApi.as
@@ -26,11 +26,11 @@ public class UserApi extends SwaggerApi {
         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_delete_user: String = "delete_user";
+        public static const event_get_user_by_name: String = "get_user_by_name";
         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";
 
 
     /*
@@ -44,12 +44,13 @@ public class UserApi extends SwaggerApi {
         var queryParams: Dictionary = new Dictionary();
         var headerParams: Dictionary = new Dictionary();
 
-        
+        // verify required params are set
+        if() {
+            throw new ApiError(400, "missing required params");
+        }
 
         
-
         
-
         var token:AsyncToken = getApiInvoker().invokeAPI(path, "POST", queryParams, body, headerParams);
 
         var requestId: String = getUniqueId();
@@ -61,7 +62,7 @@ public class UserApi extends SwaggerApi {
         return requestId;
 
     }
-    
+
     /*
      * Returns void 
      */
@@ -73,12 +74,13 @@ public class UserApi extends SwaggerApi {
         var queryParams: Dictionary = new Dictionary();
         var headerParams: Dictionary = new Dictionary();
 
-        
+        // verify required params are set
+        if() {
+            throw new ApiError(400, "missing required params");
+        }
 
         
-
         
-
         var token:AsyncToken = getApiInvoker().invokeAPI(path, "POST", queryParams, body, headerParams);
 
         var requestId: String = getUniqueId();
@@ -90,7 +92,7 @@ public class UserApi extends SwaggerApi {
         return requestId;
 
     }
-    
+
     /*
      * Returns void 
      */
@@ -102,12 +104,13 @@ public class UserApi extends SwaggerApi {
         var queryParams: Dictionary = new Dictionary();
         var headerParams: Dictionary = new Dictionary();
 
-        
+        // verify required params are set
+        if() {
+            throw new ApiError(400, "missing required params");
+        }
 
         
-
         
-
         var token:AsyncToken = getApiInvoker().invokeAPI(path, "POST", queryParams, body, headerParams);
 
         var requestId: String = getUniqueId();
@@ -119,127 +122,7 @@ public class UserApi extends SwaggerApi {
         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 
      */
@@ -251,12 +134,13 @@ public class UserApi extends SwaggerApi {
         var queryParams: Dictionary = new Dictionary();
         var headerParams: Dictionary = new Dictionary();
 
-        
+        // verify required params are set
+        if() {
+            throw new ApiError(400, "missing required params");
+        }
 
         
-
         
-
         var token:AsyncToken = getApiInvoker().invokeAPI(path, "DELETE", queryParams, null, headerParams);
 
         var requestId: String = getUniqueId();
@@ -268,7 +152,133 @@ public class UserApi extends SwaggerApi {
         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();
+
+        // verify required params are set
+        if() {
+            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 = "get_user_by_name";
+
+        token.returnType = User;
+        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();
+
+        // verify required params are set
+        if(        // verify required params are set
+        if() {
+            throw new ApiError(400, "missing required params");
+        }
+) {
+            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 = "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 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();
+
+        // verify required params are set
+        if(        // verify required params are set
+        if() {
+            throw new ApiError(400, "missing required params");
+        }
+) {
+            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 = "update_user";
+
+        token.returnType = null ;
+        return requestId;
+
+    }
+}
 }
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/200Response.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/200Response.as
new file mode 100644
index 00000000000..d5319011e3a
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/200Response.as
@@ -0,0 +1,17 @@
+package io.swagger.client.model {
+
+
+    [XmlRootNode(name="200Response")]
+    public class 200Response {
+                [XmlElement(name="name")]
+        public var name: Number = 0;
+
+    public function toString(): String {
+        var str: String = "200Response: ";
+        str += " (name: " + name + ")";
+        return str;
+    }
+
+}
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/200ResponseList.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/200ResponseList.as
new file mode 100644
index 00000000000..006345f09e6
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/200ResponseList.as
@@ -0,0 +1,17 @@
+package io.swagger.client.model {
+
+import io.swagger.common.ListWrapper;
+
+    public class 200ResponseList implements ListWrapper {
+        // This declaration below of _200_response_obj_class is to force flash compiler to include this class
+        private var _200Response__obj_class: io.swagger.client.model.200Response = null;
+        [XmlElements(name="200Response_", type="io.swagger.client.model.200Response")]
+        public var 200Response_: Array = new Array();
+
+        public function getList(): Array{
+            return 200Response_;
+        }
+
+}
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/Animal.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/Animal.as
new file mode 100644
index 00000000000..2f3faea88c0
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/Animal.as
@@ -0,0 +1,17 @@
+package io.swagger.client.model {
+
+
+    [XmlRootNode(name="Animal")]
+    public class Animal {
+                [XmlElement(name="className")]
+        public var className: String = null;
+
+    public function toString(): String {
+        var str: String = "Animal: ";
+        str += " (className: " + className + ")";
+        return str;
+    }
+
+}
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/AnimalList.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/AnimalList.as
new file mode 100644
index 00000000000..11abdb96952
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/AnimalList.as
@@ -0,0 +1,17 @@
+package io.swagger.client.model {
+
+import io.swagger.common.ListWrapper;
+
+    public class AnimalList implements ListWrapper {
+        // This declaration below of _Animal_obj_class is to force flash compiler to include this class
+        private var _animal_obj_class: io.swagger.client.model.Animal = null;
+        [XmlElements(name="animal", type="io.swagger.client.model.Animal")]
+        public var animal: Array = new Array();
+
+        public function getList(): Array{
+            return animal;
+        }
+
+}
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/ApiResponse.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/ApiResponse.as
new file mode 100644
index 00000000000..6f038dcf55f
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/ApiResponse.as
@@ -0,0 +1,23 @@
+package io.swagger.client.model {
+
+
+    [XmlRootNode(name="ApiResponse")]
+    public class ApiResponse {
+                [XmlElement(name="code")]
+        public var code: Number = 0;
+                [XmlElement(name="type")]
+        public var type: String = null;
+                [XmlElement(name="message")]
+        public var message: String = null;
+
+    public function toString(): String {
+        var str: String = "ApiResponse: ";
+        str += " (code: " + code + ")";
+        str += " (type: " + type + ")";
+        str += " (message: " + message + ")";
+        return str;
+    }
+
+}
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/ApiResponseList.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/ApiResponseList.as
new file mode 100644
index 00000000000..64b315a162c
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/ApiResponseList.as
@@ -0,0 +1,17 @@
+package io.swagger.client.model {
+
+import io.swagger.common.ListWrapper;
+
+    public class ApiResponseList implements ListWrapper {
+        // This declaration below of _ApiResponse_obj_class is to force flash compiler to include this class
+        private var _apiResponse_obj_class: io.swagger.client.model.ApiResponse = null;
+        [XmlElements(name="apiResponse", type="io.swagger.client.model.ApiResponse")]
+        public var apiResponse: Array = new Array();
+
+        public function getList(): Array{
+            return apiResponse;
+        }
+
+}
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/Cat.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/Cat.as
new file mode 100644
index 00000000000..b479c53aae2
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/Cat.as
@@ -0,0 +1,21 @@
+package io.swagger.client.model {
+
+import io.swagger.client.model.Animal;
+
+    [XmlRootNode(name="Cat")]
+    public class Cat {
+                [XmlElement(name="className")]
+        public var className: String = null;
+                [XmlElement(name="declawed")]
+        public var declawed: Boolean = false;
+
+    public function toString(): String {
+        var str: String = "Cat: ";
+        str += " (className: " + className + ")";
+        str += " (declawed: " + declawed + ")";
+        return str;
+    }
+
+}
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/CatList.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/CatList.as
new file mode 100644
index 00000000000..ed78fc168d2
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/CatList.as
@@ -0,0 +1,18 @@
+package io.swagger.client.model {
+
+import io.swagger.common.ListWrapper;
+import io.swagger.client.model.Animal;
+
+    public class CatList implements ListWrapper {
+        // This declaration below of _Cat_obj_class is to force flash compiler to include this class
+        private var _cat_obj_class: io.swagger.client.model.Cat = null;
+        [XmlElements(name="cat", type="io.swagger.client.model.Cat")]
+        public var cat: Array = new Array();
+
+        public function getList(): Array{
+            return cat;
+        }
+
+}
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/Category.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/Category.as
index 6aa73414387..76916ee0b9e 100644
--- a/samples/client/petstore/flash/flash/src/io/swagger/client/model/Category.as
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/Category.as
@@ -3,27 +3,15 @@ package io.swagger.client.model {
 
     [XmlRootNode(name="Category")]
     public class Category {
-        
-        
-        
-        [XmlElement(name="id")]
-        
+                [XmlElement(name="id")]
         public var id: Number = 0;
-    
-        
-        
-        [XmlElement(name="name")]
-        
+                [XmlElement(name="name")]
         public var name: String = null;
-    
 
     public function toString(): String {
         var str: String = "Category: ";
-        
         str += " (id: " + id + ")";
-        
         str += " (name: " + name + ")";
-        
         return str;
     }
 
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/CategoryList.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/CategoryList.as
index 342cd70c001..4bf21454d29 100644
--- a/samples/client/petstore/flash/flash/src/io/swagger/client/model/CategoryList.as
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/CategoryList.as
@@ -13,6 +13,5 @@ import io.swagger.common.ListWrapper;
         }
 
 }
-        
 
 }
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/Dog.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/Dog.as
new file mode 100644
index 00000000000..521ed241a1a
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/Dog.as
@@ -0,0 +1,21 @@
+package io.swagger.client.model {
+
+import io.swagger.client.model.Animal;
+
+    [XmlRootNode(name="Dog")]
+    public class Dog {
+                [XmlElement(name="className")]
+        public var className: String = null;
+                [XmlElement(name="breed")]
+        public var breed: String = null;
+
+    public function toString(): String {
+        var str: String = "Dog: ";
+        str += " (className: " + className + ")";
+        str += " (breed: " + breed + ")";
+        return str;
+    }
+
+}
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/DogList.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/DogList.as
new file mode 100644
index 00000000000..76cc41fa703
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/DogList.as
@@ -0,0 +1,18 @@
+package io.swagger.client.model {
+
+import io.swagger.common.ListWrapper;
+import io.swagger.client.model.Animal;
+
+    public class DogList implements ListWrapper {
+        // This declaration below of _Dog_obj_class is to force flash compiler to include this class
+        private var _dog_obj_class: io.swagger.client.model.Dog = null;
+        [XmlElements(name="dog", type="io.swagger.client.model.Dog")]
+        public var dog: Array = new Array();
+
+        public function getList(): Array{
+            return dog;
+        }
+
+}
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/FormatTest.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/FormatTest.as
new file mode 100644
index 00000000000..d053a7dde1c
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/FormatTest.as
@@ -0,0 +1,51 @@
+package io.swagger.client.model {
+
+import io.swagger.client.model.ByteArray;
+
+    [XmlRootNode(name="FormatTest")]
+    public class FormatTest {
+                [XmlElement(name="integer")]
+        public var integer: Number = NaN;
+                [XmlElement(name="int32")]
+        public var int32: Number = 0;
+                [XmlElement(name="int64")]
+        public var int64: Number = 0;
+                [XmlElement(name="number")]
+        public var number: Number = NaN;
+                [XmlElement(name="float")]
+        public var float: Number = 0.0;
+                [XmlElement(name="double")]
+        public var double: Number = 0.0;
+                [XmlElement(name="string")]
+        public var string: String = null;
+                [XmlElement(name="byte")]
+        public var byte: ByteArray = NaN;
+                [XmlElement(name="binary")]
+        public var binary: String = NaN;
+                [XmlElement(name="date")]
+        public var date: Date = null;
+                [XmlElement(name="dateTime")]
+        public var dateTime: Date = null;
+                [XmlElement(name="password")]
+        public var password: String = null;
+
+    public function toString(): String {
+        var str: String = "FormatTest: ";
+        str += " (integer: " + integer + ")";
+        str += " (int32: " + int32 + ")";
+        str += " (int64: " + int64 + ")";
+        str += " (number: " + number + ")";
+        str += " (float: " + float + ")";
+        str += " (double: " + double + ")";
+        str += " (string: " + string + ")";
+        str += " (byte: " + byte + ")";
+        str += " (binary: " + binary + ")";
+        str += " (date: " + date + ")";
+        str += " (dateTime: " + dateTime + ")";
+        str += " (password: " + password + ")";
+        return str;
+    }
+
+}
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/FormatTestList.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/FormatTestList.as
new file mode 100644
index 00000000000..1f30a511dfc
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/FormatTestList.as
@@ -0,0 +1,18 @@
+package io.swagger.client.model {
+
+import io.swagger.common.ListWrapper;
+import io.swagger.client.model.ByteArray;
+
+    public class FormatTestList implements ListWrapper {
+        // This declaration below of _format_test_obj_class is to force flash compiler to include this class
+        private var _formatTest_obj_class: io.swagger.client.model.FormatTest = null;
+        [XmlElements(name="formatTest", type="io.swagger.client.model.FormatTest")]
+        public var formatTest: Array = new Array();
+
+        public function getList(): Array{
+            return formatTest;
+        }
+
+}
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/InlineResponse200.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/InlineResponse200.as
new file mode 100644
index 00000000000..bb9a2848260
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/InlineResponse200.as
@@ -0,0 +1,41 @@
+package io.swagger.client.model {
+
+import io.swagger.client.model.Object;
+import io.swagger.client.model.Tag;
+
+    [XmlRootNode(name="InlineResponse200")]
+    public class InlineResponse200 {
+                // 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();
+                [XmlElement(name="id")]
+        public var id: Number = 0;
+                [XmlElement(name="category")]
+        public var category: Object = NaN;
+        /* pet status in the store */
+        [XmlElement(name="status")]
+        public var status: String = 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();
+
+    public function toString(): String {
+        var str: String = "InlineResponse200: ";
+        str += " (tags: " + tags + ")";
+        str += " (id: " + id + ")";
+        str += " (category: " + category + ")";
+        str += " (status: " + status + ")";
+        str += " (name: " + name + ")";
+        str += " (photoUrls: " + photoUrls + ")";
+        return str;
+    }
+
+}
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/InlineResponse200List.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/InlineResponse200List.as
new file mode 100644
index 00000000000..3ffb8bf7a6b
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/InlineResponse200List.as
@@ -0,0 +1,19 @@
+package io.swagger.client.model {
+
+import io.swagger.common.ListWrapper;
+import io.swagger.client.model.Object;
+import io.swagger.client.model.Tag;
+
+    public class InlineResponse200List implements ListWrapper {
+        // This declaration below of _inline_response_200_obj_class is to force flash compiler to include this class
+        private var _inlineResponse200_obj_class: io.swagger.client.model.InlineResponse200 = null;
+        [XmlElements(name="inlineResponse200", type="io.swagger.client.model.InlineResponse200")]
+        public var inlineResponse200: Array = new Array();
+
+        public function getList(): Array{
+            return inlineResponse200;
+        }
+
+}
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/ModelReturn.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/ModelReturn.as
new file mode 100644
index 00000000000..d87ae886145
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/ModelReturn.as
@@ -0,0 +1,17 @@
+package io.swagger.client.model {
+
+
+    [XmlRootNode(name="ModelReturn")]
+    public class ModelReturn {
+                [XmlElement(name="return")]
+        public var return_: Number = 0;
+
+    public function toString(): String {
+        var str: String = "ModelReturn: ";
+        str += " (return_: " + return_ + ")";
+        return str;
+    }
+
+}
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/ModelReturnList.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/ModelReturnList.as
new file mode 100644
index 00000000000..7d73597b08f
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/ModelReturnList.as
@@ -0,0 +1,17 @@
+package io.swagger.client.model {
+
+import io.swagger.common.ListWrapper;
+
+    public class ModelReturnList implements ListWrapper {
+        // This declaration below of _Return_obj_class is to force flash compiler to include this class
+        private var _return__obj_class: io.swagger.client.model.ModelReturn = null;
+        [XmlElements(name="return_", type="io.swagger.client.model.ModelReturn")]
+        public var return_: Array = new Array();
+
+        public function getList(): Array{
+            return return_;
+        }
+
+}
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/Name.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/Name.as
new file mode 100644
index 00000000000..4dcbc6a68f2
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/Name.as
@@ -0,0 +1,20 @@
+package io.swagger.client.model {
+
+
+    [XmlRootNode(name="Name")]
+    public class Name {
+                [XmlElement(name="name")]
+        public var name: Number = 0;
+                [XmlElement(name="snake_case")]
+        public var snakeCase: Number = 0;
+
+    public function toString(): String {
+        var str: String = "Name: ";
+        str += " (name: " + name + ")";
+        str += " (snakeCase: " + snakeCase + ")";
+        return str;
+    }
+
+}
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/NameList.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/NameList.as
new file mode 100644
index 00000000000..e327f3eff8d
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/NameList.as
@@ -0,0 +1,17 @@
+package io.swagger.client.model {
+
+import io.swagger.common.ListWrapper;
+
+    public class NameList implements ListWrapper {
+        // This declaration below of _Name_obj_class is to force flash compiler to include this class
+        private var _name_obj_class: io.swagger.client.model.Name = null;
+        [XmlElements(name="name", type="io.swagger.client.model.Name")]
+        public var name: Array = new Array();
+
+        public function getList(): Array{
+            return name;
+        }
+
+}
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/Order.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/Order.as
index d6e4e6dc4d7..bcb3855496c 100644
--- a/samples/client/petstore/flash/flash/src/io/swagger/client/model/Order.as
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/Order.as
@@ -3,60 +3,28 @@ package io.swagger.client.model {
 
     [XmlRootNode(name="Order")]
     public class Order {
-        
-        
-        
-        [XmlElement(name="id")]
-        
+                [XmlElement(name="id")]
         public var id: Number = 0;
-    
-        
-        
-        [XmlElement(name="petId")]
-        
+                [XmlElement(name="petId")]
         public var petId: Number = 0;
-    
-        
-        
-        [XmlElement(name="quantity")]
-        
+                [XmlElement(name="quantity")]
         public var quantity: Number = 0;
-    
-        
-        
-        [XmlElement(name="shipDate")]
-        
+                [XmlElement(name="shipDate")]
         public var shipDate: Date = null;
-    
         /* Order Status */
-        
-        
         [XmlElement(name="status")]
-        
         public var status: String = null;
-    
-        
-        
-        [XmlElement(name="complete")]
-        
+                [XmlElement(name="complete")]
         public var complete: Boolean = false;
-    
 
     public function toString(): String {
         var str: String = "Order: ";
-        
         str += " (id: " + id + ")";
-        
         str += " (petId: " + petId + ")";
-        
         str += " (quantity: " + quantity + ")";
-        
         str += " (shipDate: " + shipDate + ")";
-        
         str += " (status: " + status + ")";
-        
         str += " (complete: " + complete + ")";
-        
         return str;
     }
 
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/OrderList.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/OrderList.as
index bba3d8a4724..3573a1b4863 100644
--- a/samples/client/petstore/flash/flash/src/io/swagger/client/model/OrderList.as
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/OrderList.as
@@ -13,6 +13,5 @@ import io.swagger.common.ListWrapper;
         }
 
 }
-        
 
 }
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/Pet.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/Pet.as
index a4a7d04830f..6c14f3f83e4 100644
--- a/samples/client/petstore/flash/flash/src/io/swagger/client/model/Pet.as
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/Pet.as
@@ -5,68 +5,34 @@ import io.swagger.client.model.Tag;
 
     [XmlRootNode(name="Pet")]
     public class Pet {
-        
-        
-        
-        [XmlElement(name="id")]
-        
+                [XmlElement(name="id")]
         public var id: Number = 0;
-    
-        
-        
-        [XmlElement(name="category")]
-        
+                [XmlElement(name="category")]
         public var category: Category = NaN;
-    
-        
-        
-        [XmlElement(name="name")]
-        
+                [XmlElement(name="name")]
         public var name: String = null;
-    
-        
-        
-        // This declaration below of _photoUrls_obj_class is to force flash compiler to include this class
+                // 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
+                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();
-    
+                public var tags: Array = new Array();
         /* pet status in the store */
-        
-        
         [XmlElement(name="status")]
-        
         public var status: String = null;
-    
 
     public function toString(): String {
         var str: String = "Pet: ";
-        
         str += " (id: " + id + ")";
-        
         str += " (category: " + category + ")";
-        
         str += " (name: " + name + ")";
-        
         str += " (photoUrls: " + photoUrls + ")";
-        
         str += " (tags: " + tags + ")";
-        
         str += " (status: " + status + ")";
-        
         return str;
     }
 
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/PetList.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/PetList.as
index ada0846c5ea..c1dcc0cfb6c 100644
--- a/samples/client/petstore/flash/flash/src/io/swagger/client/model/PetList.as
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/PetList.as
@@ -15,6 +15,5 @@ import io.swagger.client.model.Tag;
         }
 
 }
-        
 
 }
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/SpecialModelName.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/SpecialModelName.as
new file mode 100644
index 00000000000..5834473e027
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/SpecialModelName.as
@@ -0,0 +1,17 @@
+package io.swagger.client.model {
+
+
+    [XmlRootNode(name="SpecialModelName")]
+    public class SpecialModelName {
+                [XmlElement(name="$special[property.name]")]
+        public var $Special[propertyName]: Number = 0;
+
+    public function toString(): String {
+        var str: String = "SpecialModelName: ";
+        str += " ($Special[propertyName]: " + $Special[propertyName] + ")";
+        return str;
+    }
+
+}
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/SpecialModelNameList.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/SpecialModelNameList.as
new file mode 100644
index 00000000000..bdbb15aa74a
--- /dev/null
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/SpecialModelNameList.as
@@ -0,0 +1,17 @@
+package io.swagger.client.model {
+
+import io.swagger.common.ListWrapper;
+
+    public class SpecialModelNameList implements ListWrapper {
+        // This declaration below of _$special[model.name]_obj_class is to force flash compiler to include this class
+        private var _$Special[modelName]_obj_class: io.swagger.client.model.SpecialModelName = null;
+        [XmlElements(name="$Special[modelName]", type="io.swagger.client.model.SpecialModelName")]
+        public var $Special[modelName]: Array = new Array();
+
+        public function getList(): Array{
+            return $Special[modelName];
+        }
+
+}
+
+}
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/Tag.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/Tag.as
index 7387e2e2745..3c8c4cae466 100644
--- a/samples/client/petstore/flash/flash/src/io/swagger/client/model/Tag.as
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/Tag.as
@@ -3,27 +3,15 @@ package io.swagger.client.model {
 
     [XmlRootNode(name="Tag")]
     public class Tag {
-        
-        
-        
-        [XmlElement(name="id")]
-        
+                [XmlElement(name="id")]
         public var id: Number = 0;
-    
-        
-        
-        [XmlElement(name="name")]
-        
+                [XmlElement(name="name")]
         public var name: String = null;
-    
 
     public function toString(): String {
         var str: String = "Tag: ";
-        
         str += " (id: " + id + ")";
-        
         str += " (name: " + name + ")";
-        
         return str;
     }
 
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/TagList.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/TagList.as
index 25ebadb27fb..b958cae23b3 100644
--- a/samples/client/petstore/flash/flash/src/io/swagger/client/model/TagList.as
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/TagList.as
@@ -13,6 +13,5 @@ import io.swagger.common.ListWrapper;
         }
 
 }
-        
 
 }
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/User.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/User.as
index 2b6474de90c..fadf5f4e7a3 100644
--- a/samples/client/petstore/flash/flash/src/io/swagger/client/model/User.as
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/User.as
@@ -3,76 +3,34 @@ package io.swagger.client.model {
 
     [XmlRootNode(name="User")]
     public class User {
-        
-        
-        
-        [XmlElement(name="id")]
-        
+                [XmlElement(name="id")]
         public var id: Number = 0;
-    
-        
-        
-        [XmlElement(name="username")]
-        
+                [XmlElement(name="username")]
         public var username: String = null;
-    
-        
-        
-        [XmlElement(name="firstName")]
-        
+                [XmlElement(name="firstName")]
         public var firstName: String = null;
-    
-        
-        
-        [XmlElement(name="lastName")]
-        
+                [XmlElement(name="lastName")]
         public var lastName: String = null;
-    
-        
-        
-        [XmlElement(name="email")]
-        
+                [XmlElement(name="email")]
         public var email: String = null;
-    
-        
-        
-        [XmlElement(name="password")]
-        
+                [XmlElement(name="password")]
         public var password: String = null;
-    
-        
-        
-        [XmlElement(name="phone")]
-        
+                [XmlElement(name="phone")]
         public var phone: String = null;
-    
         /* User Status */
-        
-        
         [XmlElement(name="userStatus")]
-        
         public var userStatus: Number = 0;
-    
 
     public function toString(): String {
         var str: String = "User: ";
-        
         str += " (id: " + id + ")";
-        
         str += " (username: " + username + ")";
-        
         str += " (firstName: " + firstName + ")";
-        
         str += " (lastName: " + lastName + ")";
-        
         str += " (email: " + email + ")";
-        
         str += " (password: " + password + ")";
-        
         str += " (phone: " + phone + ")";
-        
         str += " (userStatus: " + userStatus + ")";
-        
         return str;
     }
 
diff --git a/samples/client/petstore/flash/flash/src/io/swagger/client/model/UserList.as b/samples/client/petstore/flash/flash/src/io/swagger/client/model/UserList.as
index e8a1fdb27f6..a8404427adf 100644
--- a/samples/client/petstore/flash/flash/src/io/swagger/client/model/UserList.as
+++ b/samples/client/petstore/flash/flash/src/io/swagger/client/model/UserList.as
@@ -13,6 +13,5 @@ import io.swagger.common.ListWrapper;
         }
 
 }
-        
 
 }
diff --git a/samples/client/petstore/flash/git_push.sh b/samples/client/petstore/flash/git_push.sh
new file mode 100644
index 00000000000..1a36388db02
--- /dev/null
+++ b/samples/client/petstore/flash/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="YOUR_GIT_USR_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="YOUR_GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/client/petstore/go/README.md b/samples/client/petstore/go/README.md
index 7ce753fba9f..5af32ccefbb 100644
--- a/samples/client/petstore/go/README.md
+++ b/samples/client/petstore/go/README.md
@@ -1,8 +1,14 @@
 # Go API client for swagger
 
+This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+
 ## Overview
 This API client was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project.  By using the [swagger-spec](https://github.com/swagger-api/swagger-spec) from a remote server, you can easily generate an API client.
 
+- API version: 1.0.0
+- Package version: 1.0.0
+- Build date: 2016-04-16T15:44:50.329-07:00
+- Build package: class io.swagger.codegen.languages.GoClientCodegen
 
 ## Installation
 Put the package under your project folder and add the following in import:
@@ -10,3 +16,64 @@ Put the package under your project folder and add the following in import:
     "./swagger"
 ```
 
+## Documentation for API Endpoints
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*PetApi* | [**AddPet**](docs/PetApi.md#addpet) | **Post** /pet | Add a new pet to the store
+*PetApi* | [**DeletePet**](docs/PetApi.md#deletepet) | **Delete** /pet/{petId} | Deletes a pet
+*PetApi* | [**FindPetsByStatus**](docs/PetApi.md#findpetsbystatus) | **Get** /pet/findByStatus | Finds Pets by status
+*PetApi* | [**FindPetsByTags**](docs/PetApi.md#findpetsbytags) | **Get** /pet/findByTags | Finds Pets by tags
+*PetApi* | [**GetPetById**](docs/PetApi.md#getpetbyid) | **Get** /pet/{petId} | Find pet by ID
+*PetApi* | [**UpdatePet**](docs/PetApi.md#updatepet) | **Put** /pet | Update an existing pet
+*PetApi* | [**UpdatePetWithForm**](docs/PetApi.md#updatepetwithform) | **Post** /pet/{petId} | Updates a pet in the store with form data
+*PetApi* | [**UploadFile**](docs/PetApi.md#uploadfile) | **Post** /pet/{petId}/uploadImage | uploads an image
+*StoreApi* | [**DeleteOrder**](docs/StoreApi.md#deleteorder) | **Delete** /store/order/{orderId} | Delete purchase order by ID
+*StoreApi* | [**GetInventory**](docs/StoreApi.md#getinventory) | **Get** /store/inventory | Returns pet inventories by status
+*StoreApi* | [**GetOrderById**](docs/StoreApi.md#getorderbyid) | **Get** /store/order/{orderId} | Find purchase order by ID
+*StoreApi* | [**PlaceOrder**](docs/StoreApi.md#placeorder) | **Post** /store/order | Place an order for a pet
+*UserApi* | [**CreateUser**](docs/UserApi.md#createuser) | **Post** /user | Create user
+*UserApi* | [**CreateUsersWithArrayInput**](docs/UserApi.md#createuserswitharrayinput) | **Post** /user/createWithArray | Creates list of users with given input array
+*UserApi* | [**CreateUsersWithListInput**](docs/UserApi.md#createuserswithlistinput) | **Post** /user/createWithList | Creates list of users with given input array
+*UserApi* | [**DeleteUser**](docs/UserApi.md#deleteuser) | **Delete** /user/{username} | Delete user
+*UserApi* | [**GetUserByName**](docs/UserApi.md#getuserbyname) | **Get** /user/{username} | Get user by user name
+*UserApi* | [**LoginUser**](docs/UserApi.md#loginuser) | **Get** /user/login | Logs user into the system
+*UserApi* | [**LogoutUser**](docs/UserApi.md#logoutuser) | **Get** /user/logout | Logs out current logged in user session
+*UserApi* | [**UpdateUser**](docs/UserApi.md#updateuser) | **Put** /user/{username} | Updated user
+
+
+## Documentation For Models
+
+ - [ApiResponse](docs/ApiResponse.md)
+ - [Category](docs/Category.md)
+ - [Order](docs/Order.md)
+ - [Pet](docs/Pet.md)
+ - [Tag](docs/Tag.md)
+ - [User](docs/User.md)
+
+
+## Documentation For Authorization
+
+
+## petstore_auth
+
+- **Type**: OAuth
+- **Flow**: implicit
+- **Authorizatoin URL**: http://petstore.swagger.io/api/oauth/dialog
+- **Scopes**: 
+ - **write:pets**: modify pets in your account
+ - **read:pets**: read your pets
+
+## api_key
+
+- **Type**: API key 
+- **API key parameter name**: api_key
+- **Location**: HTTP header
+
+
+## Author
+
+apiteam@swagger.io
+
diff --git a/samples/client/petstore/go/go-petstore/.gitignore b/samples/client/petstore/go/go-petstore/.gitignore
new file mode 100644
index 00000000000..daf913b1b34
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/.gitignore
@@ -0,0 +1,24 @@
+# Compiled Object files, Static and Dynamic libs (Shared Objects)
+*.o
+*.a
+*.so
+
+# Folders
+_obj
+_test
+
+# Architecture specific extensions/prefixes
+*.[568vq]
+[568vq].out
+
+*.cgo1.go
+*.cgo2.c
+_cgo_defun.c
+_cgo_gotypes.go
+_cgo_export.*
+
+_testmain.go
+
+*.exe
+*.test
+*.prof
diff --git a/samples/client/petstore/go/go-petstore/README.md b/samples/client/petstore/go/go-petstore/README.md
new file mode 100644
index 00000000000..5890d48282a
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/README.md
@@ -0,0 +1,79 @@
+# Go API client for swagger
+
+This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+
+## Overview
+This API client was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project.  By using the [swagger-spec](https://github.com/swagger-api/swagger-spec) from a remote server, you can easily generate an API client.
+
+- API version: 1.0.0
+- Package version: 1.0.0
+- Build date: 2016-04-17T16:17:52.285+08:00
+- Build package: class io.swagger.codegen.languages.GoClientCodegen
+
+## Installation
+Put the package under your project folder and add the following in import:
+```
+    "./swagger"
+```
+
+## Documentation for API Endpoints
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*PetApi* | [**AddPet**](docs/PetApi.md#addpet) | **Post** /pet | Add a new pet to the store
+*PetApi* | [**DeletePet**](docs/PetApi.md#deletepet) | **Delete** /pet/{petId} | Deletes a pet
+*PetApi* | [**FindPetsByStatus**](docs/PetApi.md#findpetsbystatus) | **Get** /pet/findByStatus | Finds Pets by status
+*PetApi* | [**FindPetsByTags**](docs/PetApi.md#findpetsbytags) | **Get** /pet/findByTags | Finds Pets by tags
+*PetApi* | [**GetPetById**](docs/PetApi.md#getpetbyid) | **Get** /pet/{petId} | Find pet by ID
+*PetApi* | [**UpdatePet**](docs/PetApi.md#updatepet) | **Put** /pet | Update an existing pet
+*PetApi* | [**UpdatePetWithForm**](docs/PetApi.md#updatepetwithform) | **Post** /pet/{petId} | Updates a pet in the store with form data
+*PetApi* | [**UploadFile**](docs/PetApi.md#uploadfile) | **Post** /pet/{petId}/uploadImage | uploads an image
+*StoreApi* | [**DeleteOrder**](docs/StoreApi.md#deleteorder) | **Delete** /store/order/{orderId} | Delete purchase order by ID
+*StoreApi* | [**GetInventory**](docs/StoreApi.md#getinventory) | **Get** /store/inventory | Returns pet inventories by status
+*StoreApi* | [**GetOrderById**](docs/StoreApi.md#getorderbyid) | **Get** /store/order/{orderId} | Find purchase order by ID
+*StoreApi* | [**PlaceOrder**](docs/StoreApi.md#placeorder) | **Post** /store/order | Place an order for a pet
+*UserApi* | [**CreateUser**](docs/UserApi.md#createuser) | **Post** /user | Create user
+*UserApi* | [**CreateUsersWithArrayInput**](docs/UserApi.md#createuserswitharrayinput) | **Post** /user/createWithArray | Creates list of users with given input array
+*UserApi* | [**CreateUsersWithListInput**](docs/UserApi.md#createuserswithlistinput) | **Post** /user/createWithList | Creates list of users with given input array
+*UserApi* | [**DeleteUser**](docs/UserApi.md#deleteuser) | **Delete** /user/{username} | Delete user
+*UserApi* | [**GetUserByName**](docs/UserApi.md#getuserbyname) | **Get** /user/{username} | Get user by user name
+*UserApi* | [**LoginUser**](docs/UserApi.md#loginuser) | **Get** /user/login | Logs user into the system
+*UserApi* | [**LogoutUser**](docs/UserApi.md#logoutuser) | **Get** /user/logout | Logs out current logged in user session
+*UserApi* | [**UpdateUser**](docs/UserApi.md#updateuser) | **Put** /user/{username} | Updated user
+
+
+## Documentation For Models
+
+ - [ApiResponse](docs/ApiResponse.md)
+ - [Category](docs/Category.md)
+ - [Order](docs/Order.md)
+ - [Pet](docs/Pet.md)
+ - [Tag](docs/Tag.md)
+ - [User](docs/User.md)
+
+
+## Documentation For Authorization
+
+
+## api_key
+
+- **Type**: API key 
+- **API key parameter name**: api_key
+- **Location**: HTTP header
+
+## petstore_auth
+
+- **Type**: OAuth
+- **Flow**: implicit
+- **Authorizatoin URL**: http://petstore.swagger.io/api/oauth/dialog
+- **Scopes**: 
+ - **write:pets**: modify pets in your account
+ - **read:pets**: read your pets
+
+
+## Author
+
+apiteam@swagger.io
+
diff --git a/samples/client/petstore/go/go-petstore/api_client.go b/samples/client/petstore/go/go-petstore/api_client.go
new file mode 100644
index 00000000000..9806ccdf38d
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/api_client.go
@@ -0,0 +1,41 @@
+package swagger
+
+import (
+    "strings"
+)
+
+type ApiClient struct {
+
+}
+
+func (c *ApiClient) SelectHeaderContentType(contentTypes []string) string {
+    if (len(contentTypes) == 0){
+        return ""
+    }
+    if contains(contentTypes,"application/json") {
+        return "application/json"
+    }
+
+    return contentTypes[0] // use the first content type specified in 'consumes'
+}
+
+func (c *ApiClient) SelectHeaderAccept(accepts []string) string {
+    if (len(accepts) == 0){        
+        return ""
+    }
+
+    if contains(accepts,"application/json"){        
+        return "application/json"
+    }
+
+    return strings.Join(accepts,",")
+}
+
+func contains(source []string, containvalue string) bool {
+    for _, a := range source {
+        if strings.ToLower(a) == strings.ToLower(containvalue) {
+            return true
+        }
+    }
+    return false
+}
\ No newline at end of file
diff --git a/samples/client/petstore/go/go-petstore/api_response.go b/samples/client/petstore/go/go-petstore/api_response.go
new file mode 100644
index 00000000000..abb7971189d
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/api_response.go
@@ -0,0 +1,14 @@
+package swagger
+
+import (
+)
+
+
+type ApiResponse struct {
+    
+    Code  int32  `json:"code,omitempty"`
+    
+    Type_  string  `json:"type,omitempty"`
+    
+    Message  string  `json:"message,omitempty"`
+}
diff --git a/samples/client/petstore/go/swagger/Category.go b/samples/client/petstore/go/go-petstore/category.go
similarity index 63%
rename from samples/client/petstore/go/swagger/Category.go
rename to samples/client/petstore/go/go-petstore/category.go
index c150c0d2599..1853dfe7239 100644
--- a/samples/client/petstore/go/swagger/Category.go
+++ b/samples/client/petstore/go/go-petstore/category.go
@@ -3,7 +3,10 @@ package swagger
 import (
 )
 
+
 type Category struct {
+    
     Id  int64  `json:"id,omitempty"`
-Name  string  `json:"name,omitempty"`
+    
+    Name  string  `json:"name,omitempty"`
 }
diff --git a/samples/client/petstore/go/go-petstore/configuration.go b/samples/client/petstore/go/go-petstore/configuration.go
new file mode 100644
index 00000000000..e8a00bccaf5
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/configuration.go
@@ -0,0 +1,51 @@
+package swagger
+
+import (
+    "encoding/base64"
+)
+
+type Configuration struct {
+    UserName  string  `json:"userName,omitempty"`
+    Password  string  `json:"password,omitempty"`
+    ApiKeyPrefix map[string] string `json:"apiKeyPrefix,omitempty"`
+    ApiKey map[string] string  `json:"apiKey,omitempty"`
+    Debug  bool  `json:"debug,omitempty"`
+    DebugFile  string  `json:"debugFile,omitempty"`
+    OAuthToken  string  `json:"oAuthToken,omitempty"`
+    Timeout  int  `json:"timeout,omitempty"`
+    BasePath  string  `json:"basePath,omitempty"`
+    Host  string  `json:"host,omitempty"`
+    Scheme  string  `json:"scheme,omitempty"`
+    AccessToken string `json:"accessToken,omitempty"`
+    DefaultHeader map[string]string `json:"defaultHeader,omitempty"`
+    UserAgent string `json:"userAgent,omitempty"`
+    ApiClient ApiClient `json:"apiClient,omitempty"`
+}
+
+func NewConfiguration() *Configuration {
+    return &Configuration{
+        BasePath: "http://petstore.swagger.io/v2",
+        UserName: "",
+        Debug: false,
+        DefaultHeader: make(map[string]string),
+        ApiKey: make(map[string]string),
+        ApiKeyPrefix: make(map[string]string),
+        UserAgent: "Swagger-Codegen/1.0.0/go",
+        }
+}
+
+func (c *Configuration) GetBasicAuthEncodedString() string {
+    return base64.StdEncoding.EncodeToString([]byte(c.UserName  + ":" + c.Password))
+}
+
+func (c *Configuration) AddDefaultHeader(key string, value string) {
+    c.DefaultHeader[key] = value
+}
+
+func (c *Configuration) GetApiKeyWithPrefix(apiKeyIdentifier string) string {
+    if c.ApiKeyPrefix[apiKeyIdentifier] != ""{
+        return c.ApiKeyPrefix[apiKeyIdentifier] + " " + c.ApiKey[apiKeyIdentifier]
+    }
+        
+    return c.ApiKey[apiKeyIdentifier]
+}
\ No newline at end of file
diff --git a/samples/client/petstore/go/go-petstore/docs/ApiResponse.md b/samples/client/petstore/go/go-petstore/docs/ApiResponse.md
new file mode 100644
index 00000000000..3653b42ba24
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/docs/ApiResponse.md
@@ -0,0 +1,12 @@
+# ApiResponse
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Code** | **int32** |  | [optional] [default to null]
+**Type_** | **string** |  | [optional] [default to null]
+**Message** | **string** |  | [optional] [default to null]
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/go/go-petstore/docs/Category.md b/samples/client/petstore/go/go-petstore/docs/Category.md
new file mode 100644
index 00000000000..a64cb0a3904
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/docs/Category.md
@@ -0,0 +1,11 @@
+# Category
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Id** | **int64** |  | [optional] [default to null]
+**Name** | **string** |  | [optional] [default to null]
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/go/go-petstore/docs/Order.md b/samples/client/petstore/go/go-petstore/docs/Order.md
new file mode 100644
index 00000000000..69c55bc5abf
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/docs/Order.md
@@ -0,0 +1,15 @@
+# Order
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Id** | **int64** |  | [optional] [default to null]
+**PetId** | **int64** |  | [optional] [default to null]
+**Quantity** | **int32** |  | [optional] [default to null]
+**ShipDate** | [**time.Time**](time.Time.md) |  | [optional] [default to null]
+**Status** | **string** | Order Status | [optional] [default to null]
+**Complete** | **bool** |  | [optional] [default to null]
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/go/go-petstore/docs/Pet.md b/samples/client/petstore/go/go-petstore/docs/Pet.md
new file mode 100644
index 00000000000..d53855396cd
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/docs/Pet.md
@@ -0,0 +1,15 @@
+# Pet
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Id** | **int64** |  | [optional] [default to null]
+**Category** | [**Category**](Category.md) |  | [optional] [default to null]
+**Name** | **string** |  | [default to null]
+**PhotoUrls** | **[]string** |  | [default to null]
+**Tags** | [**[]Tag**](Tag.md) |  | [optional] [default to null]
+**Status** | **string** | pet status in the store | [optional] [default to null]
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/go/go-petstore/docs/PetApi.md b/samples/client/petstore/go/go-petstore/docs/PetApi.md
new file mode 100644
index 00000000000..5dad1949b04
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/docs/PetApi.md
@@ -0,0 +1,253 @@
+# \PetApi
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**AddPet**](PetApi.md#AddPet) | **Post** /pet | Add a new pet to the store
+[**DeletePet**](PetApi.md#DeletePet) | **Delete** /pet/{petId} | Deletes a pet
+[**FindPetsByStatus**](PetApi.md#FindPetsByStatus) | **Get** /pet/findByStatus | Finds Pets by status
+[**FindPetsByTags**](PetApi.md#FindPetsByTags) | **Get** /pet/findByTags | Finds Pets by tags
+[**GetPetById**](PetApi.md#GetPetById) | **Get** /pet/{petId} | Find pet by ID
+[**UpdatePet**](PetApi.md#UpdatePet) | **Put** /pet | Update an existing pet
+[**UpdatePetWithForm**](PetApi.md#UpdatePetWithForm) | **Post** /pet/{petId} | Updates a pet in the store with form data
+[**UploadFile**](PetApi.md#UploadFile) | **Post** /pet/{petId}/uploadImage | uploads an image
+
+
+# **AddPet**
+> AddPet($body)
+
+Add a new pet to the store
+
+
+
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: application/json, application/xml
+ - **Accept**: application/xml, application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **DeletePet**
+> DeletePet($petId, $apiKey)
+
+Deletes a pet
+
+
+
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **int64**| Pet id to delete | 
+ **apiKey** | **string**|  | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **FindPetsByStatus**
+> []Pet FindPetsByStatus($status)
+
+Finds Pets by status
+
+Multiple status values can be provided with comma separated strings
+
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **status** | [**[]string**](string.md)| Status values that need to be considered for filter | 
+
+### Return type
+
+[**[]Pet**](Pet.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **FindPetsByTags**
+> []Pet FindPetsByTags($tags)
+
+Finds Pets by tags
+
+Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **tags** | [**[]string**](string.md)| Tags to filter by | 
+
+### Return type
+
+[**[]Pet**](Pet.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **GetPetById**
+> Pet GetPetById($petId)
+
+Find pet by ID
+
+Returns a single pet
+
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **int64**| ID of pet to return | 
+
+### Return type
+
+[**Pet**](Pet.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **UpdatePet**
+> UpdatePet($body)
+
+Update an existing pet
+
+
+
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: application/json, application/xml
+ - **Accept**: application/xml, application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **UpdatePetWithForm**
+> UpdatePetWithForm($petId, $name, $status)
+
+Updates a pet in the store with form data
+
+
+
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **int64**| ID of pet that needs to be updated | 
+ **name** | **string**| Updated name of the pet | [optional] 
+ **status** | **string**| Updated status of the pet | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: application/x-www-form-urlencoded
+ - **Accept**: application/xml, application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **UploadFile**
+> ApiResponse UploadFile($petId, $additionalMetadata, $file)
+
+uploads an image
+
+
+
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **int64**| ID of pet to update | 
+ **additionalMetadata** | **string**| Additional data to pass to server | [optional] 
+ **file** | ***os.File**| file to upload | [optional] 
+
+### Return type
+
+[**ApiResponse**](ApiResponse.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: multipart/form-data
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/samples/client/petstore/go/go-petstore/docs/StoreApi.md b/samples/client/petstore/go/go-petstore/docs/StoreApi.md
new file mode 100644
index 00000000000..11939c1edba
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/docs/StoreApi.md
@@ -0,0 +1,125 @@
+# \StoreApi
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**DeleteOrder**](StoreApi.md#DeleteOrder) | **Delete** /store/order/{orderId} | Delete purchase order by ID
+[**GetInventory**](StoreApi.md#GetInventory) | **Get** /store/inventory | Returns pet inventories by status
+[**GetOrderById**](StoreApi.md#GetOrderById) | **Get** /store/order/{orderId} | Find purchase order by ID
+[**PlaceOrder**](StoreApi.md#PlaceOrder) | **Post** /store/order | Place an order for a pet
+
+
+# **DeleteOrder**
+> DeleteOrder($orderId)
+
+Delete purchase order by ID
+
+For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **orderId** | **string**| ID of the order that needs to be deleted | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **GetInventory**
+> map[string]int32 GetInventory()
+
+Returns pet inventories by status
+
+Returns a map of status codes to quantities
+
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**map[string]int32**](map.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **GetOrderById**
+> Order GetOrderById($orderId)
+
+Find purchase order by ID
+
+For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **orderId** | **int64**| ID of pet that needs to be fetched | 
+
+### Return type
+
+[**Order**](Order.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **PlaceOrder**
+> Order PlaceOrder($body)
+
+Place an order for a pet
+
+
+
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Order**](Order.md)| order placed for purchasing the pet | 
+
+### Return type
+
+[**Order**](Order.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/samples/client/petstore/go/go-petstore/docs/Tag.md b/samples/client/petstore/go/go-petstore/docs/Tag.md
new file mode 100644
index 00000000000..378bdbeb1d7
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/docs/Tag.md
@@ -0,0 +1,11 @@
+# Tag
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Id** | **int64** |  | [optional] [default to null]
+**Name** | **string** |  | [optional] [default to null]
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/go/go-petstore/docs/User.md b/samples/client/petstore/go/go-petstore/docs/User.md
new file mode 100644
index 00000000000..678880bf542
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/docs/User.md
@@ -0,0 +1,17 @@
+# User
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Id** | **int64** |  | [optional] [default to null]
+**Username** | **string** |  | [optional] [default to null]
+**FirstName** | **string** |  | [optional] [default to null]
+**LastName** | **string** |  | [optional] [default to null]
+**Email** | **string** |  | [optional] [default to null]
+**Password** | **string** |  | [optional] [default to null]
+**Phone** | **string** |  | [optional] [default to null]
+**UserStatus** | **int32** | User Status | [optional] [default to null]
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/go/go-petstore/docs/UserApi.md b/samples/client/petstore/go/go-petstore/docs/UserApi.md
new file mode 100644
index 00000000000..79ee5175bbd
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/docs/UserApi.md
@@ -0,0 +1,247 @@
+# \UserApi
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**CreateUser**](UserApi.md#CreateUser) | **Post** /user | Create user
+[**CreateUsersWithArrayInput**](UserApi.md#CreateUsersWithArrayInput) | **Post** /user/createWithArray | Creates list of users with given input array
+[**CreateUsersWithListInput**](UserApi.md#CreateUsersWithListInput) | **Post** /user/createWithList | Creates list of users with given input array
+[**DeleteUser**](UserApi.md#DeleteUser) | **Delete** /user/{username} | Delete user
+[**GetUserByName**](UserApi.md#GetUserByName) | **Get** /user/{username} | Get user by user name
+[**LoginUser**](UserApi.md#LoginUser) | **Get** /user/login | Logs user into the system
+[**LogoutUser**](UserApi.md#LogoutUser) | **Get** /user/logout | Logs out current logged in user session
+[**UpdateUser**](UserApi.md#UpdateUser) | **Put** /user/{username} | Updated user
+
+
+# **CreateUser**
+> CreateUser($body)
+
+Create user
+
+This can only be done by the logged in user.
+
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**User**](User.md)| Created user object | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **CreateUsersWithArrayInput**
+> CreateUsersWithArrayInput($body)
+
+Creates list of users with given input array
+
+
+
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**[]User**](User.md)| List of user object | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **CreateUsersWithListInput**
+> CreateUsersWithListInput($body)
+
+Creates list of users with given input array
+
+
+
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**[]User**](User.md)| List of user object | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **DeleteUser**
+> DeleteUser($username)
+
+Delete user
+
+This can only be done by the logged in user.
+
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **string**| The name that needs to be deleted | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **GetUserByName**
+> User GetUserByName($username)
+
+Get user by user name
+
+
+
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **string**| The name that needs to be fetched. Use user1 for testing.  | 
+
+### Return type
+
+[**User**](User.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **LoginUser**
+> string LoginUser($username, $password)
+
+Logs user into the system
+
+
+
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **string**| The user name for login | 
+ **password** | **string**| The password for login in clear text | 
+
+### Return type
+
+**string**
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **LogoutUser**
+> LogoutUser()
+
+Logs out current logged in user session
+
+
+
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **UpdateUser**
+> UpdateUser($username, $body)
+
+Updated user
+
+This can only be done by the logged in user.
+
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **string**| name that need to be deleted | 
+ **body** | [**User**](User.md)| Updated user object | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP reuqest headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/samples/client/petstore/go/go-petstore/git_push.sh b/samples/client/petstore/go/go-petstore/git_push.sh
new file mode 100644
index 00000000000..1a36388db02
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="YOUR_GIT_USR_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="YOUR_GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/client/petstore/go/go-petstore/order.go b/samples/client/petstore/go/go-petstore/order.go
new file mode 100644
index 00000000000..a199bcc857d
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/order.go
@@ -0,0 +1,21 @@
+package swagger
+
+import (
+    "time"
+)
+
+
+type Order struct {
+    
+    Id  int64  `json:"id,omitempty"`
+    
+    PetId  int64  `json:"petId,omitempty"`
+    
+    Quantity  int32  `json:"quantity,omitempty"`
+    
+    ShipDate  time.Time  `json:"shipDate,omitempty"`
+    // Order Status
+    Status  string  `json:"status,omitempty"`
+    
+    Complete  bool  `json:"complete,omitempty"`
+}
diff --git a/samples/client/petstore/go/go-petstore/pet.go b/samples/client/petstore/go/go-petstore/pet.go
new file mode 100644
index 00000000000..32b9e6d97fc
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/pet.go
@@ -0,0 +1,20 @@
+package swagger
+
+import (
+)
+
+
+type Pet struct {
+    
+    Id  int64  `json:"id,omitempty"`
+    
+    Category  Category  `json:"category,omitempty"`
+    
+    Name  string  `json:"name,omitempty"`
+    
+    PhotoUrls  []string  `json:"photoUrls,omitempty"`
+    
+    Tags  []Tag  `json:"tags,omitempty"`
+    // pet status in the store
+    Status  string  `json:"status,omitempty"`
+}
diff --git a/samples/client/petstore/go/swagger/PetApi.go b/samples/client/petstore/go/go-petstore/pet_api.go
similarity index 58%
rename from samples/client/petstore/go/swagger/PetApi.go
rename to samples/client/petstore/go/go-petstore/pet_api.go
index 41353aac741..461df7449f3 100644
--- a/samples/client/petstore/go/swagger/PetApi.go
+++ b/samples/client/petstore/go/go-petstore/pet_api.go
@@ -35,21 +35,51 @@ func NewPetApiWithBasePath(basePath string) *PetApi{
  * @param body Pet object that needs to be added to the store
  * @return void
  */
-//func (a PetApi) AddPet (body Pet) (error) {
 func (a PetApi) AddPet (body Pet) (error) {
-
+    // verify the required parameter 'body' is set
+    if &body == nil {
+        return errors.New("Missing required parameter 'body' when calling PetApi->AddPet")
+    }
     _sling := sling.New().Post(a.Configuration.BasePath)
 
+    // authentication (petstore_auth) required
+        
+    // oauth required
+    if a.Configuration.AccessToken != ""{
+        _sling.Set("Authorization", "Bearer " +  a.Configuration.AccessToken)
+    }
+
     // create path and map variables
     path := "/v2/pet"
 
     _sling = _sling.Path(path)
 
-    // accept header
-    accepts := []string { "application/xml", "application/json" }
-    for key := range accepts {
-        _sling = _sling.Set("Accept", accepts[key])
-        break // only use the first Accept
+    // add default headers if any
+    for key := range a.Configuration.DefaultHeader {
+      _sling = _sling.Set(key, a.Configuration.DefaultHeader[key])
+    }
+    
+
+    // to determine the Content-Type header
+    localVarHttpContentTypes := []string {
+        "application/json", 
+        "application/xml", 
+    }
+    //set Content-Type header
+    localVarHttpContentType := a.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes)
+    if localVarHttpContentType != "" {    
+      _sling = _sling.Set("Content-Type", localVarHttpContentType)
+    }
+
+    // to determine the Accept header
+    localVarHttpHeaderAccepts := []string {
+        "application/xml", 
+        "application/json", 
+    }
+    //set Accept header
+    localVarHttpHeaderAccept := a.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+    if localVarHttpHeaderAccept != "" {  
+        _sling = _sling.Set("Accept", localVarHttpHeaderAccept)
     }
 
 // body params
@@ -96,22 +126,50 @@ func (a PetApi) AddPet (body Pet) (error) {
  * @param apiKey 
  * @return void
  */
-//func (a PetApi) DeletePet (petId int64, apiKey string) (error) {
 func (a PetApi) DeletePet (petId int64, apiKey string) (error) {
-
+    // verify the required parameter 'petId' is set
+    if &petId == nil {
+        return errors.New("Missing required parameter 'petId' when calling PetApi->DeletePet")
+    }
     _sling := sling.New().Delete(a.Configuration.BasePath)
 
+    // authentication (petstore_auth) required
+        
+    // oauth required
+    if a.Configuration.AccessToken != ""{
+        _sling.Set("Authorization", "Bearer " +  a.Configuration.AccessToken)
+    }
+
     // create path and map variables
     path := "/v2/pet/{petId}"
     path = strings.Replace(path, "{" + "petId" + "}", fmt.Sprintf("%v", petId), -1)
 
     _sling = _sling.Path(path)
 
-    // accept header
-    accepts := []string { "application/xml", "application/json" }
-    for key := range accepts {
-        _sling = _sling.Set("Accept", accepts[key])
-        break // only use the first Accept
+    // add default headers if any
+    for key := range a.Configuration.DefaultHeader {
+      _sling = _sling.Set(key, a.Configuration.DefaultHeader[key])
+    }
+    
+
+    // to determine the Content-Type header
+    localVarHttpContentTypes := []string {
+    }
+    //set Content-Type header
+    localVarHttpContentType := a.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes)
+    if localVarHttpContentType != "" {    
+      _sling = _sling.Set("Content-Type", localVarHttpContentType)
+    }
+
+    // to determine the Accept header
+    localVarHttpHeaderAccepts := []string {
+        "application/xml", 
+        "application/json", 
+    }
+    //set Accept header
+    localVarHttpHeaderAccept := a.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+    if localVarHttpHeaderAccept != "" {  
+        _sling = _sling.Set("Accept", localVarHttpHeaderAccept)
     }
     // header params "api_key"
     _sling = _sling.Set("api_key", apiKey)
@@ -157,25 +215,53 @@ func (a PetApi) DeletePet (petId int64, apiKey string) (error) {
  * @param status Status values that need to be considered for filter
  * @return []Pet
  */
-//func (a PetApi) FindPetsByStatus (status []string) ([]Pet, error) {
 func (a PetApi) FindPetsByStatus (status []string) ([]Pet, error) {
-
+    // verify the required parameter 'status' is set
+    if &status == nil {
+        return *new([]Pet), errors.New("Missing required parameter 'status' when calling PetApi->FindPetsByStatus")
+    }
     _sling := sling.New().Get(a.Configuration.BasePath)
 
+    // authentication (petstore_auth) required
+        
+    // oauth required
+    if a.Configuration.AccessToken != ""{
+        _sling.Set("Authorization", "Bearer " +  a.Configuration.AccessToken)
+    }
+
     // create path and map variables
     path := "/v2/pet/findByStatus"
 
     _sling = _sling.Path(path)
 
+    // add default headers if any
+    for key := range a.Configuration.DefaultHeader {
+      _sling = _sling.Set(key, a.Configuration.DefaultHeader[key])
+    }
+    
     type QueryParams struct {
-        status    []string `url:"status,omitempty"`
+        Status    []string `url:"status,omitempty"`
 }
-    _sling = _sling.QueryStruct(&QueryParams{ status: status })
-    // accept header
-    accepts := []string { "application/xml", "application/json" }
-    for key := range accepts {
-        _sling = _sling.Set("Accept", accepts[key])
-        break // only use the first Accept
+    _sling = _sling.QueryStruct(&QueryParams{ Status: status })
+
+    // to determine the Content-Type header
+    localVarHttpContentTypes := []string {
+    }
+    //set Content-Type header
+    localVarHttpContentType := a.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes)
+    if localVarHttpContentType != "" {    
+      _sling = _sling.Set("Content-Type", localVarHttpContentType)
+    }
+
+    // to determine the Accept header
+    localVarHttpHeaderAccepts := []string {
+        "application/xml", 
+        "application/json", 
+    }
+    //set Accept header
+    localVarHttpHeaderAccept := a.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+    if localVarHttpHeaderAccept != "" {  
+        _sling = _sling.Set("Accept", localVarHttpHeaderAccept)
     }
 
 
@@ -219,25 +305,53 @@ func (a PetApi) FindPetsByStatus (status []string) ([]Pet, error) {
  * @param tags Tags to filter by
  * @return []Pet
  */
-//func (a PetApi) FindPetsByTags (tags []string) ([]Pet, error) {
 func (a PetApi) FindPetsByTags (tags []string) ([]Pet, error) {
-
+    // verify the required parameter 'tags' is set
+    if &tags == nil {
+        return *new([]Pet), errors.New("Missing required parameter 'tags' when calling PetApi->FindPetsByTags")
+    }
     _sling := sling.New().Get(a.Configuration.BasePath)
 
+    // authentication (petstore_auth) required
+        
+    // oauth required
+    if a.Configuration.AccessToken != ""{
+        _sling.Set("Authorization", "Bearer " +  a.Configuration.AccessToken)
+    }
+
     // create path and map variables
     path := "/v2/pet/findByTags"
 
     _sling = _sling.Path(path)
 
+    // add default headers if any
+    for key := range a.Configuration.DefaultHeader {
+      _sling = _sling.Set(key, a.Configuration.DefaultHeader[key])
+    }
+    
     type QueryParams struct {
-        tags    []string `url:"tags,omitempty"`
+        Tags    []string `url:"tags,omitempty"`
 }
-    _sling = _sling.QueryStruct(&QueryParams{ tags: tags })
-    // accept header
-    accepts := []string { "application/xml", "application/json" }
-    for key := range accepts {
-        _sling = _sling.Set("Accept", accepts[key])
-        break // only use the first Accept
+    _sling = _sling.QueryStruct(&QueryParams{ Tags: tags })
+
+    // to determine the Content-Type header
+    localVarHttpContentTypes := []string {
+    }
+    //set Content-Type header
+    localVarHttpContentType := a.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes)
+    if localVarHttpContentType != "" {    
+      _sling = _sling.Set("Content-Type", localVarHttpContentType)
+    }
+
+    // to determine the Accept header
+    localVarHttpHeaderAccepts := []string {
+        "application/xml", 
+        "application/json", 
+    }
+    //set Accept header
+    localVarHttpHeaderAccept := a.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+    if localVarHttpHeaderAccept != "" {  
+        _sling = _sling.Set("Accept", localVarHttpHeaderAccept)
     }
 
 
@@ -281,22 +395,49 @@ func (a PetApi) FindPetsByTags (tags []string) ([]Pet, error) {
  * @param petId ID of pet to return
  * @return Pet
  */
-//func (a PetApi) GetPetById (petId int64) (Pet, error) {
 func (a PetApi) GetPetById (petId int64) (Pet, error) {
-
+    // verify the required parameter 'petId' is set
+    if &petId == nil {
+        return *new(Pet), errors.New("Missing required parameter 'petId' when calling PetApi->GetPetById")
+    }
     _sling := sling.New().Get(a.Configuration.BasePath)
 
+    // authentication (api_key) required
+    
+    // set key with prefix in header
+    _sling.Set("api_key", a.Configuration.GetApiKeyWithPrefix("api_key"))
+        
+
     // create path and map variables
     path := "/v2/pet/{petId}"
     path = strings.Replace(path, "{" + "petId" + "}", fmt.Sprintf("%v", petId), -1)
 
     _sling = _sling.Path(path)
 
-    // accept header
-    accepts := []string { "application/xml", "application/json" }
-    for key := range accepts {
-        _sling = _sling.Set("Accept", accepts[key])
-        break // only use the first Accept
+    // add default headers if any
+    for key := range a.Configuration.DefaultHeader {
+      _sling = _sling.Set(key, a.Configuration.DefaultHeader[key])
+    }
+    
+
+    // to determine the Content-Type header
+    localVarHttpContentTypes := []string {
+    }
+    //set Content-Type header
+    localVarHttpContentType := a.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes)
+    if localVarHttpContentType != "" {    
+      _sling = _sling.Set("Content-Type", localVarHttpContentType)
+    }
+
+    // to determine the Accept header
+    localVarHttpHeaderAccepts := []string {
+        "application/xml", 
+        "application/json", 
+    }
+    //set Accept header
+    localVarHttpHeaderAccept := a.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+    if localVarHttpHeaderAccept != "" {  
+        _sling = _sling.Set("Accept", localVarHttpHeaderAccept)
     }
 
 
@@ -340,21 +481,51 @@ func (a PetApi) GetPetById (petId int64) (Pet, error) {
  * @param body Pet object that needs to be added to the store
  * @return void
  */
-//func (a PetApi) UpdatePet (body Pet) (error) {
 func (a PetApi) UpdatePet (body Pet) (error) {
-
+    // verify the required parameter 'body' is set
+    if &body == nil {
+        return errors.New("Missing required parameter 'body' when calling PetApi->UpdatePet")
+    }
     _sling := sling.New().Put(a.Configuration.BasePath)
 
+    // authentication (petstore_auth) required
+        
+    // oauth required
+    if a.Configuration.AccessToken != ""{
+        _sling.Set("Authorization", "Bearer " +  a.Configuration.AccessToken)
+    }
+
     // create path and map variables
     path := "/v2/pet"
 
     _sling = _sling.Path(path)
 
-    // accept header
-    accepts := []string { "application/xml", "application/json" }
-    for key := range accepts {
-        _sling = _sling.Set("Accept", accepts[key])
-        break // only use the first Accept
+    // add default headers if any
+    for key := range a.Configuration.DefaultHeader {
+      _sling = _sling.Set(key, a.Configuration.DefaultHeader[key])
+    }
+    
+
+    // to determine the Content-Type header
+    localVarHttpContentTypes := []string {
+        "application/json", 
+        "application/xml", 
+    }
+    //set Content-Type header
+    localVarHttpContentType := a.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes)
+    if localVarHttpContentType != "" {    
+      _sling = _sling.Set("Content-Type", localVarHttpContentType)
+    }
+
+    // to determine the Accept header
+    localVarHttpHeaderAccepts := []string {
+        "application/xml", 
+        "application/json", 
+    }
+    //set Accept header
+    localVarHttpHeaderAccept := a.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+    if localVarHttpHeaderAccept != "" {  
+        _sling = _sling.Set("Accept", localVarHttpHeaderAccept)
     }
 
 // body params
@@ -402,29 +573,58 @@ func (a PetApi) UpdatePet (body Pet) (error) {
  * @param status Updated status of the pet
  * @return void
  */
-//func (a PetApi) UpdatePetWithForm (petId int64, name string, status string) (error) {
 func (a PetApi) UpdatePetWithForm (petId int64, name string, status string) (error) {
-
+    // verify the required parameter 'petId' is set
+    if &petId == nil {
+        return errors.New("Missing required parameter 'petId' when calling PetApi->UpdatePetWithForm")
+    }
     _sling := sling.New().Post(a.Configuration.BasePath)
 
+    // authentication (petstore_auth) required
+        
+    // oauth required
+    if a.Configuration.AccessToken != ""{
+        _sling.Set("Authorization", "Bearer " +  a.Configuration.AccessToken)
+    }
+
     // create path and map variables
     path := "/v2/pet/{petId}"
     path = strings.Replace(path, "{" + "petId" + "}", fmt.Sprintf("%v", petId), -1)
 
     _sling = _sling.Path(path)
 
-    // accept header
-    accepts := []string { "application/xml", "application/json" }
-    for key := range accepts {
-        _sling = _sling.Set("Accept", accepts[key])
-        break // only use the first Accept
+    // add default headers if any
+    for key := range a.Configuration.DefaultHeader {
+      _sling = _sling.Set(key, a.Configuration.DefaultHeader[key])
+    }
+    
+
+    // to determine the Content-Type header
+    localVarHttpContentTypes := []string {
+        "application/x-www-form-urlencoded", 
+    }
+    //set Content-Type header
+    localVarHttpContentType := a.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes)
+    if localVarHttpContentType != "" {    
+      _sling = _sling.Set("Content-Type", localVarHttpContentType)
+    }
+
+    // to determine the Accept header
+    localVarHttpHeaderAccepts := []string {
+        "application/xml", 
+        "application/json", 
+    }
+    //set Accept header
+    localVarHttpHeaderAccept := a.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+    if localVarHttpHeaderAccept != "" {  
+        _sling = _sling.Set("Accept", localVarHttpHeaderAccept)
     }
 
     type FormParams struct {
-        name    string `url:"name,omitempty"`
-        status    string `url:"status,omitempty"`
+        Name    string `url:"name,omitempty"`
+        Status    string `url:"status,omitempty"`
     }
-    _sling = _sling.BodyForm(&FormParams{ name: name,status: status })
+    _sling = _sling.BodyForm(&FormParams{ Name: name,Status: status })
 
 
 
@@ -468,29 +668,57 @@ func (a PetApi) UpdatePetWithForm (petId int64, name string, status string) (err
  * @param file file to upload
  * @return ApiResponse
  */
-//func (a PetApi) UploadFile (petId int64, additionalMetadata string, file *os.File) (ApiResponse, error) {
 func (a PetApi) UploadFile (petId int64, additionalMetadata string, file *os.File) (ApiResponse, error) {
-
+    // verify the required parameter 'petId' is set
+    if &petId == nil {
+        return *new(ApiResponse), errors.New("Missing required parameter 'petId' when calling PetApi->UploadFile")
+    }
     _sling := sling.New().Post(a.Configuration.BasePath)
 
+    // authentication (petstore_auth) required
+        
+    // oauth required
+    if a.Configuration.AccessToken != ""{
+        _sling.Set("Authorization", "Bearer " +  a.Configuration.AccessToken)
+    }
+
     // create path and map variables
     path := "/v2/pet/{petId}/uploadImage"
     path = strings.Replace(path, "{" + "petId" + "}", fmt.Sprintf("%v", petId), -1)
 
     _sling = _sling.Path(path)
 
-    // accept header
-    accepts := []string { "application/json" }
-    for key := range accepts {
-        _sling = _sling.Set("Accept", accepts[key])
-        break // only use the first Accept
+    // add default headers if any
+    for key := range a.Configuration.DefaultHeader {
+      _sling = _sling.Set(key, a.Configuration.DefaultHeader[key])
+    }
+    
+
+    // to determine the Content-Type header
+    localVarHttpContentTypes := []string {
+        "multipart/form-data", 
+    }
+    //set Content-Type header
+    localVarHttpContentType := a.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes)
+    if localVarHttpContentType != "" {    
+      _sling = _sling.Set("Content-Type", localVarHttpContentType)
+    }
+
+    // to determine the Accept header
+    localVarHttpHeaderAccepts := []string {
+        "application/json", 
+    }
+    //set Accept header
+    localVarHttpHeaderAccept := a.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+    if localVarHttpHeaderAccept != "" {  
+        _sling = _sling.Set("Accept", localVarHttpHeaderAccept)
     }
 
     type FormParams struct {
-        additionalMetadata    string `url:"additionalMetadata,omitempty"`
-        file    *os.File `url:"file,omitempty"`
+        AdditionalMetadata    string `url:"additionalMetadata,omitempty"`
+        File    *os.File `url:"file,omitempty"`
     }
-    _sling = _sling.BodyForm(&FormParams{ additionalMetadata: additionalMetadata,file: file })
+    _sling = _sling.BodyForm(&FormParams{ AdditionalMetadata: additionalMetadata,File: file })
 
   var successPayload = new(ApiResponse)
 
diff --git a/samples/client/petstore/go/go-petstore/pom.xml b/samples/client/petstore/go/go-petstore/pom.xml
new file mode 100644
index 00000000000..50bfe7f14f8
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/pom.xml
@@ -0,0 +1,75 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.wordnik</groupId>
+    <artifactId>Goswagger</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0.0</version>
+    <name>Goswagger</name>
+ <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <id>go-get-testify</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>go</executable>
+                            <arguments>
+                                <argument>get</argument>
+                                <argument>github.com/stretchr/testify/assert</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>go-get-sling</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>go</executable>
+                            <arguments>
+                                <argument>get</argument>
+                                <argument>github.com/dghubble/sling</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>go-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>go</executable>
+                            <arguments>
+                                <argument>test</argument>
+                                <argument>-v</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/samples/client/petstore/go/swagger/StoreApi.go b/samples/client/petstore/go/go-petstore/store_api.go
similarity index 64%
rename from samples/client/petstore/go/swagger/StoreApi.go
rename to samples/client/petstore/go/go-petstore/store_api.go
index 8d3e41e71e1..2fa59c1efd1 100644
--- a/samples/client/petstore/go/swagger/StoreApi.go
+++ b/samples/client/petstore/go/go-petstore/store_api.go
@@ -34,22 +34,44 @@ func NewStoreApiWithBasePath(basePath string) *StoreApi{
  * @param orderId ID of the order that needs to be deleted
  * @return void
  */
-//func (a StoreApi) DeleteOrder (orderId string) (error) {
 func (a StoreApi) DeleteOrder (orderId string) (error) {
-
+    // verify the required parameter 'orderId' is set
+    if &orderId == nil {
+        return errors.New("Missing required parameter 'orderId' when calling StoreApi->DeleteOrder")
+    }
     _sling := sling.New().Delete(a.Configuration.BasePath)
 
+    
     // create path and map variables
     path := "/v2/store/order/{orderId}"
     path = strings.Replace(path, "{" + "orderId" + "}", fmt.Sprintf("%v", orderId), -1)
 
     _sling = _sling.Path(path)
 
-    // accept header
-    accepts := []string { "application/xml", "application/json" }
-    for key := range accepts {
-        _sling = _sling.Set("Accept", accepts[key])
-        break // only use the first Accept
+    // add default headers if any
+    for key := range a.Configuration.DefaultHeader {
+      _sling = _sling.Set(key, a.Configuration.DefaultHeader[key])
+    }
+    
+
+    // to determine the Content-Type header
+    localVarHttpContentTypes := []string {
+    }
+    //set Content-Type header
+    localVarHttpContentType := a.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes)
+    if localVarHttpContentType != "" {    
+      _sling = _sling.Set("Content-Type", localVarHttpContentType)
+    }
+
+    // to determine the Accept header
+    localVarHttpHeaderAccepts := []string {
+        "application/xml", 
+        "application/json", 
+    }
+    //set Accept header
+    localVarHttpHeaderAccept := a.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+    if localVarHttpHeaderAccept != "" {  
+        _sling = _sling.Set("Accept", localVarHttpHeaderAccept)
     }
 
 
@@ -92,21 +114,43 @@ func (a StoreApi) DeleteOrder (orderId string) (error) {
  * Returns a map of status codes to quantities
  * @return map[string]int32
  */
-//func (a StoreApi) GetInventory () (map[string]int32, error) {
 func (a StoreApi) GetInventory () (map[string]int32, error) {
-
     _sling := sling.New().Get(a.Configuration.BasePath)
 
+    // authentication (api_key) required
+    
+    // set key with prefix in header
+    _sling.Set("api_key", a.Configuration.GetApiKeyWithPrefix("api_key"))
+        
+
     // create path and map variables
     path := "/v2/store/inventory"
 
     _sling = _sling.Path(path)
 
-    // accept header
-    accepts := []string { "application/json" }
-    for key := range accepts {
-        _sling = _sling.Set("Accept", accepts[key])
-        break // only use the first Accept
+    // add default headers if any
+    for key := range a.Configuration.DefaultHeader {
+      _sling = _sling.Set(key, a.Configuration.DefaultHeader[key])
+    }
+    
+
+    // to determine the Content-Type header
+    localVarHttpContentTypes := []string {
+    }
+    //set Content-Type header
+    localVarHttpContentType := a.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes)
+    if localVarHttpContentType != "" {    
+      _sling = _sling.Set("Content-Type", localVarHttpContentType)
+    }
+
+    // to determine the Accept header
+    localVarHttpHeaderAccepts := []string {
+        "application/json", 
+    }
+    //set Accept header
+    localVarHttpHeaderAccept := a.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+    if localVarHttpHeaderAccept != "" {  
+        _sling = _sling.Set("Accept", localVarHttpHeaderAccept)
     }
 
 
@@ -150,22 +194,44 @@ func (a StoreApi) GetInventory () (map[string]int32, error) {
  * @param orderId ID of pet that needs to be fetched
  * @return Order
  */
-//func (a StoreApi) GetOrderById (orderId int64) (Order, error) {
 func (a StoreApi) GetOrderById (orderId int64) (Order, error) {
-
+    // verify the required parameter 'orderId' is set
+    if &orderId == nil {
+        return *new(Order), errors.New("Missing required parameter 'orderId' when calling StoreApi->GetOrderById")
+    }
     _sling := sling.New().Get(a.Configuration.BasePath)
 
+    
     // create path and map variables
     path := "/v2/store/order/{orderId}"
     path = strings.Replace(path, "{" + "orderId" + "}", fmt.Sprintf("%v", orderId), -1)
 
     _sling = _sling.Path(path)
 
-    // accept header
-    accepts := []string { "application/xml", "application/json" }
-    for key := range accepts {
-        _sling = _sling.Set("Accept", accepts[key])
-        break // only use the first Accept
+    // add default headers if any
+    for key := range a.Configuration.DefaultHeader {
+      _sling = _sling.Set(key, a.Configuration.DefaultHeader[key])
+    }
+    
+
+    // to determine the Content-Type header
+    localVarHttpContentTypes := []string {
+    }
+    //set Content-Type header
+    localVarHttpContentType := a.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes)
+    if localVarHttpContentType != "" {    
+      _sling = _sling.Set("Content-Type", localVarHttpContentType)
+    }
+
+    // to determine the Accept header
+    localVarHttpHeaderAccepts := []string {
+        "application/xml", 
+        "application/json", 
+    }
+    //set Accept header
+    localVarHttpHeaderAccept := a.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+    if localVarHttpHeaderAccept != "" {  
+        _sling = _sling.Set("Accept", localVarHttpHeaderAccept)
     }
 
 
@@ -209,21 +275,43 @@ func (a StoreApi) GetOrderById (orderId int64) (Order, error) {
  * @param body order placed for purchasing the pet
  * @return Order
  */
-//func (a StoreApi) PlaceOrder (body Order) (Order, error) {
 func (a StoreApi) PlaceOrder (body Order) (Order, error) {
-
+    // verify the required parameter 'body' is set
+    if &body == nil {
+        return *new(Order), errors.New("Missing required parameter 'body' when calling StoreApi->PlaceOrder")
+    }
     _sling := sling.New().Post(a.Configuration.BasePath)
 
+    
     // create path and map variables
     path := "/v2/store/order"
 
     _sling = _sling.Path(path)
 
-    // accept header
-    accepts := []string { "application/xml", "application/json" }
-    for key := range accepts {
-        _sling = _sling.Set("Accept", accepts[key])
-        break // only use the first Accept
+    // add default headers if any
+    for key := range a.Configuration.DefaultHeader {
+      _sling = _sling.Set(key, a.Configuration.DefaultHeader[key])
+    }
+    
+
+    // to determine the Content-Type header
+    localVarHttpContentTypes := []string {
+    }
+    //set Content-Type header
+    localVarHttpContentType := a.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes)
+    if localVarHttpContentType != "" {    
+      _sling = _sling.Set("Content-Type", localVarHttpContentType)
+    }
+
+    // to determine the Accept header
+    localVarHttpHeaderAccepts := []string {
+        "application/xml", 
+        "application/json", 
+    }
+    //set Accept header
+    localVarHttpHeaderAccept := a.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+    if localVarHttpHeaderAccept != "" {  
+        _sling = _sling.Set("Accept", localVarHttpHeaderAccept)
     }
 
 // body params
diff --git a/samples/client/petstore/go/swagger/Tag.go b/samples/client/petstore/go/go-petstore/tag.go
similarity index 61%
rename from samples/client/petstore/go/swagger/Tag.go
rename to samples/client/petstore/go/go-petstore/tag.go
index bb27c61b39c..7347106078a 100644
--- a/samples/client/petstore/go/swagger/Tag.go
+++ b/samples/client/petstore/go/go-petstore/tag.go
@@ -3,7 +3,10 @@ package swagger
 import (
 )
 
+
 type Tag struct {
+    
     Id  int64  `json:"id,omitempty"`
-Name  string  `json:"name,omitempty"`
+    
+    Name  string  `json:"name,omitempty"`
 }
diff --git a/samples/client/petstore/go/go-petstore/user.go b/samples/client/petstore/go/go-petstore/user.go
new file mode 100644
index 00000000000..8f459db4674
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/user.go
@@ -0,0 +1,24 @@
+package swagger
+
+import (
+)
+
+
+type User struct {
+    
+    Id  int64  `json:"id,omitempty"`
+    
+    Username  string  `json:"username,omitempty"`
+    
+    FirstName  string  `json:"firstName,omitempty"`
+    
+    LastName  string  `json:"lastName,omitempty"`
+    
+    Email  string  `json:"email,omitempty"`
+    
+    Password  string  `json:"password,omitempty"`
+    
+    Phone  string  `json:"phone,omitempty"`
+    // User Status
+    UserStatus  int32  `json:"userStatus,omitempty"`
+}
diff --git a/samples/client/petstore/go/swagger/UserApi.go b/samples/client/petstore/go/go-petstore/user_api.go
similarity index 61%
rename from samples/client/petstore/go/swagger/UserApi.go
rename to samples/client/petstore/go/go-petstore/user_api.go
index f8c8581aa3b..b6639d9e65f 100644
--- a/samples/client/petstore/go/swagger/UserApi.go
+++ b/samples/client/petstore/go/go-petstore/user_api.go
@@ -34,21 +34,43 @@ func NewUserApiWithBasePath(basePath string) *UserApi{
  * @param body Created user object
  * @return void
  */
-//func (a UserApi) CreateUser (body User) (error) {
 func (a UserApi) CreateUser (body User) (error) {
-
+    // verify the required parameter 'body' is set
+    if &body == nil {
+        return errors.New("Missing required parameter 'body' when calling UserApi->CreateUser")
+    }
     _sling := sling.New().Post(a.Configuration.BasePath)
 
+    
     // create path and map variables
     path := "/v2/user"
 
     _sling = _sling.Path(path)
 
-    // accept header
-    accepts := []string { "application/xml", "application/json" }
-    for key := range accepts {
-        _sling = _sling.Set("Accept", accepts[key])
-        break // only use the first Accept
+    // add default headers if any
+    for key := range a.Configuration.DefaultHeader {
+      _sling = _sling.Set(key, a.Configuration.DefaultHeader[key])
+    }
+    
+
+    // to determine the Content-Type header
+    localVarHttpContentTypes := []string {
+    }
+    //set Content-Type header
+    localVarHttpContentType := a.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes)
+    if localVarHttpContentType != "" {    
+      _sling = _sling.Set("Content-Type", localVarHttpContentType)
+    }
+
+    // to determine the Accept header
+    localVarHttpHeaderAccepts := []string {
+        "application/xml", 
+        "application/json", 
+    }
+    //set Accept header
+    localVarHttpHeaderAccept := a.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+    if localVarHttpHeaderAccept != "" {  
+        _sling = _sling.Set("Accept", localVarHttpHeaderAccept)
     }
 
 // body params
@@ -94,21 +116,43 @@ func (a UserApi) CreateUser (body User) (error) {
  * @param body List of user object
  * @return void
  */
-//func (a UserApi) CreateUsersWithArrayInput (body []User) (error) {
 func (a UserApi) CreateUsersWithArrayInput (body []User) (error) {
-
+    // verify the required parameter 'body' is set
+    if &body == nil {
+        return errors.New("Missing required parameter 'body' when calling UserApi->CreateUsersWithArrayInput")
+    }
     _sling := sling.New().Post(a.Configuration.BasePath)
 
+    
     // create path and map variables
     path := "/v2/user/createWithArray"
 
     _sling = _sling.Path(path)
 
-    // accept header
-    accepts := []string { "application/xml", "application/json" }
-    for key := range accepts {
-        _sling = _sling.Set("Accept", accepts[key])
-        break // only use the first Accept
+    // add default headers if any
+    for key := range a.Configuration.DefaultHeader {
+      _sling = _sling.Set(key, a.Configuration.DefaultHeader[key])
+    }
+    
+
+    // to determine the Content-Type header
+    localVarHttpContentTypes := []string {
+    }
+    //set Content-Type header
+    localVarHttpContentType := a.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes)
+    if localVarHttpContentType != "" {    
+      _sling = _sling.Set("Content-Type", localVarHttpContentType)
+    }
+
+    // to determine the Accept header
+    localVarHttpHeaderAccepts := []string {
+        "application/xml", 
+        "application/json", 
+    }
+    //set Accept header
+    localVarHttpHeaderAccept := a.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+    if localVarHttpHeaderAccept != "" {  
+        _sling = _sling.Set("Accept", localVarHttpHeaderAccept)
     }
 
 // body params
@@ -154,21 +198,43 @@ func (a UserApi) CreateUsersWithArrayInput (body []User) (error) {
  * @param body List of user object
  * @return void
  */
-//func (a UserApi) CreateUsersWithListInput (body []User) (error) {
 func (a UserApi) CreateUsersWithListInput (body []User) (error) {
-
+    // verify the required parameter 'body' is set
+    if &body == nil {
+        return errors.New("Missing required parameter 'body' when calling UserApi->CreateUsersWithListInput")
+    }
     _sling := sling.New().Post(a.Configuration.BasePath)
 
+    
     // create path and map variables
     path := "/v2/user/createWithList"
 
     _sling = _sling.Path(path)
 
-    // accept header
-    accepts := []string { "application/xml", "application/json" }
-    for key := range accepts {
-        _sling = _sling.Set("Accept", accepts[key])
-        break // only use the first Accept
+    // add default headers if any
+    for key := range a.Configuration.DefaultHeader {
+      _sling = _sling.Set(key, a.Configuration.DefaultHeader[key])
+    }
+    
+
+    // to determine the Content-Type header
+    localVarHttpContentTypes := []string {
+    }
+    //set Content-Type header
+    localVarHttpContentType := a.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes)
+    if localVarHttpContentType != "" {    
+      _sling = _sling.Set("Content-Type", localVarHttpContentType)
+    }
+
+    // to determine the Accept header
+    localVarHttpHeaderAccepts := []string {
+        "application/xml", 
+        "application/json", 
+    }
+    //set Accept header
+    localVarHttpHeaderAccept := a.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+    if localVarHttpHeaderAccept != "" {  
+        _sling = _sling.Set("Accept", localVarHttpHeaderAccept)
     }
 
 // body params
@@ -214,22 +280,44 @@ func (a UserApi) CreateUsersWithListInput (body []User) (error) {
  * @param username The name that needs to be deleted
  * @return void
  */
-//func (a UserApi) DeleteUser (username string) (error) {
 func (a UserApi) DeleteUser (username string) (error) {
-
+    // verify the required parameter 'username' is set
+    if &username == nil {
+        return errors.New("Missing required parameter 'username' when calling UserApi->DeleteUser")
+    }
     _sling := sling.New().Delete(a.Configuration.BasePath)
 
+    
     // create path and map variables
     path := "/v2/user/{username}"
     path = strings.Replace(path, "{" + "username" + "}", fmt.Sprintf("%v", username), -1)
 
     _sling = _sling.Path(path)
 
-    // accept header
-    accepts := []string { "application/xml", "application/json" }
-    for key := range accepts {
-        _sling = _sling.Set("Accept", accepts[key])
-        break // only use the first Accept
+    // add default headers if any
+    for key := range a.Configuration.DefaultHeader {
+      _sling = _sling.Set(key, a.Configuration.DefaultHeader[key])
+    }
+    
+
+    // to determine the Content-Type header
+    localVarHttpContentTypes := []string {
+    }
+    //set Content-Type header
+    localVarHttpContentType := a.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes)
+    if localVarHttpContentType != "" {    
+      _sling = _sling.Set("Content-Type", localVarHttpContentType)
+    }
+
+    // to determine the Accept header
+    localVarHttpHeaderAccepts := []string {
+        "application/xml", 
+        "application/json", 
+    }
+    //set Accept header
+    localVarHttpHeaderAccept := a.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+    if localVarHttpHeaderAccept != "" {  
+        _sling = _sling.Set("Accept", localVarHttpHeaderAccept)
     }
 
 
@@ -273,22 +361,44 @@ func (a UserApi) DeleteUser (username string) (error) {
  * @param username The name that needs to be fetched. Use user1 for testing. 
  * @return User
  */
-//func (a UserApi) GetUserByName (username string) (User, error) {
 func (a UserApi) GetUserByName (username string) (User, error) {
-
+    // verify the required parameter 'username' is set
+    if &username == nil {
+        return *new(User), errors.New("Missing required parameter 'username' when calling UserApi->GetUserByName")
+    }
     _sling := sling.New().Get(a.Configuration.BasePath)
 
+    
     // create path and map variables
     path := "/v2/user/{username}"
     path = strings.Replace(path, "{" + "username" + "}", fmt.Sprintf("%v", username), -1)
 
     _sling = _sling.Path(path)
 
-    // accept header
-    accepts := []string { "application/xml", "application/json" }
-    for key := range accepts {
-        _sling = _sling.Set("Accept", accepts[key])
-        break // only use the first Accept
+    // add default headers if any
+    for key := range a.Configuration.DefaultHeader {
+      _sling = _sling.Set(key, a.Configuration.DefaultHeader[key])
+    }
+    
+
+    // to determine the Content-Type header
+    localVarHttpContentTypes := []string {
+    }
+    //set Content-Type header
+    localVarHttpContentType := a.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes)
+    if localVarHttpContentType != "" {    
+      _sling = _sling.Set("Content-Type", localVarHttpContentType)
+    }
+
+    // to determine the Accept header
+    localVarHttpHeaderAccepts := []string {
+        "application/xml", 
+        "application/json", 
+    }
+    //set Accept header
+    localVarHttpHeaderAccept := a.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+    if localVarHttpHeaderAccept != "" {  
+        _sling = _sling.Set("Accept", localVarHttpHeaderAccept)
     }
 
 
@@ -333,26 +443,52 @@ func (a UserApi) GetUserByName (username string) (User, error) {
  * @param password The password for login in clear text
  * @return string
  */
-//func (a UserApi) LoginUser (username string, password string) (string, error) {
 func (a UserApi) LoginUser (username string, password string) (string, error) {
-
+    // verify the required parameter 'username' is set
+    if &username == nil {
+        return *new(string), errors.New("Missing required parameter 'username' when calling UserApi->LoginUser")
+    }
+    // verify the required parameter 'password' is set
+    if &password == nil {
+        return *new(string), errors.New("Missing required parameter 'password' when calling UserApi->LoginUser")
+    }
     _sling := sling.New().Get(a.Configuration.BasePath)
 
+    
     // create path and map variables
     path := "/v2/user/login"
 
     _sling = _sling.Path(path)
 
+    // add default headers if any
+    for key := range a.Configuration.DefaultHeader {
+      _sling = _sling.Set(key, a.Configuration.DefaultHeader[key])
+    }
+    
     type QueryParams struct {
-        username    string `url:"username,omitempty"`
-password    string `url:"password,omitempty"`
+        Username    string `url:"username,omitempty"`
+Password    string `url:"password,omitempty"`
 }
-    _sling = _sling.QueryStruct(&QueryParams{ username: username,password: password })
-    // accept header
-    accepts := []string { "application/xml", "application/json" }
-    for key := range accepts {
-        _sling = _sling.Set("Accept", accepts[key])
-        break // only use the first Accept
+    _sling = _sling.QueryStruct(&QueryParams{ Username: username,Password: password })
+
+    // to determine the Content-Type header
+    localVarHttpContentTypes := []string {
+    }
+    //set Content-Type header
+    localVarHttpContentType := a.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes)
+    if localVarHttpContentType != "" {    
+      _sling = _sling.Set("Content-Type", localVarHttpContentType)
+    }
+
+    // to determine the Accept header
+    localVarHttpHeaderAccepts := []string {
+        "application/xml", 
+        "application/json", 
+    }
+    //set Accept header
+    localVarHttpHeaderAccept := a.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+    if localVarHttpHeaderAccept != "" {  
+        _sling = _sling.Set("Accept", localVarHttpHeaderAccept)
     }
 
 
@@ -395,21 +531,39 @@ password    string `url:"password,omitempty"`
  * 
  * @return void
  */
-//func (a UserApi) LogoutUser () (error) {
 func (a UserApi) LogoutUser () (error) {
-
     _sling := sling.New().Get(a.Configuration.BasePath)
 
+    
     // create path and map variables
     path := "/v2/user/logout"
 
     _sling = _sling.Path(path)
 
-    // accept header
-    accepts := []string { "application/xml", "application/json" }
-    for key := range accepts {
-        _sling = _sling.Set("Accept", accepts[key])
-        break // only use the first Accept
+    // add default headers if any
+    for key := range a.Configuration.DefaultHeader {
+      _sling = _sling.Set(key, a.Configuration.DefaultHeader[key])
+    }
+    
+
+    // to determine the Content-Type header
+    localVarHttpContentTypes := []string {
+    }
+    //set Content-Type header
+    localVarHttpContentType := a.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes)
+    if localVarHttpContentType != "" {    
+      _sling = _sling.Set("Content-Type", localVarHttpContentType)
+    }
+
+    // to determine the Accept header
+    localVarHttpHeaderAccepts := []string {
+        "application/xml", 
+        "application/json", 
+    }
+    //set Accept header
+    localVarHttpHeaderAccept := a.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+    if localVarHttpHeaderAccept != "" {  
+        _sling = _sling.Set("Accept", localVarHttpHeaderAccept)
     }
 
 
@@ -454,22 +608,48 @@ func (a UserApi) LogoutUser () (error) {
  * @param body Updated user object
  * @return void
  */
-//func (a UserApi) UpdateUser (username string, body User) (error) {
 func (a UserApi) UpdateUser (username string, body User) (error) {
-
+    // verify the required parameter 'username' is set
+    if &username == nil {
+        return errors.New("Missing required parameter 'username' when calling UserApi->UpdateUser")
+    }
+    // verify the required parameter 'body' is set
+    if &body == nil {
+        return errors.New("Missing required parameter 'body' when calling UserApi->UpdateUser")
+    }
     _sling := sling.New().Put(a.Configuration.BasePath)
 
+    
     // create path and map variables
     path := "/v2/user/{username}"
     path = strings.Replace(path, "{" + "username" + "}", fmt.Sprintf("%v", username), -1)
 
     _sling = _sling.Path(path)
 
-    // accept header
-    accepts := []string { "application/xml", "application/json" }
-    for key := range accepts {
-        _sling = _sling.Set("Accept", accepts[key])
-        break // only use the first Accept
+    // add default headers if any
+    for key := range a.Configuration.DefaultHeader {
+      _sling = _sling.Set(key, a.Configuration.DefaultHeader[key])
+    }
+    
+
+    // to determine the Content-Type header
+    localVarHttpContentTypes := []string {
+    }
+    //set Content-Type header
+    localVarHttpContentType := a.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes)
+    if localVarHttpContentType != "" {    
+      _sling = _sling.Set("Content-Type", localVarHttpContentType)
+    }
+
+    // to determine the Accept header
+    localVarHttpHeaderAccepts := []string {
+        "application/xml", 
+        "application/json", 
+    }
+    //set Accept header
+    localVarHttpHeaderAccept := a.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+    if localVarHttpHeaderAccept != "" {  
+        _sling = _sling.Set("Accept", localVarHttpHeaderAccept)
     }
 
 // body params
diff --git a/samples/client/petstore/go/petStore_test.go b/samples/client/petstore/go/pet_api_test.go
similarity index 76%
rename from samples/client/petstore/go/petStore_test.go
rename to samples/client/petstore/go/pet_api_test.go
index e3df602c3b8..8ac7dc1a77a 100644
--- a/samples/client/petstore/go/petStore_test.go
+++ b/samples/client/petstore/go/pet_api_test.go
@@ -1,14 +1,12 @@
 package main
 
 import (
-	"testing"
-
-	sw "./swagger"
+	sw "./go-petstore"
 	"github.com/stretchr/testify/assert"
+	"testing"
 )
 
 func TestAddPet(t *testing.T) {
-	t.Log("Testing TestAddPet...")
 	s := sw.NewPetApi()
 	newPet := (sw.Pet{Id: 12830, Name: "gopher",
 		PhotoUrls: []string{"http://1.com", "http://2.com"}, Status: "pending"})
@@ -23,7 +21,6 @@ func TestAddPet(t *testing.T) {
 
 func TestGetPetById(t *testing.T) {
 	assert := assert.New(t)
-	t.Log("Testing TestGetPetById...")
 
 	s := sw.NewPetApi()
 	resp, err := s.GetPetById(12830)
@@ -31,19 +28,17 @@ func TestGetPetById(t *testing.T) {
 		t.Errorf("Error while getting pet by id")
 		t.Log(err)
 	} else {
-		assert.Equal(resp.Id, 12830, "Pet id should be equal")
+		assert.Equal(resp.Id, int64(12830), "Pet id should be equal")
 		assert.Equal(resp.Name, "gopher", "Pet name should be gopher")
 		assert.Equal(resp.Status, "pending", "Pet status should be pending")
 
-		t.Log(resp)
+		//t.Log(resp)
 	}
 }
 
 func TestUpdatePetWithForm(t *testing.T) {
-	t.Log("Testing UpdatePetWithForm...")
-
 	s := sw.NewPetApi()
-	err := s.UpdatePetWithForm("12830", "golang", "available")
+	err := s.UpdatePetWithForm(12830, "golang", "available")
 
 	if err != nil {
 		t.Errorf("Error while updating pet by id")
diff --git a/samples/client/petstore/go/pom.xml b/samples/client/petstore/go/pom.xml
new file mode 100644
index 00000000000..50bfe7f14f8
--- /dev/null
+++ b/samples/client/petstore/go/pom.xml
@@ -0,0 +1,75 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.wordnik</groupId>
+    <artifactId>Goswagger</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0.0</version>
+    <name>Goswagger</name>
+ <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <id>go-get-testify</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>go</executable>
+                            <arguments>
+                                <argument>get</argument>
+                                <argument>github.com/stretchr/testify/assert</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>go-get-sling</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>go</executable>
+                            <arguments>
+                                <argument>get</argument>
+                                <argument>github.com/dghubble/sling</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>go-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>go</executable>
+                            <arguments>
+                                <argument>test</argument>
+                                <argument>-v</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/samples/client/petstore/go/swagger/Configuration.go b/samples/client/petstore/go/swagger/Configuration.go
deleted file mode 100644
index 7535db5e67f..00000000000
--- a/samples/client/petstore/go/swagger/Configuration.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package swagger
-
-import (
-
-)
-
-type Configuration struct {
-    UserName  string  `json:"userName,omitempty"`
-    ApiKey  string  `json:"apiKey,omitempty"`
-    Debug  bool  `json:"debug,omitempty"`
-    DebugFile  string  `json:"debugFile,omitempty"`
-    OAuthToken  string  `json:"oAuthToken,omitempty"`
-    Timeout  int  `json:"timeout,omitempty"`
-    BasePath  string  `json:"basePath,omitempty"`
-    Host  string  `json:"host,omitempty"`
-    Scheme  string  `json:"scheme,omitempty"`
-}
-
-func NewConfiguration() *Configuration {
-    return &Configuration{
-        BasePath: "http://petstore.swagger.io/v2",
-        UserName: "",
-        Debug: false,
-        }
-}
\ No newline at end of file
diff --git a/samples/client/petstore/go/swagger/ModelReturn.go b/samples/client/petstore/go/swagger/ModelReturn.go
deleted file mode 100644
index daac97e1763..00000000000
--- a/samples/client/petstore/go/swagger/ModelReturn.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package swagger
-
-import (
-)
-
-type ModelReturn struct {
-    Return_  int32  `json:"return,omitempty"`
-    
-}
diff --git a/samples/client/petstore/go/swagger/Name.go b/samples/client/petstore/go/swagger/Name.go
deleted file mode 100644
index 5c0d7bc6d44..00000000000
--- a/samples/client/petstore/go/swagger/Name.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package swagger
-
-import (
-)
-
-type Name struct {
-    Name  int32  `json:"name,omitempty"`
-    
-}
diff --git a/samples/client/petstore/go/swagger/Order.go b/samples/client/petstore/go/swagger/Order.go
deleted file mode 100644
index a5a4852d1dd..00000000000
--- a/samples/client/petstore/go/swagger/Order.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package swagger
-
-import (
-    "time"
-)
-
-type Order struct {
-    Id  int64  `json:"id,omitempty"`
-PetId  int64  `json:"petId,omitempty"`
-Quantity  int32  `json:"quantity,omitempty"`
-ShipDate  time.Time  `json:"shipDate,omitempty"`
-Status  string  `json:"status,omitempty"`
-Complete  bool  `json:"complete,omitempty"`
-}
diff --git a/samples/client/petstore/go/swagger/Pet.go b/samples/client/petstore/go/swagger/Pet.go
deleted file mode 100644
index 5f1f3c06d51..00000000000
--- a/samples/client/petstore/go/swagger/Pet.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package swagger
-
-import (
-)
-
-type Pet struct {
-    Id  int64  `json:"id,omitempty"`
-Category  Category  `json:"category,omitempty"`
-Name  string  `json:"name,omitempty"`
-PhotoUrls  []string  `json:"photoUrls,omitempty"`
-Tags  []Tag  `json:"tags,omitempty"`
-Status  string  `json:"status,omitempty"`
-}
diff --git a/samples/client/petstore/go/swagger/User.go b/samples/client/petstore/go/swagger/User.go
deleted file mode 100644
index e34ad81ec8c..00000000000
--- a/samples/client/petstore/go/swagger/User.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package swagger
-
-import (
-)
-
-type User struct {
-    Id  int64  `json:"id,omitempty"`
-Username  string  `json:"username,omitempty"`
-FirstName  string  `json:"firstName,omitempty"`
-LastName  string  `json:"lastName,omitempty"`
-Email  string  `json:"email,omitempty"`
-Password  string  `json:"password,omitempty"`
-Phone  string  `json:"phone,omitempty"`
-UserStatus  int32  `json:"userStatus,omitempty"`
-}
diff --git a/samples/client/petstore/go/test.go b/samples/client/petstore/go/test.go
index f742307196b..f73d4e338ca 100644
--- a/samples/client/petstore/go/test.go
+++ b/samples/client/petstore/go/test.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	sw "./swagger"
+	sw "./go-petstore"
 	"encoding/json"
 	"fmt"
 )
diff --git a/samples/client/petstore/java/default/build.gradle b/samples/client/petstore/java/default/build.gradle
index 9e7ac008009..bfba070e070 100644
--- a/samples/client/petstore/java/default/build.gradle
+++ b/samples/client/petstore/java/default/build.gradle
@@ -9,8 +9,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'com.github.dcendents.android-maven'
     
     android {
-        compileSdkVersion 22
-        buildToolsVersion '22.0.0'
+        compileSdkVersion 23
+        buildToolsVersion '23.0.2'
         defaultConfig {
             minSdkVersion 14
-            targetSdkVersion 22
+            targetSdkVersion 23
         }
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7
@@ -98,7 +98,7 @@ ext {
     jackson_version = "2.4.2"
     jersey_version = "1.18"
     jodatime_version = "2.3"
-    junit_version = "4.8.1"
+    junit_version = "4.12"
 }
 
 dependencies {
diff --git a/samples/client/petstore/java/default/pom.xml b/samples/client/petstore/java/default/pom.xml
index e35e30af583..803c7eab63a 100644
--- a/samples/client/petstore/java/default/pom.xml
+++ b/samples/client/petstore/java/default/pom.xml
@@ -64,6 +64,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.10</version>
         <executions>
           <execution>
             <id>add_sources</id>
@@ -141,7 +142,7 @@
       <groupId>com.fasterxml.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-json-provider</artifactId>
       <version>${jackson-version}</version>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-joda</artifactId>
@@ -169,11 +170,12 @@
     </dependency>
   </dependencies>
   <properties>
-    <swagger-annotations-version>1.5.4</swagger-annotations-version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <swagger-annotations-version>1.5.8</swagger-annotations-version>
     <jersey-version>1.18</jersey-version>
     <jackson-version>2.4.2</jackson-version>
     <jodatime-version>2.3</jodatime-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
-    <junit-version>4.8.1</junit-version>
+    <junit-version>4.12</junit-version>
   </properties>
 </project>
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java
index 00bd52b9a6f..fdc5110304f 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java
@@ -36,7 +36,6 @@ public class PetApi {
     this.apiClient = apiClient;
   }
 
-  
   /**
    * Add a new pet to the store
    * 
@@ -54,12 +53,9 @@ public class PetApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -72,11 +68,9 @@ public class PetApi {
 
     String[] localVarAuthNames = new String[] { "petstore_auth" };
 
-    
+
     apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
-    
   }
-  
   /**
    * Fake endpoint to test byte array in body parameter for adding a new pet to the store
    * 
@@ -94,12 +88,9 @@ public class PetApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -112,11 +103,9 @@ public class PetApi {
 
     String[] localVarAuthNames = new String[] { "petstore_auth" };
 
-    
+
     apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
-    
   }
-  
   /**
    * Deletes a pet
    * 
@@ -141,14 +130,11 @@ public class PetApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     if (apiKey != null)
       localVarHeaderParams.put("api_key", apiClient.parameterToString(apiKey));
-    
 
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -161,11 +147,9 @@ public class PetApi {
 
     String[] localVarAuthNames = new String[] { "petstore_auth" };
 
-    
+
     apiClient.invokeAPI(localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
-    
   }
-  
   /**
    * Finds Pets by status
    * Multiple status values can be provided with comma separated strings
@@ -184,14 +168,10 @@ public class PetApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
     localVarQueryParams.addAll(apiClient.parameterToPairs("multi", "status", status));
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -204,12 +184,9 @@ public class PetApi {
 
     String[] localVarAuthNames = new String[] { "petstore_auth" };
 
-    
     GenericType<List<Pet>> localVarReturnType = new GenericType<List<Pet>>() {};
     return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-    
-  }
-  
+      }
   /**
    * Finds Pets by tags
    * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
@@ -228,14 +205,10 @@ public class PetApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
     localVarQueryParams.addAll(apiClient.parameterToPairs("multi", "tags", tags));
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -248,12 +221,9 @@ public class PetApi {
 
     String[] localVarAuthNames = new String[] { "petstore_auth" };
 
-    
     GenericType<List<Pet>> localVarReturnType = new GenericType<List<Pet>>() {};
     return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-    
-  }
-  
+      }
   /**
    * Find pet by ID
    * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
@@ -278,12 +248,9 @@ public class PetApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -296,12 +263,9 @@ public class PetApi {
 
     String[] localVarAuthNames = new String[] { "api_key", "petstore_auth" };
 
-    
     GenericType<Pet> localVarReturnType = new GenericType<Pet>() {};
     return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-    
-  }
-  
+      }
   /**
    * Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
    * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
@@ -326,12 +290,9 @@ public class PetApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -344,12 +305,9 @@ public class PetApi {
 
     String[] localVarAuthNames = new String[] { "api_key", "petstore_auth" };
 
-    
     GenericType<InlineResponse200> localVarReturnType = new GenericType<InlineResponse200>() {};
     return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-    
-  }
-  
+      }
   /**
    * Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
    * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
@@ -374,12 +332,9 @@ public class PetApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -392,12 +347,9 @@ public class PetApi {
 
     String[] localVarAuthNames = new String[] { "api_key", "petstore_auth" };
 
-    
     GenericType<byte[]> localVarReturnType = new GenericType<byte[]>() {};
     return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-    
-  }
-  
+      }
   /**
    * Update an existing pet
    * 
@@ -415,12 +367,9 @@ public class PetApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -433,11 +382,9 @@ public class PetApi {
 
     String[] localVarAuthNames = new String[] { "petstore_auth" };
 
-    
+
     apiClient.invokeAPI(localVarPath, "PUT", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
-    
   }
-  
   /**
    * Updates a pet in the store with form data
    * 
@@ -463,15 +410,12 @@ public class PetApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     if (name != null)
       localVarFormParams.put("name", name);
-    if (status != null)
+if (status != null)
       localVarFormParams.put("status", status);
-    
 
     final String[] localVarAccepts = {
       "application/json", "application/xml"
@@ -485,11 +429,9 @@ public class PetApi {
 
     String[] localVarAuthNames = new String[] { "petstore_auth" };
 
-    
+
     apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
-    
   }
-  
   /**
    * uploads an image
    * 
@@ -515,15 +457,12 @@ public class PetApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     if (additionalMetadata != null)
       localVarFormParams.put("additionalMetadata", additionalMetadata);
-    if (file != null)
+if (file != null)
       localVarFormParams.put("file", file);
-    
 
     final String[] localVarAccepts = {
       "application/json", "application/xml"
@@ -537,9 +476,7 @@ public class PetApi {
 
     String[] localVarAuthNames = new String[] { "petstore_auth" };
 
-    
+
     apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
-    
   }
-  
 }
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/StoreApi.java
index 7e8bccd8da3..3f2e38c0e3a 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/StoreApi.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/StoreApi.java
@@ -34,7 +34,6 @@ public class StoreApi {
     this.apiClient = apiClient;
   }
 
-  
   /**
    * Delete purchase order by ID
    * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
@@ -58,12 +57,9 @@ public class StoreApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -76,11 +72,9 @@ public class StoreApi {
 
     String[] localVarAuthNames = new String[] {  };
 
-    
+
     apiClient.invokeAPI(localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
-    
   }
-  
   /**
    * Finds orders by status
    * A single status value can be provided as a string
@@ -99,14 +93,10 @@ public class StoreApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
     localVarQueryParams.addAll(apiClient.parameterToPairs("", "status", status));
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -119,12 +109,9 @@ public class StoreApi {
 
     String[] localVarAuthNames = new String[] { "test_api_client_id", "test_api_client_secret" };
 
-    
     GenericType<List<Order>> localVarReturnType = new GenericType<List<Order>>() {};
     return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-    
-  }
-  
+      }
   /**
    * Returns pet inventories by status
    * Returns a map of status codes to quantities
@@ -142,12 +129,9 @@ public class StoreApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -160,12 +144,9 @@ public class StoreApi {
 
     String[] localVarAuthNames = new String[] { "api_key" };
 
-    
     GenericType<Map<String, Integer>> localVarReturnType = new GenericType<Map<String, Integer>>() {};
     return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-    
-  }
-  
+      }
   /**
    * Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
    * Returns an arbitrary object which is actually a map of status codes to quantities
@@ -183,12 +164,9 @@ public class StoreApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -201,15 +179,12 @@ public class StoreApi {
 
     String[] localVarAuthNames = new String[] { "api_key" };
 
-    
     GenericType<Object> localVarReturnType = new GenericType<Object>() {};
     return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-    
-  }
-  
+      }
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+   * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return Order
    * @throws ApiException if fails to make API call
@@ -231,12 +206,9 @@ public class StoreApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -249,12 +221,9 @@ public class StoreApi {
 
     String[] localVarAuthNames = new String[] { "test_api_key_header", "test_api_key_query" };
 
-    
     GenericType<Order> localVarReturnType = new GenericType<Order>() {};
     return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-    
-  }
-  
+      }
   /**
    * Place an order for a pet
    * 
@@ -273,12 +242,9 @@ public class StoreApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -291,10 +257,7 @@ public class StoreApi {
 
     String[] localVarAuthNames = new String[] { "test_api_client_id", "test_api_client_secret" };
 
-    
     GenericType<Order> localVarReturnType = new GenericType<Order>() {};
     return apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-    
-  }
-  
+      }
 }
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/UserApi.java
index 848ec58ce17..600ad0b678a 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/UserApi.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/UserApi.java
@@ -34,7 +34,6 @@ public class UserApi {
     this.apiClient = apiClient;
   }
 
-  
   /**
    * Create user
    * This can only be done by the logged in user.
@@ -52,12 +51,9 @@ public class UserApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -70,11 +66,9 @@ public class UserApi {
 
     String[] localVarAuthNames = new String[] {  };
 
-    
+
     apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
-    
   }
-  
   /**
    * Creates list of users with given input array
    * 
@@ -92,12 +86,9 @@ public class UserApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -110,11 +101,9 @@ public class UserApi {
 
     String[] localVarAuthNames = new String[] {  };
 
-    
+
     apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
-    
   }
-  
   /**
    * Creates list of users with given input array
    * 
@@ -132,12 +121,9 @@ public class UserApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -150,11 +136,9 @@ public class UserApi {
 
     String[] localVarAuthNames = new String[] {  };
 
-    
+
     apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
-    
   }
-  
   /**
    * Delete user
    * This can only be done by the logged in user.
@@ -178,12 +162,9 @@ public class UserApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -196,11 +177,9 @@ public class UserApi {
 
     String[] localVarAuthNames = new String[] { "test_http_basic" };
 
-    
+
     apiClient.invokeAPI(localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
-    
   }
-  
   /**
    * Get user by user name
    * 
@@ -225,12 +204,9 @@ public class UserApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -243,12 +219,9 @@ public class UserApi {
 
     String[] localVarAuthNames = new String[] {  };
 
-    
     GenericType<User> localVarReturnType = new GenericType<User>() {};
     return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-    
-  }
-  
+      }
   /**
    * Logs user into the system
    * 
@@ -268,16 +241,11 @@ public class UserApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
     localVarQueryParams.addAll(apiClient.parameterToPairs("", "username", username));
-    
     localVarQueryParams.addAll(apiClient.parameterToPairs("", "password", password));
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -290,12 +258,9 @@ public class UserApi {
 
     String[] localVarAuthNames = new String[] {  };
 
-    
     GenericType<String> localVarReturnType = new GenericType<String>() {};
     return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-    
-  }
-  
+      }
   /**
    * Logs out current logged in user session
    * 
@@ -312,12 +277,9 @@ public class UserApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -330,11 +292,9 @@ public class UserApi {
 
     String[] localVarAuthNames = new String[] {  };
 
-    
+
     apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
-    
   }
-  
   /**
    * Updated user
    * This can only be done by the logged in user.
@@ -359,12 +319,9 @@ public class UserApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -377,9 +334,7 @@ public class UserApi {
 
     String[] localVarAuthNames = new String[] {  };
 
-    
+
     apiClient.invokeAPI(localVarPath, "PUT", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
-    
   }
-  
 }
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Animal.java
new file mode 100644
index 00000000000..e1e3604ad6b
--- /dev/null
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Animal.java
@@ -0,0 +1,73 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+
+
+
+
+public class Animal   {
+  
+  private String className = null;
+
+  
+  /**
+   **/
+  public Animal className(String className) {
+    this.className = className;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", required = true, value = "")
+  @JsonProperty("className")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Animal animal = (Animal) o;
+    return Objects.equals(this.className, animal.className);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Animal {\n");
+    
+    sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Cat.java
new file mode 100644
index 00000000000..6b4875cda38
--- /dev/null
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Cat.java
@@ -0,0 +1,95 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.client.model.Animal;
+
+
+
+
+
+
+public class Cat extends Animal  {
+  
+  private String className = null;
+  private Boolean declawed = null;
+
+  
+  /**
+   **/
+  public Cat className(String className) {
+    this.className = className;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", required = true, value = "")
+  @JsonProperty("className")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+
+  /**
+   **/
+  public Cat declawed(Boolean declawed) {
+    this.declawed = declawed;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("declawed")
+  public Boolean getDeclawed() {
+    return declawed;
+  }
+  public void setDeclawed(Boolean declawed) {
+    this.declawed = declawed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Cat cat = (Cat) o;
+    return Objects.equals(this.className, cat.className) &&
+        Objects.equals(this.declawed, cat.declawed) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className, declawed, super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Cat {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Category.java
index 3289c469672..08a0de3e889 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Category.java
@@ -32,7 +32,7 @@ public class Category   {
     this.id = id;
   }
 
-  
+
   /**
    **/
   public Category name(String name) {
@@ -49,7 +49,6 @@ public class Category   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Dog.java
new file mode 100644
index 00000000000..5aa51687996
--- /dev/null
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Dog.java
@@ -0,0 +1,95 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.client.model.Animal;
+
+
+
+
+
+
+public class Dog extends Animal  {
+  
+  private String className = null;
+  private String breed = null;
+
+  
+  /**
+   **/
+  public Dog className(String className) {
+    this.className = className;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", required = true, value = "")
+  @JsonProperty("className")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+
+  /**
+   **/
+  public Dog breed(String breed) {
+    this.breed = breed;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("breed")
+  public String getBreed() {
+    return breed;
+  }
+  public void setBreed(String breed) {
+    this.breed = breed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Dog dog = (Dog) o;
+    return Objects.equals(this.className, dog.className) &&
+        Objects.equals(this.breed, dog.breed) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className, breed, super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Dog {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/FormatTest.java
new file mode 100644
index 00000000000..e578af2af43
--- /dev/null
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/FormatTest.java
@@ -0,0 +1,295 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+
+
+
+
+public class FormatTest   {
+  
+  private Integer integer = null;
+  private Integer int32 = null;
+  private Long int64 = null;
+  private BigDecimal number = null;
+  private Float _float = null;
+  private Double _double = null;
+  private String string = null;
+  private byte[] _byte = null;
+  private byte[] binary = null;
+  private Date date = null;
+  private Date dateTime = null;
+  private String password = null;
+
+  
+  /**
+   **/
+  public FormatTest integer(Integer integer) {
+    this.integer = integer;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("integer")
+  public Integer getInteger() {
+    return integer;
+  }
+  public void setInteger(Integer integer) {
+    this.integer = integer;
+  }
+
+
+  /**
+   **/
+  public FormatTest int32(Integer int32) {
+    this.int32 = int32;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("int32")
+  public Integer getInt32() {
+    return int32;
+  }
+  public void setInt32(Integer int32) {
+    this.int32 = int32;
+  }
+
+
+  /**
+   **/
+  public FormatTest int64(Long int64) {
+    this.int64 = int64;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("int64")
+  public Long getInt64() {
+    return int64;
+  }
+  public void setInt64(Long int64) {
+    this.int64 = int64;
+  }
+
+
+  /**
+   **/
+  public FormatTest number(BigDecimal number) {
+    this.number = number;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", required = true, value = "")
+  @JsonProperty("number")
+  public BigDecimal getNumber() {
+    return number;
+  }
+  public void setNumber(BigDecimal number) {
+    this.number = number;
+  }
+
+
+  /**
+   **/
+  public FormatTest _float(Float _float) {
+    this._float = _float;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("float")
+  public Float getFloat() {
+    return _float;
+  }
+  public void setFloat(Float _float) {
+    this._float = _float;
+  }
+
+
+  /**
+   **/
+  public FormatTest _double(Double _double) {
+    this._double = _double;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("double")
+  public Double getDouble() {
+    return _double;
+  }
+  public void setDouble(Double _double) {
+    this._double = _double;
+  }
+
+
+  /**
+   **/
+  public FormatTest string(String string) {
+    this.string = string;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("string")
+  public String getString() {
+    return string;
+  }
+  public void setString(String string) {
+    this.string = string;
+  }
+
+
+  /**
+   **/
+  public FormatTest _byte(byte[] _byte) {
+    this._byte = _byte;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("byte")
+  public byte[] getByte() {
+    return _byte;
+  }
+  public void setByte(byte[] _byte) {
+    this._byte = _byte;
+  }
+
+
+  /**
+   **/
+  public FormatTest binary(byte[] binary) {
+    this.binary = binary;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("binary")
+  public byte[] getBinary() {
+    return binary;
+  }
+  public void setBinary(byte[] binary) {
+    this.binary = binary;
+  }
+
+
+  /**
+   **/
+  public FormatTest date(Date date) {
+    this.date = date;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("date")
+  public Date getDate() {
+    return date;
+  }
+  public void setDate(Date date) {
+    this.date = date;
+  }
+
+
+  /**
+   **/
+  public FormatTest dateTime(Date dateTime) {
+    this.dateTime = dateTime;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("dateTime")
+  public Date getDateTime() {
+    return dateTime;
+  }
+  public void setDateTime(Date dateTime) {
+    this.dateTime = dateTime;
+  }
+
+
+  /**
+   **/
+  public FormatTest password(String password) {
+    this.password = password;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("password")
+  public String getPassword() {
+    return password;
+  }
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FormatTest formatTest = (FormatTest) o;
+    return Objects.equals(this.integer, formatTest.integer) &&
+        Objects.equals(this.int32, formatTest.int32) &&
+        Objects.equals(this.int64, formatTest.int64) &&
+        Objects.equals(this.number, formatTest.number) &&
+        Objects.equals(this._float, formatTest._float) &&
+        Objects.equals(this._double, formatTest._double) &&
+        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._byte, formatTest._byte) &&
+        Objects.equals(this.binary, formatTest.binary) &&
+        Objects.equals(this.date, formatTest.date) &&
+        Objects.equals(this.dateTime, formatTest.dateTime) &&
+        Objects.equals(this.password, formatTest.password);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, password);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FormatTest {\n");
+    
+    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
+    sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
+    sb.append("    number: ").append(toIndentedString(number)).append("\n");
+    sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
+    sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
+    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
+    sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
+    sb.append("    date: ").append(toIndentedString(date)).append("\n");
+    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
+    sb.append("    password: ").append(toIndentedString(password)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/InlineResponse200.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/InlineResponse200.java
index c7d3c155657..ee6afefe265 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/InlineResponse200.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/InlineResponse200.java
@@ -60,7 +60,7 @@ public class InlineResponse200   {
     this.tags = tags;
   }
 
-  
+
   /**
    **/
   public InlineResponse200 id(Long id) {
@@ -77,7 +77,7 @@ public class InlineResponse200   {
     this.id = id;
   }
 
-  
+
   /**
    **/
   public InlineResponse200 category(Object category) {
@@ -94,7 +94,7 @@ public class InlineResponse200   {
     this.category = category;
   }
 
-  
+
   /**
    * pet status in the store
    **/
@@ -112,7 +112,7 @@ public class InlineResponse200   {
     this.status = status;
   }
 
-  
+
   /**
    **/
   public InlineResponse200 name(String name) {
@@ -129,7 +129,7 @@ public class InlineResponse200   {
     this.name = name;
   }
 
-  
+
   /**
    **/
   public InlineResponse200 photoUrls(List<String> photoUrls) {
@@ -146,7 +146,6 @@ public class InlineResponse200   {
     this.photoUrls = photoUrls;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Model200Response.java
index fb24ee29a3f..4f44da64072 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Model200Response.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Model200Response.java
@@ -7,8 +7,11 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
+/**
+ * Model for testing model name starting with number
+ **/
 
-
+@ApiModel(description = "Model for testing model name starting with number")
 
 public class Model200Response   {
   
@@ -31,7 +34,6 @@ public class Model200Response   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/ModelReturn.java
index fbb4135ce27..0f4279af8d3 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -7,8 +7,11 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
+/**
+ * Model for testing reserved words
+ **/
 
-
+@ApiModel(description = "Model for testing reserved words")
 
 public class ModelReturn   {
   
@@ -31,7 +34,6 @@ public class ModelReturn   {
     this._return = _return;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Name.java
index 512289310c7..6446b547742 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Name.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Name.java
@@ -7,8 +7,11 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
+/**
+ * Model for testing model name same as property name
+ **/
 
-
+@ApiModel(description = "Model for testing model name same as property name")
 
 public class Name   {
   
@@ -23,7 +26,7 @@ public class Name   {
     return this;
   }
   
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(example = "null", required = true, value = "")
   @JsonProperty("name")
   public Integer getName() {
     return name;
@@ -32,24 +35,13 @@ public class Name   {
     this.name = name;
   }
 
-  
-  /**
-   **/
-  public Name snakeCase(Integer snakeCase) {
-    this.snakeCase = snakeCase;
-    return this;
-  }
-  
+
   @ApiModelProperty(example = "null", value = "")
   @JsonProperty("snake_case")
   public Integer getSnakeCase() {
     return snakeCase;
   }
-  public void setSnakeCase(Integer snakeCase) {
-    this.snakeCase = snakeCase;
-  }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Order.java
index 77df445af66..43ddec1ff6a 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Order.java
@@ -48,7 +48,7 @@ public class Order   {
     return id;
   }
 
-  
+
   /**
    **/
   public Order petId(Long petId) {
@@ -65,7 +65,7 @@ public class Order   {
     this.petId = petId;
   }
 
-  
+
   /**
    **/
   public Order quantity(Integer quantity) {
@@ -82,7 +82,7 @@ public class Order   {
     this.quantity = quantity;
   }
 
-  
+
   /**
    **/
   public Order shipDate(Date shipDate) {
@@ -99,7 +99,7 @@ public class Order   {
     this.shipDate = shipDate;
   }
 
-  
+
   /**
    * Order Status
    **/
@@ -117,7 +117,7 @@ public class Order   {
     this.status = status;
   }
 
-  
+
   /**
    **/
   public Order complete(Boolean complete) {
@@ -134,7 +134,6 @@ public class Order   {
     this.complete = complete;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Pet.java
index 42c23a9db0e..7a4eca82fe0 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Pet.java
@@ -61,7 +61,7 @@ public class Pet   {
     this.id = id;
   }
 
-  
+
   /**
    **/
   public Pet category(Category category) {
@@ -78,7 +78,7 @@ public class Pet   {
     this.category = category;
   }
 
-  
+
   /**
    **/
   public Pet name(String name) {
@@ -95,7 +95,7 @@ public class Pet   {
     this.name = name;
   }
 
-  
+
   /**
    **/
   public Pet photoUrls(List<String> photoUrls) {
@@ -112,7 +112,7 @@ public class Pet   {
     this.photoUrls = photoUrls;
   }
 
-  
+
   /**
    **/
   public Pet tags(List<Tag> tags) {
@@ -129,7 +129,7 @@ public class Pet   {
     this.tags = tags;
   }
 
-  
+
   /**
    * pet status in the store
    **/
@@ -147,7 +147,6 @@ public class Pet   {
     this.status = status;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/SpecialModelName.java
index 7fa91b8827c..f1a153e79a0 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -31,7 +31,6 @@ public class SpecialModelName   {
     this.specialPropertyName = specialPropertyName;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Tag.java
index 4e6055c1410..86cb5f48b09 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Tag.java
@@ -32,7 +32,7 @@ public class Tag   {
     this.id = id;
   }
 
-  
+
   /**
    **/
   public Tag name(String name) {
@@ -49,7 +49,6 @@ public class Tag   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/User.java
index 272ec6d3843..f960f1461dd 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/User.java
@@ -38,7 +38,7 @@ public class User   {
     this.id = id;
   }
 
-  
+
   /**
    **/
   public User username(String username) {
@@ -55,7 +55,7 @@ public class User   {
     this.username = username;
   }
 
-  
+
   /**
    **/
   public User firstName(String firstName) {
@@ -72,7 +72,7 @@ public class User   {
     this.firstName = firstName;
   }
 
-  
+
   /**
    **/
   public User lastName(String lastName) {
@@ -89,7 +89,7 @@ public class User   {
     this.lastName = lastName;
   }
 
-  
+
   /**
    **/
   public User email(String email) {
@@ -106,7 +106,7 @@ public class User   {
     this.email = email;
   }
 
-  
+
   /**
    **/
   public User password(String password) {
@@ -123,7 +123,7 @@ public class User   {
     this.password = password;
   }
 
-  
+
   /**
    **/
   public User phone(String phone) {
@@ -140,7 +140,7 @@ public class User   {
     this.phone = phone;
   }
 
-  
+
   /**
    * User Status
    **/
@@ -158,7 +158,6 @@ public class User   {
     this.userStatus = userStatus;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
diff --git a/samples/client/petstore/java/feign/build.gradle b/samples/client/petstore/java/feign/build.gradle
index ee920fbc7ca..656d38a57eb 100644
--- a/samples/client/petstore/java/feign/build.gradle
+++ b/samples/client/petstore/java/feign/build.gradle
@@ -9,8 +9,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'com.github.dcendents.android-maven'
     
     android {
-        compileSdkVersion 22
-        buildToolsVersion '22.0.0'
+        compileSdkVersion 23
+        buildToolsVersion '23.0.2'
         defaultConfig {
             minSdkVersion 14
-            targetSdkVersion 22
+            targetSdkVersion 23
         }
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/FormAwareEncoder.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/FormAwareEncoder.java
index f8c7170f44e..bf9378fc9c1 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/FormAwareEncoder.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/FormAwareEncoder.java
@@ -14,7 +14,7 @@ import feign.codec.EncodeException;
 import feign.codec.Encoder;
 import feign.RequestTemplate;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:50.356+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public class FormAwareEncoder implements Encoder {
   public static final String UTF_8 = "utf-8";
   private static final String LINE_FEED = "\r\n";
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/StringUtil.java
index 88aff61bf68..b8a4d2924f6 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/StringUtil.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/StringUtil.java
@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:50.356+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java
index 51f6c2358c7..2d5ac8be9ee 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java
@@ -6,16 +6,13 @@ import io.swagger.client.model.Pet;
 import io.swagger.client.model.InlineResponse200;
 import java.io.File;
 
-
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-19T15:53:31.820+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public interface PetApi extends ApiClient.Api {
 
 
@@ -31,7 +28,7 @@ public interface PetApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   void addPet(Pet body);
-  
+
   /**
    * Fake endpoint to test byte array in body parameter for adding a new pet to the store
    * 
@@ -44,7 +41,7 @@ public interface PetApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   void addPetUsingByteArray(byte[] body);
-  
+
   /**
    * Deletes a pet
    * 
@@ -59,7 +56,7 @@ public interface PetApi extends ApiClient.Api {
     "apiKey: {apiKey}"
   })
   void deletePet(@Param("petId") Long petId, @Param("apiKey") String apiKey);
-  
+
   /**
    * Finds Pets by status
    * Multiple status values can be provided with comma separated strings
@@ -72,7 +69,7 @@ public interface PetApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   List<Pet> findPetsByStatus(@Param("status") List<String> status);
-  
+
   /**
    * Finds Pets by tags
    * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
@@ -85,7 +82,7 @@ public interface PetApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   List<Pet> findPetsByTags(@Param("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
@@ -98,7 +95,7 @@ public interface PetApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   Pet getPetById(@Param("petId") Long petId);
-  
+
   /**
    * Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
    * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
@@ -111,7 +108,7 @@ public interface PetApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   InlineResponse200 getPetByIdInObject(@Param("petId") Long petId);
-  
+
   /**
    * Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
    * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
@@ -124,7 +121,7 @@ public interface PetApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   byte[] petPetIdtestingByteArraytrueGet(@Param("petId") Long petId);
-  
+
   /**
    * Update an existing pet
    * 
@@ -137,7 +134,7 @@ public interface PetApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   void updatePet(Pet body);
-  
+
   /**
    * Updates a pet in the store with form data
    * 
@@ -152,7 +149,7 @@ public interface PetApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   void updatePetWithForm(@Param("petId") String petId, @Param("name") String name, @Param("status") String status);
-  
+
   /**
    * uploads an image
    * 
@@ -167,6 +164,4 @@ public interface PetApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   void uploadFile(@Param("petId") Long petId, @Param("additionalMetadata") String additionalMetadata, @Param("file") File file);
-  
-
 }
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/StoreApi.java
index 97c3ad3ec16..0c358eae7df 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/StoreApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/StoreApi.java
@@ -4,16 +4,13 @@ import io.swagger.client.ApiClient;
 
 import io.swagger.client.model.Order;
 
-
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-19T15:53:31.820+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public interface StoreApi extends ApiClient.Api {
 
 
@@ -29,7 +26,7 @@ public interface StoreApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   void deleteOrder(@Param("orderId") String orderId);
-  
+
   /**
    * Finds orders by status
    * A single status value can be provided as a string
@@ -42,7 +39,7 @@ public interface StoreApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   List<Order> findOrdersByStatus(@Param("status") String status);
-  
+
   /**
    * Returns pet inventories by status
    * Returns a map of status codes to quantities
@@ -54,7 +51,7 @@ public interface StoreApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   Map<String, Integer> getInventory();
-  
+
   /**
    * Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
    * Returns an arbitrary object which is actually a map of status codes to quantities
@@ -66,10 +63,10 @@ public interface StoreApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   Object getInventoryInObject();
-  
+
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+   * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return Order
    */
@@ -79,7 +76,7 @@ public interface StoreApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   Order getOrderById(@Param("orderId") String orderId);
-  
+
   /**
    * Place an order for a pet
    * 
@@ -92,6 +89,4 @@ public interface StoreApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   Order placeOrder(Order body);
-  
-
 }
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/UserApi.java
index 3fef00a41f0..ff46fb078b5 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/UserApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/UserApi.java
@@ -4,16 +4,13 @@ import io.swagger.client.ApiClient;
 
 import io.swagger.client.model.User;
 
-
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-19T15:53:31.820+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public interface UserApi extends ApiClient.Api {
 
 
@@ -29,7 +26,7 @@ public interface UserApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   void createUser(User body);
-  
+
   /**
    * Creates list of users with given input array
    * 
@@ -42,7 +39,7 @@ public interface UserApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   void createUsersWithArrayInput(List<User> body);
-  
+
   /**
    * Creates list of users with given input array
    * 
@@ -55,7 +52,7 @@ public interface UserApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   void createUsersWithListInput(List<User> body);
-  
+
   /**
    * Delete user
    * This can only be done by the logged in user.
@@ -68,11 +65,11 @@ public interface UserApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   void deleteUser(@Param("username") String username);
-  
+
   /**
    * Get user by user name
    * 
-   * @param username The name that needs to be fetched. Use user1 for testing. (required)
+   * @param username The name that needs to be fetched. Use user1 for testing.  (required)
    * @return User
    */
   @RequestLine("GET /user/{username}")
@@ -81,7 +78,7 @@ public interface UserApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   User getUserByName(@Param("username") String username);
-  
+
   /**
    * Logs user into the system
    * 
@@ -95,7 +92,7 @@ public interface UserApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   String loginUser(@Param("username") String username, @Param("password") String password);
-  
+
   /**
    * Logs out current logged in user session
    * 
@@ -107,7 +104,7 @@ public interface UserApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   void logoutUser();
-  
+
   /**
    * Updated user
    * This can only be done by the logged in user.
@@ -121,6 +118,4 @@ public interface UserApi extends ApiClient.Api {
     "Accepts: application/json",
   })
   void updateUser(@Param("username") String username, User body);
-  
-
 }
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Animal.java
new file mode 100644
index 00000000000..20987177b52
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Animal.java
@@ -0,0 +1,73 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
+public class Animal   {
+  
+  private String className = null;
+
+  
+  /**
+   **/
+  public Animal className(String className) {
+    this.className = className;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", required = true, value = "")
+  @JsonProperty("className")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Animal animal = (Animal) o;
+    return Objects.equals(this.className, animal.className);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Animal {\n");
+    
+    sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Cat.java
new file mode 100644
index 00000000000..5312e49f241
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Cat.java
@@ -0,0 +1,95 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.client.model.Animal;
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
+public class Cat extends Animal  {
+  
+  private String className = null;
+  private Boolean declawed = null;
+
+  
+  /**
+   **/
+  public Cat className(String className) {
+    this.className = className;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", required = true, value = "")
+  @JsonProperty("className")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+
+  /**
+   **/
+  public Cat declawed(Boolean declawed) {
+    this.declawed = declawed;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("declawed")
+  public Boolean getDeclawed() {
+    return declawed;
+  }
+  public void setDeclawed(Boolean declawed) {
+    this.declawed = declawed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Cat cat = (Cat) o;
+    return Objects.equals(this.className, cat.className) &&
+        Objects.equals(this.declawed, cat.declawed) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className, declawed, super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Cat {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Category.java
index ca030ff6c48..7d472b3e71b 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Category.java
@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:50.356+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public class Category   {
   
   private Long id = null;
@@ -32,7 +32,7 @@ public class Category   {
     this.id = id;
   }
 
-  
+
   /**
    **/
   public Category name(String name) {
@@ -49,7 +49,6 @@ public class Category   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Dog.java
new file mode 100644
index 00000000000..920c9a7ac6c
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Dog.java
@@ -0,0 +1,95 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.client.model.Animal;
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
+public class Dog extends Animal  {
+  
+  private String className = null;
+  private String breed = null;
+
+  
+  /**
+   **/
+  public Dog className(String className) {
+    this.className = className;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", required = true, value = "")
+  @JsonProperty("className")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+
+  /**
+   **/
+  public Dog breed(String breed) {
+    this.breed = breed;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("breed")
+  public String getBreed() {
+    return breed;
+  }
+  public void setBreed(String breed) {
+    this.breed = breed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Dog dog = (Dog) o;
+    return Objects.equals(this.className, dog.className) &&
+        Objects.equals(this.breed, dog.breed) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className, breed, super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Dog {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/FormatTest.java
new file mode 100644
index 00000000000..9917e21724a
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/FormatTest.java
@@ -0,0 +1,295 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
+public class FormatTest   {
+  
+  private Integer integer = null;
+  private Integer int32 = null;
+  private Long int64 = null;
+  private BigDecimal number = null;
+  private Float _float = null;
+  private Double _double = null;
+  private String string = null;
+  private byte[] _byte = null;
+  private byte[] binary = null;
+  private Date date = null;
+  private Date dateTime = null;
+  private String password = null;
+
+  
+  /**
+   **/
+  public FormatTest integer(Integer integer) {
+    this.integer = integer;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("integer")
+  public Integer getInteger() {
+    return integer;
+  }
+  public void setInteger(Integer integer) {
+    this.integer = integer;
+  }
+
+
+  /**
+   **/
+  public FormatTest int32(Integer int32) {
+    this.int32 = int32;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("int32")
+  public Integer getInt32() {
+    return int32;
+  }
+  public void setInt32(Integer int32) {
+    this.int32 = int32;
+  }
+
+
+  /**
+   **/
+  public FormatTest int64(Long int64) {
+    this.int64 = int64;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("int64")
+  public Long getInt64() {
+    return int64;
+  }
+  public void setInt64(Long int64) {
+    this.int64 = int64;
+  }
+
+
+  /**
+   **/
+  public FormatTest number(BigDecimal number) {
+    this.number = number;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", required = true, value = "")
+  @JsonProperty("number")
+  public BigDecimal getNumber() {
+    return number;
+  }
+  public void setNumber(BigDecimal number) {
+    this.number = number;
+  }
+
+
+  /**
+   **/
+  public FormatTest _float(Float _float) {
+    this._float = _float;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("float")
+  public Float getFloat() {
+    return _float;
+  }
+  public void setFloat(Float _float) {
+    this._float = _float;
+  }
+
+
+  /**
+   **/
+  public FormatTest _double(Double _double) {
+    this._double = _double;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("double")
+  public Double getDouble() {
+    return _double;
+  }
+  public void setDouble(Double _double) {
+    this._double = _double;
+  }
+
+
+  /**
+   **/
+  public FormatTest string(String string) {
+    this.string = string;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("string")
+  public String getString() {
+    return string;
+  }
+  public void setString(String string) {
+    this.string = string;
+  }
+
+
+  /**
+   **/
+  public FormatTest _byte(byte[] _byte) {
+    this._byte = _byte;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("byte")
+  public byte[] getByte() {
+    return _byte;
+  }
+  public void setByte(byte[] _byte) {
+    this._byte = _byte;
+  }
+
+
+  /**
+   **/
+  public FormatTest binary(byte[] binary) {
+    this.binary = binary;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("binary")
+  public byte[] getBinary() {
+    return binary;
+  }
+  public void setBinary(byte[] binary) {
+    this.binary = binary;
+  }
+
+
+  /**
+   **/
+  public FormatTest date(Date date) {
+    this.date = date;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("date")
+  public Date getDate() {
+    return date;
+  }
+  public void setDate(Date date) {
+    this.date = date;
+  }
+
+
+  /**
+   **/
+  public FormatTest dateTime(Date dateTime) {
+    this.dateTime = dateTime;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("dateTime")
+  public Date getDateTime() {
+    return dateTime;
+  }
+  public void setDateTime(Date dateTime) {
+    this.dateTime = dateTime;
+  }
+
+
+  /**
+   **/
+  public FormatTest password(String password) {
+    this.password = password;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("password")
+  public String getPassword() {
+    return password;
+  }
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FormatTest formatTest = (FormatTest) o;
+    return Objects.equals(this.integer, formatTest.integer) &&
+        Objects.equals(this.int32, formatTest.int32) &&
+        Objects.equals(this.int64, formatTest.int64) &&
+        Objects.equals(this.number, formatTest.number) &&
+        Objects.equals(this._float, formatTest._float) &&
+        Objects.equals(this._double, formatTest._double) &&
+        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._byte, formatTest._byte) &&
+        Objects.equals(this.binary, formatTest.binary) &&
+        Objects.equals(this.date, formatTest.date) &&
+        Objects.equals(this.dateTime, formatTest.dateTime) &&
+        Objects.equals(this.password, formatTest.password);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, password);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FormatTest {\n");
+    
+    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
+    sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
+    sb.append("    number: ").append(toIndentedString(number)).append("\n");
+    sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
+    sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
+    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
+    sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
+    sb.append("    date: ").append(toIndentedString(date)).append("\n");
+    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
+    sb.append("    password: ").append(toIndentedString(password)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/InlineResponse200.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/InlineResponse200.java
index 117d23f61f6..721faf5189e 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/InlineResponse200.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/InlineResponse200.java
@@ -13,16 +13,12 @@ import java.util.List;
 
 
 
-
-
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-19T15:53:31.820+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public class InlineResponse200   {
   
-  private List<String> photoUrls = new ArrayList<String>();
-  private String name = null;
+  private List<Tag> tags = new ArrayList<Tag>();
   private Long id = null;
   private Object category = null;
-  private List<Tag> tags = new ArrayList<Tag>();
 
 
   public enum StatusEnum {
@@ -44,74 +40,8 @@ public class InlineResponse200   {
   }
 
   private StatusEnum status = null;
-
-  
-  /**
-   **/
-  public InlineResponse200 photoUrls(List<String> photoUrls) {
-    this.photoUrls = photoUrls;
-    return this;
-  }
-  
-  @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("photoUrls")
-  public List<String> getPhotoUrls() {
-    return photoUrls;
-  }
-  public void setPhotoUrls(List<String> photoUrls) {
-    this.photoUrls = photoUrls;
-  }
-
-  
-  /**
-   **/
-  public InlineResponse200 name(String name) {
-    this.name = name;
-    return this;
-  }
-  
-  @ApiModelProperty(example = "doggie", value = "")
-  @JsonProperty("name")
-  public String getName() {
-    return name;
-  }
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  
-  /**
-   **/
-  public InlineResponse200 id(Long id) {
-    this.id = id;
-    return this;
-  }
-  
-  @ApiModelProperty(example = "null", required = true, value = "")
-  @JsonProperty("id")
-  public Long getId() {
-    return id;
-  }
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  
-  /**
-   **/
-  public InlineResponse200 category(Object category) {
-    this.category = category;
-    return this;
-  }
-  
-  @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("category")
-  public Object getCategory() {
-    return category;
-  }
-  public void setCategory(Object category) {
-    this.category = category;
-  }
+  private String name = null;
+  private List<String> photoUrls = new ArrayList<String>();
 
   
   /**
@@ -130,7 +60,41 @@ public class InlineResponse200   {
     this.tags = tags;
   }
 
+
+  /**
+   **/
+  public InlineResponse200 id(Long id) {
+    this.id = id;
+    return this;
+  }
   
+  @ApiModelProperty(example = "null", required = true, value = "")
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+
+  /**
+   **/
+  public InlineResponse200 category(Object category) {
+    this.category = category;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("category")
+  public Object getCategory() {
+    return category;
+  }
+  public void setCategory(Object category) {
+    this.category = category;
+  }
+
+
   /**
    * pet status in the store
    **/
@@ -148,7 +112,40 @@ public class InlineResponse200   {
     this.status = status;
   }
 
+
+  /**
+   **/
+  public InlineResponse200 name(String name) {
+    this.name = name;
+    return this;
+  }
   
+  @ApiModelProperty(example = "doggie", value = "")
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  /**
+   **/
+  public InlineResponse200 photoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("photoUrls")
+  public List<String> getPhotoUrls() {
+    return photoUrls;
+  }
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -159,17 +156,17 @@ public class InlineResponse200   {
       return false;
     }
     InlineResponse200 inlineResponse200 = (InlineResponse200) o;
-    return Objects.equals(this.photoUrls, inlineResponse200.photoUrls) &&
-        Objects.equals(this.name, inlineResponse200.name) &&
+    return Objects.equals(this.tags, inlineResponse200.tags) &&
         Objects.equals(this.id, inlineResponse200.id) &&
         Objects.equals(this.category, inlineResponse200.category) &&
-        Objects.equals(this.tags, inlineResponse200.tags) &&
-        Objects.equals(this.status, inlineResponse200.status);
+        Objects.equals(this.status, inlineResponse200.status) &&
+        Objects.equals(this.name, inlineResponse200.name) &&
+        Objects.equals(this.photoUrls, inlineResponse200.photoUrls);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(photoUrls, name, id, category, tags, status);
+    return Objects.hash(tags, id, category, status, name, photoUrls);
   }
 
   @Override
@@ -177,12 +174,12 @@ public class InlineResponse200   {
     StringBuilder sb = new StringBuilder();
     sb.append("class InlineResponse200 {\n");
     
-    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -199,5 +196,3 @@ public class InlineResponse200   {
   }
 }
 
-
-
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Model200Response.java
index 882dd6017c9..bcc40ca5b24 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Model200Response.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Model200Response.java
@@ -7,11 +7,12 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
+/**
+ * Model for testing model name starting with number
+ **/
 
-
-
-
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-19T15:53:31.820+08:00")
+@ApiModel(description = "Model for testing model name starting with number")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public class Model200Response   {
   
   private Integer name = null;
@@ -33,7 +34,6 @@ public class Model200Response   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -74,5 +74,3 @@ public class Model200Response   {
   }
 }
 
-
-
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelReturn.java
index d4be9479686..539032cec41 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -7,11 +7,12 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
+/**
+ * Model for testing reserved words
+ **/
 
-
-
-
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-19T15:53:31.820+08:00")
+@ApiModel(description = "Model for testing reserved words")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public class ModelReturn   {
   
   private Integer _return = null;
@@ -33,7 +34,6 @@ public class ModelReturn   {
     this._return = _return;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -74,5 +74,3 @@ public class ModelReturn   {
   }
 }
 
-
-
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Name.java
index a10c13ef806..c29314eb091 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Name.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Name.java
@@ -7,11 +7,12 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
+/**
+ * Model for testing model name same as property name
+ **/
 
-
-
-
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-19T15:53:31.820+08:00")
+@ApiModel(description = "Model for testing model name same as property name")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public class Name   {
   
   private Integer name = null;
@@ -25,7 +26,7 @@ public class Name   {
     return this;
   }
   
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(example = "null", required = true, value = "")
   @JsonProperty("name")
   public Integer getName() {
     return name;
@@ -34,24 +35,13 @@ public class Name   {
     this.name = name;
   }
 
-  
-  /**
-   **/
-  public Name snakeCase(Integer snakeCase) {
-    this.snakeCase = snakeCase;
-    return this;
-  }
-  
+
   @ApiModelProperty(example = "null", value = "")
   @JsonProperty("snake_case")
   public Integer getSnakeCase() {
     return snakeCase;
   }
-  public void setSnakeCase(Integer snakeCase) {
-    this.snakeCase = snakeCase;
-  }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -94,5 +84,3 @@ public class Name   {
   }
 }
 
-
-
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java
index a6ae8c7aea8..e713b75a845 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java
@@ -11,7 +11,7 @@ import java.util.Date;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:50.356+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public class Order   {
   
   private Long id = null;
@@ -48,7 +48,7 @@ public class Order   {
     return id;
   }
 
-  
+
   /**
    **/
   public Order petId(Long petId) {
@@ -65,7 +65,7 @@ public class Order   {
     this.petId = petId;
   }
 
-  
+
   /**
    **/
   public Order quantity(Integer quantity) {
@@ -82,7 +82,7 @@ public class Order   {
     this.quantity = quantity;
   }
 
-  
+
   /**
    **/
   public Order shipDate(Date shipDate) {
@@ -99,7 +99,7 @@ public class Order   {
     this.shipDate = shipDate;
   }
 
-  
+
   /**
    * Order Status
    **/
@@ -117,7 +117,7 @@ public class Order   {
     this.status = status;
   }
 
-  
+
   /**
    **/
   public Order complete(Boolean complete) {
@@ -134,7 +134,6 @@ public class Order   {
     this.complete = complete;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java
index af5ed59eba3..2d7a49dd47f 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java
@@ -14,7 +14,7 @@ import java.util.List;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:50.356+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public class Pet   {
   
   private Long id = null;
@@ -61,7 +61,7 @@ public class Pet   {
     this.id = id;
   }
 
-  
+
   /**
    **/
   public Pet category(Category category) {
@@ -78,7 +78,7 @@ public class Pet   {
     this.category = category;
   }
 
-  
+
   /**
    **/
   public Pet name(String name) {
@@ -95,7 +95,7 @@ public class Pet   {
     this.name = name;
   }
 
-  
+
   /**
    **/
   public Pet photoUrls(List<String> photoUrls) {
@@ -112,7 +112,7 @@ public class Pet   {
     this.photoUrls = photoUrls;
   }
 
-  
+
   /**
    **/
   public Pet tags(List<Tag> tags) {
@@ -129,7 +129,7 @@ public class Pet   {
     this.tags = tags;
   }
 
-  
+
   /**
    * pet status in the store
    **/
@@ -147,7 +147,6 @@ public class Pet   {
     this.status = status;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SpecialModelName.java
index 254f9be4828..51f88ff4306 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -9,9 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-
-
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-19T15:53:31.820+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public class SpecialModelName   {
   
   private Long specialPropertyName = null;
@@ -33,7 +31,6 @@ public class SpecialModelName   {
     this.specialPropertyName = specialPropertyName;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -74,5 +71,3 @@ public class SpecialModelName   {
   }
 }
 
-
-
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Tag.java
index 30263bf28ae..981302df547 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Tag.java
@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:50.356+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public class Tag   {
   
   private Long id = null;
@@ -32,7 +32,7 @@ public class Tag   {
     this.id = id;
   }
 
-  
+
   /**
    **/
   public Tag name(String name) {
@@ -49,7 +49,6 @@ public class Tag   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java
index b3c1d22d367..5502f018489 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java
@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:50.356+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:33.302+02:00")
 public class User   {
   
   private Long id = null;
@@ -38,7 +38,7 @@ public class User   {
     this.id = id;
   }
 
-  
+
   /**
    **/
   public User username(String username) {
@@ -55,7 +55,7 @@ public class User   {
     this.username = username;
   }
 
-  
+
   /**
    **/
   public User firstName(String firstName) {
@@ -72,7 +72,7 @@ public class User   {
     this.firstName = firstName;
   }
 
-  
+
   /**
    **/
   public User lastName(String lastName) {
@@ -89,7 +89,7 @@ public class User   {
     this.lastName = lastName;
   }
 
-  
+
   /**
    **/
   public User email(String email) {
@@ -106,7 +106,7 @@ public class User   {
     this.email = email;
   }
 
-  
+
   /**
    **/
   public User password(String password) {
@@ -123,7 +123,7 @@ public class User   {
     this.password = password;
   }
 
-  
+
   /**
    **/
   public User phone(String phone) {
@@ -140,7 +140,7 @@ public class User   {
     this.phone = phone;
   }
 
-  
+
   /**
    * User Status
    **/
@@ -158,7 +158,6 @@ public class User   {
     this.userStatus = userStatus;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
diff --git a/samples/client/petstore/java/jersey2/build.gradle b/samples/client/petstore/java/jersey2/build.gradle
index 72fc75b04f2..2daaf89454a 100644
--- a/samples/client/petstore/java/jersey2/build.gradle
+++ b/samples/client/petstore/java/jersey2/build.gradle
@@ -9,8 +9,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'com.github.dcendents.android-maven'
 
     android {
-        compileSdkVersion 22
-        buildToolsVersion '22.0.0'
+        compileSdkVersion 23
+        buildToolsVersion '23.0.2'
         defaultConfig {
             minSdkVersion 14
-            targetSdkVersion 22
+            targetSdkVersion 23
         }
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiException.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiException.java
index 2f7ef6e3286..0b0368d214f 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiException.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiException.java
@@ -3,7 +3,7 @@ package io.swagger.client;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:48.808+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:32.196+02:00")
 public class ApiException extends Exception {
   private int code = 0;
   private Map<String, List<String>> responseHeaders = null;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Configuration.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Configuration.java
index b06f6a4f6a4..256cd5ff087 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Configuration.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Configuration.java
@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:48.808+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:32.196+02:00")
 public class Configuration {
   private static ApiClient defaultApiClient = new ApiClient();
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/JSON.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/JSON.java
index ff3a5cb782a..51b30d45655 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/JSON.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/JSON.java
@@ -8,7 +8,7 @@ import java.text.DateFormat;
 
 import javax.ws.rs.ext.ContextResolver;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:48.808+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:32.196+02:00")
 public class JSON implements ContextResolver<ObjectMapper> {
   private ObjectMapper mapper;
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Pair.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Pair.java
index a83256c3b3d..d09ea6040bf 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Pair.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Pair.java
@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:48.808+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:32.196+02:00")
 public class Pair {
     private String name = "";
     private String value = "";
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/StringUtil.java
index 513c655bd4d..b42e4d241ae 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/StringUtil.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/StringUtil.java
@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:48.808+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:32.196+02:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/PetApi.java
index dff33b11fc4..61ba97f3fea 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/PetApi.java
@@ -16,7 +16,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-17T16:00:50.657+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:32.196+02:00")
 public class PetApi {
   private ApiClient apiClient;
 
@@ -36,7 +36,6 @@ public class PetApi {
     this.apiClient = apiClient;
   }
 
-  
   /**
    * Add a new pet to the store
    * 
@@ -54,12 +53,9 @@ public class PetApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -72,11 +68,9 @@ public class PetApi {
 
     String[] localVarAuthNames = new String[] { "petstore_auth" };
 
-    
+
     apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
-    
   }
-  
   /**
    * Fake endpoint to test byte array in body parameter for adding a new pet to the store
    * 
@@ -94,12 +88,9 @@ public class PetApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -112,11 +103,9 @@ public class PetApi {
 
     String[] localVarAuthNames = new String[] { "petstore_auth" };
 
-    
+
     apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
-    
   }
-  
   /**
    * Deletes a pet
    * 
@@ -141,14 +130,11 @@ public class PetApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     if (apiKey != null)
       localVarHeaderParams.put("api_key", apiClient.parameterToString(apiKey));
-    
 
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -161,11 +147,9 @@ public class PetApi {
 
     String[] localVarAuthNames = new String[] { "petstore_auth" };
 
-    
+
     apiClient.invokeAPI(localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
-    
   }
-  
   /**
    * Finds Pets by status
    * Multiple status values can be provided with comma separated strings
@@ -184,14 +168,10 @@ public class PetApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
     localVarQueryParams.addAll(apiClient.parameterToPairs("multi", "status", status));
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -204,12 +184,9 @@ public class PetApi {
 
     String[] localVarAuthNames = new String[] { "petstore_auth" };
 
-    
     GenericType<List<Pet>> localVarReturnType = new GenericType<List<Pet>>() {};
     return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-    
-  }
-  
+      }
   /**
    * Finds Pets by tags
    * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
@@ -228,14 +205,10 @@ public class PetApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
     localVarQueryParams.addAll(apiClient.parameterToPairs("multi", "tags", tags));
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -248,12 +221,9 @@ public class PetApi {
 
     String[] localVarAuthNames = new String[] { "petstore_auth" };
 
-    
     GenericType<List<Pet>> localVarReturnType = new GenericType<List<Pet>>() {};
     return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-    
-  }
-  
+      }
   /**
    * Find pet by ID
    * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
@@ -278,12 +248,9 @@ public class PetApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -294,14 +261,11 @@ public class PetApi {
     };
     final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
-    String[] localVarAuthNames = new String[] { "petstore_auth", "api_key" };
+    String[] localVarAuthNames = new String[] { "api_key", "petstore_auth" };
 
-    
     GenericType<Pet> localVarReturnType = new GenericType<Pet>() {};
     return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-    
-  }
-  
+      }
   /**
    * Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
    * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
@@ -326,12 +290,9 @@ public class PetApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -342,14 +303,11 @@ public class PetApi {
     };
     final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
-    String[] localVarAuthNames = new String[] { "petstore_auth", "api_key" };
+    String[] localVarAuthNames = new String[] { "api_key", "petstore_auth" };
 
-    
     GenericType<InlineResponse200> localVarReturnType = new GenericType<InlineResponse200>() {};
     return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-    
-  }
-  
+      }
   /**
    * Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
    * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
@@ -374,12 +332,9 @@ public class PetApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -390,14 +345,11 @@ public class PetApi {
     };
     final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
-    String[] localVarAuthNames = new String[] { "petstore_auth", "api_key" };
+    String[] localVarAuthNames = new String[] { "api_key", "petstore_auth" };
 
-    
     GenericType<byte[]> localVarReturnType = new GenericType<byte[]>() {};
     return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-    
-  }
-  
+      }
   /**
    * Update an existing pet
    * 
@@ -415,12 +367,9 @@ public class PetApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -433,11 +382,9 @@ public class PetApi {
 
     String[] localVarAuthNames = new String[] { "petstore_auth" };
 
-    
+
     apiClient.invokeAPI(localVarPath, "PUT", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
-    
   }
-  
   /**
    * Updates a pet in the store with form data
    * 
@@ -463,15 +410,12 @@ public class PetApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     if (name != null)
       localVarFormParams.put("name", name);
-    if (status != null)
+if (status != null)
       localVarFormParams.put("status", status);
-    
 
     final String[] localVarAccepts = {
       "application/json", "application/xml"
@@ -485,11 +429,9 @@ public class PetApi {
 
     String[] localVarAuthNames = new String[] { "petstore_auth" };
 
-    
+
     apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
-    
   }
-  
   /**
    * uploads an image
    * 
@@ -515,15 +457,12 @@ public class PetApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     if (additionalMetadata != null)
       localVarFormParams.put("additionalMetadata", additionalMetadata);
-    if (file != null)
+if (file != null)
       localVarFormParams.put("file", file);
-    
 
     final String[] localVarAccepts = {
       "application/json", "application/xml"
@@ -537,9 +476,7 @@ public class PetApi {
 
     String[] localVarAuthNames = new String[] { "petstore_auth" };
 
-    
+
     apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
-    
   }
-  
 }
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/StoreApi.java
index 9b7bf83fea4..bed19115aa0 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/StoreApi.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/StoreApi.java
@@ -14,7 +14,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-17T16:00:50.657+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:32.196+02:00")
 public class StoreApi {
   private ApiClient apiClient;
 
@@ -34,7 +34,6 @@ public class StoreApi {
     this.apiClient = apiClient;
   }
 
-  
   /**
    * Delete purchase order by ID
    * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
@@ -58,12 +57,9 @@ public class StoreApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -76,11 +72,9 @@ public class StoreApi {
 
     String[] localVarAuthNames = new String[] {  };
 
-    
+
     apiClient.invokeAPI(localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
-    
   }
-  
   /**
    * Finds orders by status
    * A single status value can be provided as a string
@@ -99,14 +93,10 @@ public class StoreApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
     localVarQueryParams.addAll(apiClient.parameterToPairs("", "status", status));
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -119,12 +109,9 @@ public class StoreApi {
 
     String[] localVarAuthNames = new String[] { "test_api_client_id", "test_api_client_secret" };
 
-    
     GenericType<List<Order>> localVarReturnType = new GenericType<List<Order>>() {};
     return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-    
-  }
-  
+      }
   /**
    * Returns pet inventories by status
    * Returns a map of status codes to quantities
@@ -142,12 +129,9 @@ public class StoreApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -160,12 +144,9 @@ public class StoreApi {
 
     String[] localVarAuthNames = new String[] { "api_key" };
 
-    
     GenericType<Map<String, Integer>> localVarReturnType = new GenericType<Map<String, Integer>>() {};
     return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-    
-  }
-  
+      }
   /**
    * Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
    * Returns an arbitrary object which is actually a map of status codes to quantities
@@ -183,12 +164,9 @@ public class StoreApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -201,15 +179,12 @@ public class StoreApi {
 
     String[] localVarAuthNames = new String[] { "api_key" };
 
-    
     GenericType<Object> localVarReturnType = new GenericType<Object>() {};
     return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-    
-  }
-  
+      }
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+   * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return Order
    * @throws ApiException if fails to make API call
@@ -231,12 +206,9 @@ public class StoreApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -247,14 +219,11 @@ public class StoreApi {
     };
     final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
-    String[] localVarAuthNames = new String[] { "test_api_key_query", "test_api_key_header" };
+    String[] localVarAuthNames = new String[] { "test_api_key_header", "test_api_key_query" };
 
-    
     GenericType<Order> localVarReturnType = new GenericType<Order>() {};
     return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-    
-  }
-  
+      }
   /**
    * Place an order for a pet
    * 
@@ -273,12 +242,9 @@ public class StoreApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -291,10 +257,7 @@ public class StoreApi {
 
     String[] localVarAuthNames = new String[] { "test_api_client_id", "test_api_client_secret" };
 
-    
     GenericType<Order> localVarReturnType = new GenericType<Order>() {};
     return apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-    
-  }
-  
+      }
 }
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/UserApi.java
index 47334096488..a6a28778e09 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/UserApi.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/UserApi.java
@@ -14,7 +14,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-17T16:00:50.657+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:32.196+02:00")
 public class UserApi {
   private ApiClient apiClient;
 
@@ -34,7 +34,6 @@ public class UserApi {
     this.apiClient = apiClient;
   }
 
-  
   /**
    * Create user
    * This can only be done by the logged in user.
@@ -52,12 +51,9 @@ public class UserApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -70,11 +66,9 @@ public class UserApi {
 
     String[] localVarAuthNames = new String[] {  };
 
-    
+
     apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
-    
   }
-  
   /**
    * Creates list of users with given input array
    * 
@@ -92,12 +86,9 @@ public class UserApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -110,11 +101,9 @@ public class UserApi {
 
     String[] localVarAuthNames = new String[] {  };
 
-    
+
     apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
-    
   }
-  
   /**
    * Creates list of users with given input array
    * 
@@ -132,12 +121,9 @@ public class UserApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -150,11 +136,9 @@ public class UserApi {
 
     String[] localVarAuthNames = new String[] {  };
 
-    
+
     apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
-    
   }
-  
   /**
    * Delete user
    * This can only be done by the logged in user.
@@ -178,12 +162,9 @@ public class UserApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -196,15 +177,13 @@ public class UserApi {
 
     String[] localVarAuthNames = new String[] { "test_http_basic" };
 
-    
+
     apiClient.invokeAPI(localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
-    
   }
-  
   /**
    * Get user by user name
    * 
-   * @param username The name that needs to be fetched. Use user1 for testing. (required)
+   * @param username The name that needs to be fetched. Use user1 for testing.  (required)
    * @return User
    * @throws ApiException if fails to make API call
    */
@@ -225,12 +204,9 @@ public class UserApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -243,12 +219,9 @@ public class UserApi {
 
     String[] localVarAuthNames = new String[] {  };
 
-    
     GenericType<User> localVarReturnType = new GenericType<User>() {};
     return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-    
-  }
-  
+      }
   /**
    * Logs user into the system
    * 
@@ -268,16 +241,11 @@ public class UserApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
     localVarQueryParams.addAll(apiClient.parameterToPairs("", "username", username));
-    
     localVarQueryParams.addAll(apiClient.parameterToPairs("", "password", password));
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -290,12 +258,9 @@ public class UserApi {
 
     String[] localVarAuthNames = new String[] {  };
 
-    
     GenericType<String> localVarReturnType = new GenericType<String>() {};
     return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-    
-  }
-  
+      }
   /**
    * Logs out current logged in user session
    * 
@@ -312,12 +277,9 @@ public class UserApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -330,11 +292,9 @@ public class UserApi {
 
     String[] localVarAuthNames = new String[] {  };
 
-    
+
     apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
-    
   }
-  
   /**
    * Updated user
    * This can only be done by the logged in user.
@@ -359,12 +319,9 @@ public class UserApi {
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
     Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    
 
     
-
     
-
     final String[] localVarAccepts = {
       "application/json", "application/xml"
     };
@@ -377,9 +334,7 @@ public class UserApi {
 
     String[] localVarAuthNames = new String[] {  };
 
-    
+
     apiClient.invokeAPI(localVarPath, "PUT", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
-    
   }
-  
 }
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
index 4687d6782e1..d7cfe647b59 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
@@ -5,7 +5,7 @@ import io.swagger.client.Pair;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:48.808+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:32.196+02:00")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
index 0b20480ec95..a956d40501b 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
@@ -9,7 +9,7 @@ import java.util.List;
 
 import java.io.UnsupportedEncodingException;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:48.808+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:32.196+02:00")
 public class HttpBasicAuth implements Authentication {
   private String username;
   private String password;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/OAuth.java
index 15a655f826c..9534d08fd36 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/OAuth.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/OAuth.java
@@ -5,7 +5,7 @@ import io.swagger.client.Pair;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:48.808+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:32.196+02:00")
 public class OAuth implements Authentication {
   private String accessToken;
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Animal.java
new file mode 100644
index 00000000000..37262216c72
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Animal.java
@@ -0,0 +1,73 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:32.196+02:00")
+public class Animal   {
+  
+  private String className = null;
+
+  
+  /**
+   **/
+  public Animal className(String className) {
+    this.className = className;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", required = true, value = "")
+  @JsonProperty("className")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Animal animal = (Animal) o;
+    return Objects.equals(this.className, animal.className);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Animal {\n");
+    
+    sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Cat.java
new file mode 100644
index 00000000000..c8e19c39c30
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Cat.java
@@ -0,0 +1,95 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.client.model.Animal;
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:32.196+02:00")
+public class Cat extends Animal  {
+  
+  private String className = null;
+  private Boolean declawed = null;
+
+  
+  /**
+   **/
+  public Cat className(String className) {
+    this.className = className;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", required = true, value = "")
+  @JsonProperty("className")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+
+  /**
+   **/
+  public Cat declawed(Boolean declawed) {
+    this.declawed = declawed;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("declawed")
+  public Boolean getDeclawed() {
+    return declawed;
+  }
+  public void setDeclawed(Boolean declawed) {
+    this.declawed = declawed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Cat cat = (Cat) o;
+    return Objects.equals(this.className, cat.className) &&
+        Objects.equals(this.declawed, cat.declawed) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className, declawed, super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Cat {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Category.java
index 0a81b468c6e..fad08101a44 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Category.java
@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:48.808+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:32.196+02:00")
 public class Category   {
   
   private Long id = null;
@@ -32,7 +32,7 @@ public class Category   {
     this.id = id;
   }
 
-  
+
   /**
    **/
   public Category name(String name) {
@@ -49,7 +49,6 @@ public class Category   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Dog.java
new file mode 100644
index 00000000000..920d45354d5
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Dog.java
@@ -0,0 +1,95 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.client.model.Animal;
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:32.196+02:00")
+public class Dog extends Animal  {
+  
+  private String className = null;
+  private String breed = null;
+
+  
+  /**
+   **/
+  public Dog className(String className) {
+    this.className = className;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", required = true, value = "")
+  @JsonProperty("className")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+
+  /**
+   **/
+  public Dog breed(String breed) {
+    this.breed = breed;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("breed")
+  public String getBreed() {
+    return breed;
+  }
+  public void setBreed(String breed) {
+    this.breed = breed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Dog dog = (Dog) o;
+    return Objects.equals(this.className, dog.className) &&
+        Objects.equals(this.breed, dog.breed) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className, breed, super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Dog {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/FormatTest.java
new file mode 100644
index 00000000000..9d0b1a22e98
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/FormatTest.java
@@ -0,0 +1,295 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:32.196+02:00")
+public class FormatTest   {
+  
+  private Integer integer = null;
+  private Integer int32 = null;
+  private Long int64 = null;
+  private BigDecimal number = null;
+  private Float _float = null;
+  private Double _double = null;
+  private String string = null;
+  private byte[] _byte = null;
+  private byte[] binary = null;
+  private Date date = null;
+  private Date dateTime = null;
+  private String password = null;
+
+  
+  /**
+   **/
+  public FormatTest integer(Integer integer) {
+    this.integer = integer;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("integer")
+  public Integer getInteger() {
+    return integer;
+  }
+  public void setInteger(Integer integer) {
+    this.integer = integer;
+  }
+
+
+  /**
+   **/
+  public FormatTest int32(Integer int32) {
+    this.int32 = int32;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("int32")
+  public Integer getInt32() {
+    return int32;
+  }
+  public void setInt32(Integer int32) {
+    this.int32 = int32;
+  }
+
+
+  /**
+   **/
+  public FormatTest int64(Long int64) {
+    this.int64 = int64;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("int64")
+  public Long getInt64() {
+    return int64;
+  }
+  public void setInt64(Long int64) {
+    this.int64 = int64;
+  }
+
+
+  /**
+   **/
+  public FormatTest number(BigDecimal number) {
+    this.number = number;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", required = true, value = "")
+  @JsonProperty("number")
+  public BigDecimal getNumber() {
+    return number;
+  }
+  public void setNumber(BigDecimal number) {
+    this.number = number;
+  }
+
+
+  /**
+   **/
+  public FormatTest _float(Float _float) {
+    this._float = _float;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("float")
+  public Float getFloat() {
+    return _float;
+  }
+  public void setFloat(Float _float) {
+    this._float = _float;
+  }
+
+
+  /**
+   **/
+  public FormatTest _double(Double _double) {
+    this._double = _double;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("double")
+  public Double getDouble() {
+    return _double;
+  }
+  public void setDouble(Double _double) {
+    this._double = _double;
+  }
+
+
+  /**
+   **/
+  public FormatTest string(String string) {
+    this.string = string;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("string")
+  public String getString() {
+    return string;
+  }
+  public void setString(String string) {
+    this.string = string;
+  }
+
+
+  /**
+   **/
+  public FormatTest _byte(byte[] _byte) {
+    this._byte = _byte;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("byte")
+  public byte[] getByte() {
+    return _byte;
+  }
+  public void setByte(byte[] _byte) {
+    this._byte = _byte;
+  }
+
+
+  /**
+   **/
+  public FormatTest binary(byte[] binary) {
+    this.binary = binary;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("binary")
+  public byte[] getBinary() {
+    return binary;
+  }
+  public void setBinary(byte[] binary) {
+    this.binary = binary;
+  }
+
+
+  /**
+   **/
+  public FormatTest date(Date date) {
+    this.date = date;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("date")
+  public Date getDate() {
+    return date;
+  }
+  public void setDate(Date date) {
+    this.date = date;
+  }
+
+
+  /**
+   **/
+  public FormatTest dateTime(Date dateTime) {
+    this.dateTime = dateTime;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("dateTime")
+  public Date getDateTime() {
+    return dateTime;
+  }
+  public void setDateTime(Date dateTime) {
+    this.dateTime = dateTime;
+  }
+
+
+  /**
+   **/
+  public FormatTest password(String password) {
+    this.password = password;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("password")
+  public String getPassword() {
+    return password;
+  }
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FormatTest formatTest = (FormatTest) o;
+    return Objects.equals(this.integer, formatTest.integer) &&
+        Objects.equals(this.int32, formatTest.int32) &&
+        Objects.equals(this.int64, formatTest.int64) &&
+        Objects.equals(this.number, formatTest.number) &&
+        Objects.equals(this._float, formatTest._float) &&
+        Objects.equals(this._double, formatTest._double) &&
+        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._byte, formatTest._byte) &&
+        Objects.equals(this.binary, formatTest.binary) &&
+        Objects.equals(this.date, formatTest.date) &&
+        Objects.equals(this.dateTime, formatTest.dateTime) &&
+        Objects.equals(this.password, formatTest.password);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, password);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FormatTest {\n");
+    
+    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
+    sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
+    sb.append("    number: ").append(toIndentedString(number)).append("\n");
+    sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
+    sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
+    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
+    sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
+    sb.append("    date: ").append(toIndentedString(date)).append("\n");
+    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
+    sb.append("    password: ").append(toIndentedString(password)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/InlineResponse200.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/InlineResponse200.java
index 36019aa9c4b..57084986396 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/InlineResponse200.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/InlineResponse200.java
@@ -13,7 +13,7 @@ import java.util.List;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:48.808+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:32.196+02:00")
 public class InlineResponse200   {
   
   private List<Tag> tags = new ArrayList<Tag>();
@@ -60,7 +60,7 @@ public class InlineResponse200   {
     this.tags = tags;
   }
 
-  
+
   /**
    **/
   public InlineResponse200 id(Long id) {
@@ -77,7 +77,7 @@ public class InlineResponse200   {
     this.id = id;
   }
 
-  
+
   /**
    **/
   public InlineResponse200 category(Object category) {
@@ -94,7 +94,7 @@ public class InlineResponse200   {
     this.category = category;
   }
 
-  
+
   /**
    * pet status in the store
    **/
@@ -112,7 +112,7 @@ public class InlineResponse200   {
     this.status = status;
   }
 
-  
+
   /**
    **/
   public InlineResponse200 name(String name) {
@@ -129,7 +129,7 @@ public class InlineResponse200   {
     this.name = name;
   }
 
-  
+
   /**
    **/
   public InlineResponse200 photoUrls(List<String> photoUrls) {
@@ -146,7 +146,6 @@ public class InlineResponse200   {
     this.photoUrls = photoUrls;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Model200Response.java
index a05d493feb6..32010398f48 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Model200Response.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Model200Response.java
@@ -7,9 +7,12 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
+/**
+ * Model for testing model name starting with number
+ **/
 
-
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-17T16:00:50.657+08:00")
+@ApiModel(description = "Model for testing model name starting with number")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:32.196+02:00")
 public class Model200Response   {
   
   private Integer name = null;
@@ -31,7 +34,6 @@ public class Model200Response   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelReturn.java
index e2e95fd0f77..0fad49d781d 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -7,9 +7,12 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
+/**
+ * Model for testing reserved words
+ **/
 
-
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-17T16:00:50.657+08:00")
+@ApiModel(description = "Model for testing reserved words")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:32.196+02:00")
 public class ModelReturn   {
   
   private Integer _return = null;
@@ -31,7 +34,6 @@ public class ModelReturn   {
     this._return = _return;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Name.java
index fc0985915ce..72b8652423e 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Name.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Name.java
@@ -7,12 +7,16 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
+/**
+ * Model for testing model name same as property name
+ **/
 
-
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-17T16:00:50.657+08:00")
+@ApiModel(description = "Model for testing model name same as property name")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:32.196+02:00")
 public class Name   {
   
   private Integer name = null;
+  private Integer snakeCase = null;
 
   
   /**
@@ -22,7 +26,7 @@ public class Name   {
     return this;
   }
   
-  @ApiModelProperty(example = "null", value = "")
+  @ApiModelProperty(example = "null", required = true, value = "")
   @JsonProperty("name")
   public Integer getName() {
     return name;
@@ -31,7 +35,13 @@ public class Name   {
     this.name = name;
   }
 
-  
+
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("snake_case")
+  public Integer getSnakeCase() {
+    return snakeCase;
+  }
+
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -42,12 +52,13 @@ public class Name   {
       return false;
     }
     Name name = (Name) o;
-    return Objects.equals(this.name, name.name);
+    return Objects.equals(this.name, name.name) &&
+        Objects.equals(this.snakeCase, name.snakeCase);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(name);
+    return Objects.hash(name, snakeCase);
   }
 
   @Override
@@ -56,6 +67,7 @@ public class Name   {
     sb.append("class Name {\n");
     
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java
index 943ddd37306..e5b35f51539 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java
@@ -11,7 +11,7 @@ import java.util.Date;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:48.808+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:32.196+02:00")
 public class Order   {
   
   private Long id = null;
@@ -48,7 +48,7 @@ public class Order   {
     return id;
   }
 
-  
+
   /**
    **/
   public Order petId(Long petId) {
@@ -65,7 +65,7 @@ public class Order   {
     this.petId = petId;
   }
 
-  
+
   /**
    **/
   public Order quantity(Integer quantity) {
@@ -82,7 +82,7 @@ public class Order   {
     this.quantity = quantity;
   }
 
-  
+
   /**
    **/
   public Order shipDate(Date shipDate) {
@@ -99,7 +99,7 @@ public class Order   {
     this.shipDate = shipDate;
   }
 
-  
+
   /**
    * Order Status
    **/
@@ -117,7 +117,7 @@ public class Order   {
     this.status = status;
   }
 
-  
+
   /**
    **/
   public Order complete(Boolean complete) {
@@ -134,7 +134,6 @@ public class Order   {
     this.complete = complete;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java
index 1c434aa687d..2ae12be0c91 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java
@@ -14,7 +14,7 @@ import java.util.List;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:48.808+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:32.196+02:00")
 public class Pet   {
   
   private Long id = null;
@@ -61,7 +61,7 @@ public class Pet   {
     this.id = id;
   }
 
-  
+
   /**
    **/
   public Pet category(Category category) {
@@ -78,7 +78,7 @@ public class Pet   {
     this.category = category;
   }
 
-  
+
   /**
    **/
   public Pet name(String name) {
@@ -95,7 +95,7 @@ public class Pet   {
     this.name = name;
   }
 
-  
+
   /**
    **/
   public Pet photoUrls(List<String> photoUrls) {
@@ -112,7 +112,7 @@ public class Pet   {
     this.photoUrls = photoUrls;
   }
 
-  
+
   /**
    **/
   public Pet tags(List<Tag> tags) {
@@ -129,7 +129,7 @@ public class Pet   {
     this.tags = tags;
   }
 
-  
+
   /**
    * pet status in the store
    **/
@@ -147,7 +147,6 @@ public class Pet   {
     this.status = status;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/SpecialModelName.java
index 0349889b190..7233dae4aae 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-17T16:00:50.657+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:32.196+02:00")
 public class SpecialModelName   {
   
   private Long specialPropertyName = null;
@@ -31,7 +31,6 @@ public class SpecialModelName   {
     this.specialPropertyName = specialPropertyName;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Tag.java
index 437b42c44be..5a680e60356 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Tag.java
@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:48.808+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:32.196+02:00")
 public class Tag   {
   
   private Long id = null;
@@ -32,7 +32,7 @@ public class Tag   {
     this.id = id;
   }
 
-  
+
   /**
    **/
   public Tag name(String name) {
@@ -49,7 +49,6 @@ public class Tag   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java
index f6299149305..6017c1f66ab 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java
@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:48.808+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:32.196+02:00")
 public class User   {
   
   private Long id = null;
@@ -38,7 +38,7 @@ public class User   {
     this.id = id;
   }
 
-  
+
   /**
    **/
   public User username(String username) {
@@ -55,7 +55,7 @@ public class User   {
     this.username = username;
   }
 
-  
+
   /**
    **/
   public User firstName(String firstName) {
@@ -72,7 +72,7 @@ public class User   {
     this.firstName = firstName;
   }
 
-  
+
   /**
    **/
   public User lastName(String lastName) {
@@ -89,7 +89,7 @@ public class User   {
     this.lastName = lastName;
   }
 
-  
+
   /**
    **/
   public User email(String email) {
@@ -106,7 +106,7 @@ public class User   {
     this.email = email;
   }
 
-  
+
   /**
    **/
   public User password(String password) {
@@ -123,7 +123,7 @@ public class User   {
     this.password = password;
   }
 
-  
+
   /**
    **/
   public User phone(String phone) {
@@ -140,7 +140,7 @@ public class User   {
     this.phone = phone;
   }
 
-  
+
   /**
    * User Status
    **/
@@ -158,7 +158,6 @@ public class User   {
     this.userStatus = userStatus;
   }
 
-  
 
   @Override
   public boolean equals(java.lang.Object o) {
diff --git a/samples/client/petstore/java/okhttp-gson/build.gradle b/samples/client/petstore/java/okhttp-gson/build.gradle
index b81de6dbf3a..73518e39969 100644
--- a/samples/client/petstore/java/okhttp-gson/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson/build.gradle
@@ -9,8 +9,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'com.github.dcendents.android-maven'
 
     android {
-        compileSdkVersion 22
-        buildToolsVersion '22.0.0'
+        compileSdkVersion 23
+        buildToolsVersion '23.0.2'
         defaultConfig {
             minSdkVersion 14
-            targetSdkVersion 22
+            targetSdkVersion 23
         }
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7
@@ -98,5 +98,5 @@ dependencies {
     compile 'com.squareup.okhttp:okhttp:2.7.2'
     compile 'com.squareup.okhttp:logging-interceptor:2.7.2'
     compile 'com.google.code.gson:gson:2.3.1'
-    testCompile 'junit:junit:4.8.1'
+    testCompile 'junit:junit:4.12'
 }
diff --git a/samples/client/petstore/java/okhttp-gson/pom.xml b/samples/client/petstore/java/okhttp-gson/pom.xml
index 0e9dbe72685..520d234a769 100644
--- a/samples/client/petstore/java/okhttp-gson/pom.xml
+++ b/samples/client/petstore/java/okhttp-gson/pom.xml
@@ -104,6 +104,7 @@
           <target>1.6</target>
         </configuration>
       </plugin>
+      <!-- For testing build.gradle -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
@@ -124,13 +125,14 @@
           </execution>
         </executions>
       </plugin>
+
     </plugins>
   </build>
   <dependencies>
     <dependency>
       <groupId>io.swagger</groupId>
       <artifactId>swagger-annotations</artifactId>
-      <version>${swagger-annotations-version}</version>
+      <version>${swagger-core-version}</version>
     </dependency>
     <dependency>
       <groupId>com.squareup.okhttp</groupId>
@@ -157,10 +159,10 @@
     </dependency>
   </dependencies>
   <properties>
-    <swagger-annotations-version>1.5.0</swagger-annotations-version>
+    <swagger-core-version>1.5.8</swagger-core-version>
     <okhttp-version>2.7.2</okhttp-version>
     <gson-version>2.3.1</gson-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
-    <junit-version>4.8.1</junit-version>
+    <junit-version>4.12</junit-version>
   </properties>
 </project>
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiException.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiException.java
index 529f9fff8dd..564721b4128 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiException.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiException.java
@@ -3,7 +3,7 @@ package io.swagger.client;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:51.831+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:34.419+02:00")
 public class ApiException extends Exception {
   private int code = 0;
   private Map<String, List<String>> responseHeaders = null;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Configuration.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Configuration.java
index c4c80febb52..d165a15b2c7 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Configuration.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Configuration.java
@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:51.831+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:34.419+02:00")
 public class Configuration {
   private static ApiClient defaultApiClient = new ApiClient();
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Pair.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Pair.java
index 86d8f1de128..3527bb741c6 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Pair.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Pair.java
@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:51.831+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:34.419+02:00")
 public class Pair {
     private String name = "";
     private String value = "";
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/StringUtil.java
index f9f52549100..67634780b8e 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/StringUtil.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/StringUtil.java
@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:51.831+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:34.419+02:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/PetApi.java
index 507f838e341..1bfdafb1fcb 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/PetApi.java
@@ -46,7 +46,6 @@ public class PetApi {
     this.apiClient = apiClient;
   }
 
-  
   /* Build call for addPet */
   private Call addPetCall(Pet body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = body;
@@ -144,14 +143,13 @@ public class PetApi {
     apiClient.executeAsync(call, callback);
     return call;
   }
-  
   /* Build call for addPetUsingByteArray */
   private Call addPetUsingByteArrayCall(byte[] body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = body;
     
 
     // create path and map variables
-    String localVarPath = "/pet?testing_byte_array=true".replaceAll("\\{format\\}","json");
+    String localVarPath = "/pet?testing_byte_array&#x3D;true".replaceAll("\\{format\\}","json");
 
     List<Pair> localVarQueryParams = new ArrayList<Pair>();
 
@@ -242,7 +240,6 @@ public class PetApi {
     apiClient.executeAsync(call, callback);
     return call;
   }
-  
   /* Build call for deletePet */
   private Call deletePetCall(Long petId, String apiKey, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -351,7 +348,6 @@ public class PetApi {
     apiClient.executeAsync(call, callback);
     return call;
   }
-  
   /* Build call for findPetsByStatus */
   private Call findPetsByStatusCall(List<String> status, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -455,7 +451,6 @@ public class PetApi {
     apiClient.executeAsync(call, localVarReturnType, callback);
     return call;
   }
-  
   /* Build call for findPetsByTags */
   private Call findPetsByTagsCall(List<String> tags, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -559,7 +554,6 @@ public class PetApi {
     apiClient.executeAsync(call, localVarReturnType, callback);
     return call;
   }
-  
   /* Build call for getPetById */
   private Call getPetByIdCall(Long petId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -604,7 +598,7 @@ public class PetApi {
       });
     }
 
-    String[] localVarAuthNames = new String[] { "petstore_auth", "api_key" };
+    String[] localVarAuthNames = new String[] { "api_key", "petstore_auth" };
     return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
   }
 
@@ -667,7 +661,6 @@ public class PetApi {
     apiClient.executeAsync(call, localVarReturnType, callback);
     return call;
   }
-  
   /* Build call for getPetByIdInObject */
   private Call getPetByIdInObjectCall(Long petId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -679,7 +672,7 @@ public class PetApi {
     
 
     // create path and map variables
-    String localVarPath = "/pet/{petId}?response=inline_arbitrary_object".replaceAll("\\{format\\}","json")
+    String localVarPath = "/pet/{petId}?response&#x3D;inline_arbitrary_object".replaceAll("\\{format\\}","json")
       .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
 
     List<Pair> localVarQueryParams = new ArrayList<Pair>();
@@ -712,7 +705,7 @@ public class PetApi {
       });
     }
 
-    String[] localVarAuthNames = new String[] { "petstore_auth", "api_key" };
+    String[] localVarAuthNames = new String[] { "api_key", "petstore_auth" };
     return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
   }
 
@@ -775,7 +768,6 @@ public class PetApi {
     apiClient.executeAsync(call, localVarReturnType, callback);
     return call;
   }
-  
   /* Build call for petPetIdtestingByteArraytrueGet */
   private Call petPetIdtestingByteArraytrueGetCall(Long petId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -787,7 +779,7 @@ public class PetApi {
     
 
     // create path and map variables
-    String localVarPath = "/pet/{petId}?testing_byte_array=true".replaceAll("\\{format\\}","json")
+    String localVarPath = "/pet/{petId}?testing_byte_array&#x3D;true".replaceAll("\\{format\\}","json")
       .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
 
     List<Pair> localVarQueryParams = new ArrayList<Pair>();
@@ -820,7 +812,7 @@ public class PetApi {
       });
     }
 
-    String[] localVarAuthNames = new String[] { "petstore_auth", "api_key" };
+    String[] localVarAuthNames = new String[] { "api_key", "petstore_auth" };
     return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
   }
 
@@ -883,7 +875,6 @@ public class PetApi {
     apiClient.executeAsync(call, localVarReturnType, callback);
     return call;
   }
-  
   /* Build call for updatePet */
   private Call updatePetCall(Pet body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = body;
@@ -981,7 +972,6 @@ public class PetApi {
     apiClient.executeAsync(call, callback);
     return call;
   }
-  
   /* Build call for updatePetWithForm */
   private Call updatePetWithFormCall(String petId, String name, String status, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -1095,7 +1085,6 @@ public class PetApi {
     apiClient.executeAsync(call, callback);
     return call;
   }
-  
   /* Build call for uploadFile */
   private Call uploadFileCall(Long petId, String additionalMetadata, File file, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -1209,5 +1198,4 @@ public class PetApi {
     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
index 086db3000d8..4d803d3b575 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/StoreApi.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/StoreApi.java
@@ -44,7 +44,6 @@ public class StoreApi {
     this.apiClient = apiClient;
   }
 
-  
   /* Build call for deleteOrder */
   private Call deleteOrderCall(String orderId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -148,7 +147,6 @@ public class StoreApi {
     apiClient.executeAsync(call, callback);
     return call;
   }
-  
   /* Build call for findOrdersByStatus */
   private Call findOrdersByStatusCall(String status, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -252,7 +250,6 @@ public class StoreApi {
     apiClient.executeAsync(call, localVarReturnType, callback);
     return call;
   }
-  
   /* Build call for getInventory */
   private Call getInventoryCall(final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -351,14 +348,13 @@ public class StoreApi {
     apiClient.executeAsync(call, localVarReturnType, callback);
     return call;
   }
-  
   /* Build call for getInventoryInObject */
   private Call getInventoryInObjectCall(final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
     
 
     // create path and map variables
-    String localVarPath = "/store/inventory?response=arbitrary_object".replaceAll("\\{format\\}","json");
+    String localVarPath = "/store/inventory?response&#x3D;arbitrary_object".replaceAll("\\{format\\}","json");
 
     List<Pair> localVarQueryParams = new ArrayList<Pair>();
 
@@ -450,7 +446,6 @@ public class StoreApi {
     apiClient.executeAsync(call, localVarReturnType, callback);
     return call;
   }
-  
   /* Build call for getOrderById */
   private Call getOrderByIdCall(String orderId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -495,13 +490,13 @@ public class StoreApi {
       });
     }
 
-    String[] localVarAuthNames = new String[] { "test_api_key_query", "test_api_key_header" };
+    String[] localVarAuthNames = new String[] { "test_api_key_header", "test_api_key_query" };
     return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
   }
 
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+   * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return Order
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
@@ -513,7 +508,7 @@ public class StoreApi {
 
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+   * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return ApiResponse<Order>
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
@@ -526,7 +521,7 @@ public class StoreApi {
 
   /**
    * Find purchase order by ID (asynchronously)
-   * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+   * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @param callback The callback to be executed when the API call finishes
    * @return The request call
@@ -558,7 +553,6 @@ public class StoreApi {
     apiClient.executeAsync(call, localVarReturnType, callback);
     return call;
   }
-  
   /* Build call for placeOrder */
   private Call placeOrderCall(Order body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = body;
@@ -660,5 +654,4 @@ public class StoreApi {
     apiClient.executeAsync(call, localVarReturnType, callback);
     return call;
   }
-  
 }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/UserApi.java
index 6da2483722b..5126228e323 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/UserApi.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/UserApi.java
@@ -44,7 +44,6 @@ public class UserApi {
     this.apiClient = apiClient;
   }
 
-  
   /* Build call for createUser */
   private Call createUserCall(User body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = body;
@@ -142,7 +141,6 @@ public class UserApi {
     apiClient.executeAsync(call, callback);
     return call;
   }
-  
   /* Build call for createUsersWithArrayInput */
   private Call createUsersWithArrayInputCall(List<User> body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = body;
@@ -240,7 +238,6 @@ public class UserApi {
     apiClient.executeAsync(call, callback);
     return call;
   }
-  
   /* Build call for createUsersWithListInput */
   private Call createUsersWithListInputCall(List<User> body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = body;
@@ -338,7 +335,6 @@ public class UserApi {
     apiClient.executeAsync(call, callback);
     return call;
   }
-  
   /* Build call for deleteUser */
   private Call deleteUserCall(String username, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -442,7 +438,6 @@ public class UserApi {
     apiClient.executeAsync(call, callback);
     return call;
   }
-  
   /* Build call for getUserByName */
   private Call getUserByNameCall(String username, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -494,7 +489,7 @@ public class UserApi {
   /**
    * Get user by user name
    * 
-   * @param username The name that needs to be fetched. Use user1 for testing. (required)
+   * @param username The name that needs to be fetched. Use user1 for testing.  (required)
    * @return User
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
@@ -506,7 +501,7 @@ public class UserApi {
   /**
    * Get user by user name
    * 
-   * @param username The name that needs to be fetched. Use user1 for testing. (required)
+   * @param username The name that needs to be fetched. Use user1 for testing.  (required)
    * @return ApiResponse<User>
    * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
    */
@@ -519,7 +514,7 @@ public class UserApi {
   /**
    * Get user by user name (asynchronously)
    * 
-   * @param username The name that needs to be fetched. Use user1 for testing. (required)
+   * @param username The name that needs to be fetched. Use user1 for testing.  (required)
    * @param callback The callback to be executed when the API call finishes
    * @return The request call
    * @throws ApiException If fail to process the API call, e.g. serializing the request body object
@@ -550,7 +545,6 @@ public class UserApi {
     apiClient.executeAsync(call, localVarReturnType, callback);
     return call;
   }
-  
   /* Build call for loginUser */
   private Call loginUserCall(String username, String password, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -659,7 +653,6 @@ public class UserApi {
     apiClient.executeAsync(call, localVarReturnType, callback);
     return call;
   }
-  
   /* Build call for logoutUser */
   private Call logoutUserCall(final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = null;
@@ -754,7 +747,6 @@ public class UserApi {
     apiClient.executeAsync(call, callback);
     return call;
   }
-  
   /* Build call for updateUser */
   private Call updateUserCall(String username, User body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
     Object localVarPostBody = body;
@@ -861,5 +853,4 @@ public class UserApi {
     apiClient.executeAsync(call, callback);
     return call;
   }
-  
 }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
index 491c9ec75b8..526c1163672 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
@@ -5,7 +5,7 @@ import io.swagger.client.Pair;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:51.831+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:34.419+02:00")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java
index 03e1e10cce1..a109275004e 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java
@@ -5,7 +5,7 @@ import io.swagger.client.Pair;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:51.831+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:34.419+02:00")
 public class OAuth implements Authentication {
   private String accessToken;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Animal.java
new file mode 100644
index 00000000000..87997d9de3f
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Animal.java
@@ -0,0 +1,66 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class Animal   {
+  
+  @SerializedName("className")
+  private String className = null;
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Animal animal = (Animal) o;
+    return Objects.equals(this.className, animal.className);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Animal {\n");
+    
+    sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Cat.java
new file mode 100644
index 00000000000..45a322f7d9b
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Cat.java
@@ -0,0 +1,83 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.client.model.Animal;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class Cat extends Animal  {
+  
+  @SerializedName("className")
+  private String className = null;
+
+  @SerializedName("declawed")
+  private Boolean declawed = null;
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Boolean getDeclawed() {
+    return declawed;
+  }
+  public void setDeclawed(Boolean declawed) {
+    this.declawed = declawed;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Cat cat = (Cat) o;
+    return Objects.equals(this.className, cat.className) &&
+        Objects.equals(this.declawed, cat.declawed) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className, declawed, super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Cat {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Category.java
index 5aa82b23415..61151088a7d 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Category.java
@@ -14,12 +14,10 @@ public class Category   {
   
   @SerializedName("id")
   private Long id = null;
-  
+
   @SerializedName("name")
   private String name = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -30,7 +28,6 @@ public class Category   {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -41,7 +38,6 @@ public class Category   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Dog.java
new file mode 100644
index 00000000000..aa1bde7d22a
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Dog.java
@@ -0,0 +1,83 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.client.model.Animal;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class Dog extends Animal  {
+  
+  @SerializedName("className")
+  private String className = null;
+
+  @SerializedName("breed")
+  private String breed = null;
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getBreed() {
+    return breed;
+  }
+  public void setBreed(String breed) {
+    this.breed = breed;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Dog dog = (Dog) o;
+    return Objects.equals(this.className, dog.className) &&
+        Objects.equals(this.breed, dog.breed) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className, breed, super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Dog {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/FormatTest.java
new file mode 100644
index 00000000000..1b9100afbb0
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/FormatTest.java
@@ -0,0 +1,233 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class FormatTest   {
+  
+  @SerializedName("integer")
+  private Integer integer = null;
+
+  @SerializedName("int32")
+  private Integer int32 = null;
+
+  @SerializedName("int64")
+  private Long int64 = null;
+
+  @SerializedName("number")
+  private BigDecimal number = null;
+
+  @SerializedName("float")
+  private Float _float = null;
+
+  @SerializedName("double")
+  private Double _double = null;
+
+  @SerializedName("string")
+  private String string = null;
+
+  @SerializedName("byte")
+  private byte[] _byte = null;
+
+  @SerializedName("binary")
+  private byte[] binary = null;
+
+  @SerializedName("date")
+  private Date date = null;
+
+  @SerializedName("dateTime")
+  private Date dateTime = null;
+
+  @SerializedName("password")
+  private String password = null;
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getInteger() {
+    return integer;
+  }
+  public void setInteger(Integer integer) {
+    this.integer = integer;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getInt32() {
+    return int32;
+  }
+  public void setInt32(Integer int32) {
+    this.int32 = int32;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Long getInt64() {
+    return int64;
+  }
+  public void setInt64(Long int64) {
+    this.int64 = int64;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public BigDecimal getNumber() {
+    return number;
+  }
+  public void setNumber(BigDecimal number) {
+    this.number = number;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Float getFloat() {
+    return _float;
+  }
+  public void setFloat(Float _float) {
+    this._float = _float;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Double getDouble() {
+    return _double;
+  }
+  public void setDouble(Double _double) {
+    this._double = _double;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getString() {
+    return string;
+  }
+  public void setString(String string) {
+    this.string = string;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public byte[] getByte() {
+    return _byte;
+  }
+  public void setByte(byte[] _byte) {
+    this._byte = _byte;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public byte[] getBinary() {
+    return binary;
+  }
+  public void setBinary(byte[] binary) {
+    this.binary = binary;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Date getDate() {
+    return date;
+  }
+  public void setDate(Date date) {
+    this.date = date;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Date getDateTime() {
+    return dateTime;
+  }
+  public void setDateTime(Date dateTime) {
+    this.dateTime = dateTime;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getPassword() {
+    return password;
+  }
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FormatTest formatTest = (FormatTest) o;
+    return Objects.equals(this.integer, formatTest.integer) &&
+        Objects.equals(this.int32, formatTest.int32) &&
+        Objects.equals(this.int64, formatTest.int64) &&
+        Objects.equals(this.number, formatTest.number) &&
+        Objects.equals(this._float, formatTest._float) &&
+        Objects.equals(this._double, formatTest._double) &&
+        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._byte, formatTest._byte) &&
+        Objects.equals(this.binary, formatTest.binary) &&
+        Objects.equals(this.date, formatTest.date) &&
+        Objects.equals(this.dateTime, formatTest.dateTime) &&
+        Objects.equals(this.password, formatTest.password);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, password);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FormatTest {\n");
+    
+    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
+    sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
+    sb.append("    number: ").append(toIndentedString(number)).append("\n");
+    sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
+    sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
+    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
+    sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
+    sb.append("    date: ").append(toIndentedString(date)).append("\n");
+    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
+    sb.append("    password: ").append(toIndentedString(password)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/InlineResponse200.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/InlineResponse200.java
index 41d02b8a23f..15bb92523fe 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/InlineResponse200.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/InlineResponse200.java
@@ -15,21 +15,15 @@ import com.google.gson.annotations.SerializedName;
 
 public class InlineResponse200   {
   
-  @SerializedName("photoUrls")
-  private List<String> photoUrls = new ArrayList<String>();
-  
-  @SerializedName("name")
-  private String name = null;
-  
-  @SerializedName("id")
-  private Long id = null;
-  
-  @SerializedName("category")
-  private Object category = null;
-  
   @SerializedName("tags")
   private List<Tag> tags = new ArrayList<Tag>();
-  
+
+  @SerializedName("id")
+  private Long id = null;
+
+  @SerializedName("category")
+  private Object category = null;
+
 
 public enum StatusEnum {
   @SerializedName("available")
@@ -55,53 +49,13 @@ public enum StatusEnum {
 
   @SerializedName("status")
   private StatusEnum status = null;
-  
 
-  
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public List<String> getPhotoUrls() {
-    return photoUrls;
-  }
-  public void setPhotoUrls(List<String> photoUrls) {
-    this.photoUrls = photoUrls;
-  }
+  @SerializedName("name")
+  private String name = null;
 
-  
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public String getName() {
-    return name;
-  }
-  public void setName(String name) {
-    this.name = name;
-  }
+  @SerializedName("photoUrls")
+  private List<String> photoUrls = new ArrayList<String>();
 
-  
-  /**
-   **/
-  @ApiModelProperty(required = true, value = "")
-  public Long getId() {
-    return id;
-  }
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public Object getCategory() {
-    return category;
-  }
-  public void setCategory(Object category) {
-    this.category = category;
-  }
-
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -112,7 +66,26 @@ public enum StatusEnum {
     this.tags = tags;
   }
 
-  
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Object getCategory() {
+    return category;
+  }
+  public void setCategory(Object category) {
+    this.category = category;
+  }
+
   /**
    * pet status in the store
    **/
@@ -124,7 +97,26 @@ public enum StatusEnum {
     this.status = status;
   }
 
-  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<String> getPhotoUrls() {
+    return photoUrls;
+  }
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -135,17 +127,17 @@ public enum StatusEnum {
       return false;
     }
     InlineResponse200 inlineResponse200 = (InlineResponse200) o;
-    return Objects.equals(this.photoUrls, inlineResponse200.photoUrls) &&
-        Objects.equals(this.name, inlineResponse200.name) &&
+    return Objects.equals(this.tags, inlineResponse200.tags) &&
         Objects.equals(this.id, inlineResponse200.id) &&
         Objects.equals(this.category, inlineResponse200.category) &&
-        Objects.equals(this.tags, inlineResponse200.tags) &&
-        Objects.equals(this.status, inlineResponse200.status);
+        Objects.equals(this.status, inlineResponse200.status) &&
+        Objects.equals(this.name, inlineResponse200.name) &&
+        Objects.equals(this.photoUrls, inlineResponse200.photoUrls);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(photoUrls, name, id, category, tags, status);
+    return Objects.hash(tags, id, category, status, name, photoUrls);
   }
 
   @Override
@@ -153,12 +145,12 @@ public enum StatusEnum {
     StringBuilder sb = new StringBuilder();
     sb.append("class InlineResponse200 {\n");
     
-    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Model200Response.java
index 3afae36dbfe..ca0c5871388 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Model200Response.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Model200Response.java
@@ -9,14 +9,15 @@ import com.google.gson.annotations.SerializedName;
 
 
 
-
+/**
+ * Model for testing model name starting with number
+ **/
+@ApiModel(description = "Model for testing model name starting with number")
 public class Model200Response   {
   
   @SerializedName("name")
   private Integer name = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -27,7 +28,6 @@ public class Model200Response   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelReturn.java
index 60da9b8e181..071c5e7de14 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -9,14 +9,15 @@ import com.google.gson.annotations.SerializedName;
 
 
 
-
+/**
+ * Model for testing reserved words
+ **/
+@ApiModel(description = "Model for testing reserved words")
 public class ModelReturn   {
   
   @SerializedName("return")
   private Integer _return = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -27,7 +28,6 @@ public class ModelReturn   {
     this._return = _return;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Name.java
index a65b8fda614..cb65d370816 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Name.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Name.java
@@ -9,17 +9,21 @@ import com.google.gson.annotations.SerializedName;
 
 
 
-
+/**
+ * Model for testing model name same as property name
+ **/
+@ApiModel(description = "Model for testing model name same as property name")
 public class Name   {
   
   @SerializedName("name")
   private Integer name = null;
-  
 
-  
+  @SerializedName("snake_case")
+  private Integer snakeCase = null;
+
   /**
    **/
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
   }
@@ -27,7 +31,13 @@ public class Name   {
     this.name = name;
   }
 
-  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getSnakeCase() {
+    return snakeCase;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -38,12 +48,13 @@ public class Name   {
       return false;
     }
     Name name = (Name) o;
-    return Objects.equals(this.name, name.name);
+    return Objects.equals(this.name, name.name) &&
+        Objects.equals(this.snakeCase, name.snakeCase);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(name);
+    return Objects.hash(name, snakeCase);
   }
 
   @Override
@@ -52,6 +63,7 @@ public class Name   {
     sb.append("class Name {\n");
     
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Order.java
index 31097ea438d..cc13fe4bfd0 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Order.java
@@ -15,16 +15,16 @@ 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")
@@ -50,12 +50,10 @@ public enum StatusEnum {
 
   @SerializedName("status")
   private StatusEnum status = null;
-  
+
   @SerializedName("complete")
   private Boolean complete = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -63,7 +61,6 @@ public enum StatusEnum {
     return id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -74,7 +71,6 @@ public enum StatusEnum {
     this.petId = petId;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -85,7 +81,6 @@ public enum StatusEnum {
     this.quantity = quantity;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -96,7 +91,6 @@ public enum StatusEnum {
     this.shipDate = shipDate;
   }
 
-  
   /**
    * Order Status
    **/
@@ -108,7 +102,6 @@ public enum StatusEnum {
     this.status = status;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -119,7 +112,6 @@ public enum StatusEnum {
     this.complete = complete;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Pet.java
index 7895e23ba13..fe1f0a34aa3 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Pet.java
@@ -18,19 +18,19 @@ 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")
@@ -56,9 +56,7 @@ public enum StatusEnum {
 
   @SerializedName("status")
   private StatusEnum status = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -69,7 +67,6 @@ public enum StatusEnum {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -80,7 +77,6 @@ public enum StatusEnum {
     this.category = category;
   }
 
-  
   /**
    **/
   @ApiModelProperty(required = true, value = "")
@@ -91,7 +87,6 @@ public enum StatusEnum {
     this.name = name;
   }
 
-  
   /**
    **/
   @ApiModelProperty(required = true, value = "")
@@ -102,7 +97,6 @@ public enum StatusEnum {
     this.photoUrls = photoUrls;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -113,7 +107,6 @@ public enum StatusEnum {
     this.tags = tags;
   }
 
-  
   /**
    * pet status in the store
    **/
@@ -125,7 +118,6 @@ public enum StatusEnum {
     this.status = status;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/SpecialModelName.java
index 9a0c166186c..1f9bc95113e 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -14,9 +14,7 @@ public class SpecialModelName   {
   
   @SerializedName("$special[property.name]")
   private Long specialPropertyName = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -27,7 +25,6 @@ public class SpecialModelName   {
     this.specialPropertyName = specialPropertyName;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Tag.java
index f5a148ecc36..d605f019569 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Tag.java
@@ -14,12 +14,10 @@ public class Tag   {
   
   @SerializedName("id")
   private Long id = null;
-  
+
   @SerializedName("name")
   private String name = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -30,7 +28,6 @@ public class Tag   {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -41,7 +38,6 @@ public class Tag   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/User.java
index 9b71b457d15..a9f6b63a2f4 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/User.java
@@ -14,30 +14,28 @@ 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 = "")
@@ -48,7 +46,6 @@ public class User   {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -59,7 +56,6 @@ public class User   {
     this.username = username;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -70,7 +66,6 @@ public class User   {
     this.firstName = firstName;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -81,7 +76,6 @@ public class User   {
     this.lastName = lastName;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -92,7 +86,6 @@ public class User   {
     this.email = email;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -103,7 +96,6 @@ public class User   {
     this.password = password;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -114,7 +106,6 @@ public class User   {
     this.phone = phone;
   }
 
-  
   /**
    * User Status
    **/
@@ -126,7 +117,6 @@ public class User   {
     this.userStatus = userStatus;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
diff --git a/samples/client/petstore/java/retrofit/build.gradle b/samples/client/petstore/java/retrofit/build.gradle
index 255a76e0403..7d0d52536eb 100644
--- a/samples/client/petstore/java/retrofit/build.gradle
+++ b/samples/client/petstore/java/retrofit/build.gradle
@@ -1,3 +1,6 @@
+apply plugin: 'idea'
+apply plugin: 'eclipse'
+
 group = 'io.swagger'
 version = '1.0.0'
 
@@ -6,8 +9,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
@@ -22,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'com.github.dcendents.android-maven'
     
     android {
-        compileSdkVersion 22
-        buildToolsVersion '22.0.0'
+        compileSdkVersion 23
+        buildToolsVersion '23.0.2'
         defaultConfig {
             minSdkVersion 14
-            targetSdkVersion 22
+            targetSdkVersion 23
         }
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/StringUtil.java
index 0eec085e2a4..1ce483dd74c 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/StringUtil.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/StringUtil.java
@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:53.252+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:35.471+02:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java
index 92147932bac..af2482b371f 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java
@@ -10,17 +10,12 @@ import io.swagger.client.model.Pet;
 import io.swagger.client.model.InlineResponse200;
 import java.io.File;
 
-
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
-
 public interface PetApi {
-  
   /**
    * Add a new pet to the store
    * Sync method
@@ -46,7 +41,6 @@ public interface PetApi {
   void addPet(
     @Body Pet body, Callback<Void> cb
   );
-  
   /**
    * Fake endpoint to test byte array in body parameter for adding a new pet to the store
    * Sync method
@@ -55,7 +49,7 @@ public interface PetApi {
    * @return Void
    */
   
-  @POST("/pet?testing_byte_array=true")
+  @POST("/pet?testing_byte_array&#x3D;true")
   Void addPetUsingByteArray(
     @Body byte[] body
   );
@@ -68,11 +62,10 @@ public interface PetApi {
    * @return void
    */
   
-  @POST("/pet?testing_byte_array=true")
+  @POST("/pet?testing_byte_array&#x3D;true")
   void addPetUsingByteArray(
     @Body byte[] body, Callback<Void> cb
   );
-  
   /**
    * Deletes a pet
    * Sync method
@@ -100,7 +93,6 @@ public interface PetApi {
   void deletePet(
     @Path("petId") Long petId, @Header("api_key") String apiKey, Callback<Void> cb
   );
-  
   /**
    * Finds Pets by status
    * Sync method
@@ -126,7 +118,6 @@ public interface PetApi {
   void findPetsByStatus(
     @Query("status") List<String> status, Callback<List<Pet>> cb
   );
-  
   /**
    * Finds Pets by tags
    * Sync method
@@ -152,7 +143,6 @@ public interface PetApi {
   void findPetsByTags(
     @Query("tags") List<String> tags, Callback<List<Pet>> cb
   );
-  
   /**
    * Find pet by ID
    * Sync method
@@ -178,7 +168,6 @@ public interface PetApi {
   void getPetById(
     @Path("petId") Long petId, Callback<Pet> cb
   );
-  
   /**
    * Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
    * Sync method
@@ -187,7 +176,7 @@ public interface PetApi {
    * @return InlineResponse200
    */
   
-  @GET("/pet/{petId}?response=inline_arbitrary_object")
+  @GET("/pet/{petId}?response&#x3D;inline_arbitrary_object")
   InlineResponse200 getPetByIdInObject(
     @Path("petId") Long petId
   );
@@ -200,11 +189,10 @@ public interface PetApi {
    * @return void
    */
   
-  @GET("/pet/{petId}?response=inline_arbitrary_object")
+  @GET("/pet/{petId}?response&#x3D;inline_arbitrary_object")
   void getPetByIdInObject(
     @Path("petId") Long petId, Callback<InlineResponse200> cb
   );
-  
   /**
    * Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
    * Sync method
@@ -213,7 +201,7 @@ public interface PetApi {
    * @return byte[]
    */
   
-  @GET("/pet/{petId}?testing_byte_array=true")
+  @GET("/pet/{petId}?testing_byte_array&#x3D;true")
   byte[] petPetIdtestingByteArraytrueGet(
     @Path("petId") Long petId
   );
@@ -226,11 +214,10 @@ public interface PetApi {
    * @return void
    */
   
-  @GET("/pet/{petId}?testing_byte_array=true")
+  @GET("/pet/{petId}?testing_byte_array&#x3D;true")
   void petPetIdtestingByteArraytrueGet(
     @Path("petId") Long petId, Callback<byte[]> cb
   );
-  
   /**
    * Update an existing pet
    * Sync method
@@ -256,7 +243,6 @@ public interface PetApi {
   void updatePet(
     @Body Pet body, Callback<Void> cb
   );
-  
   /**
    * Updates a pet in the store with form data
    * Sync method
@@ -288,7 +274,6 @@ public interface PetApi {
   void updatePetWithForm(
     @Path("petId") String petId, @Field("name") String name, @Field("status") String status, Callback<Void> cb
   );
-  
   /**
    * uploads an image
    * Sync method
@@ -320,6 +305,4 @@ public interface PetApi {
   void uploadFile(
     @Path("petId") Long petId, @Part("additionalMetadata") String additionalMetadata, @Part("file") TypedFile file, Callback<Void> cb
   );
-  
 }
-
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/StoreApi.java
index 815d067c967..ede732a986b 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/StoreApi.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/StoreApi.java
@@ -8,17 +8,12 @@ import retrofit.mime.*;
 
 import io.swagger.client.model.Order;
 
-
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
-
 public interface StoreApi {
-  
   /**
    * Delete purchase order by ID
    * Sync method
@@ -44,7 +39,6 @@ public interface StoreApi {
   void deleteOrder(
     @Path("orderId") String orderId, Callback<Void> cb
   );
-  
   /**
    * Finds orders by status
    * Sync method
@@ -70,7 +64,6 @@ public interface StoreApi {
   void findOrdersByStatus(
     @Query("status") String status, Callback<List<Order>> cb
   );
-  
   /**
    * Returns pet inventories by status
    * Sync method
@@ -93,7 +86,6 @@ public interface StoreApi {
   void getInventory(
     Callback<Map<String, Integer>> cb
   );
-  
   /**
    * Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
    * Sync method
@@ -101,7 +93,7 @@ public interface StoreApi {
    * @return Object
    */
   
-  @GET("/store/inventory?response=arbitrary_object")
+  @GET("/store/inventory?response&#x3D;arbitrary_object")
   Object getInventoryInObject();
     
 
@@ -112,15 +104,14 @@ public interface StoreApi {
    * @return void
    */
   
-  @GET("/store/inventory?response=arbitrary_object")
+  @GET("/store/inventory?response&#x3D;arbitrary_object")
   void getInventoryInObject(
     Callback<Object> cb
   );
-  
   /**
    * Find purchase order by ID
    * Sync method
-   * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+   * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return Order
    */
@@ -142,7 +133,6 @@ public interface StoreApi {
   void getOrderById(
     @Path("orderId") String orderId, Callback<Order> cb
   );
-  
   /**
    * Place an order for a pet
    * Sync method
@@ -168,6 +158,4 @@ public interface StoreApi {
   void placeOrder(
     @Body Order body, Callback<Order> cb
   );
-  
 }
-
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/UserApi.java
index a0d913e071f..ea7285de79c 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/UserApi.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/UserApi.java
@@ -8,17 +8,12 @@ import retrofit.mime.*;
 
 import io.swagger.client.model.User;
 
-
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
-
 public interface UserApi {
-  
   /**
    * Create user
    * Sync method
@@ -44,7 +39,6 @@ public interface UserApi {
   void createUser(
     @Body User body, Callback<Void> cb
   );
-  
   /**
    * Creates list of users with given input array
    * Sync method
@@ -70,7 +64,6 @@ public interface UserApi {
   void createUsersWithArrayInput(
     @Body List<User> body, Callback<Void> cb
   );
-  
   /**
    * Creates list of users with given input array
    * Sync method
@@ -96,7 +89,6 @@ public interface UserApi {
   void createUsersWithListInput(
     @Body List<User> body, Callback<Void> cb
   );
-  
   /**
    * Delete user
    * Sync method
@@ -122,12 +114,11 @@ public interface UserApi {
   void deleteUser(
     @Path("username") String username, Callback<Void> cb
   );
-  
   /**
    * Get user by user name
    * Sync method
    * 
-   * @param username The name that needs to be fetched. Use user1 for testing. (required)
+   * @param username The name that needs to be fetched. Use user1 for testing.  (required)
    * @return User
    */
   
@@ -139,7 +130,7 @@ public interface UserApi {
   /**
    * Get user by user name
    * Async method
-   * @param username The name that needs to be fetched. Use user1 for testing. (required)
+   * @param username The name that needs to be fetched. Use user1 for testing.  (required)
    * @param cb callback method
    * @return void
    */
@@ -148,7 +139,6 @@ public interface UserApi {
   void getUserByName(
     @Path("username") String username, Callback<User> cb
   );
-  
   /**
    * Logs user into the system
    * Sync method
@@ -176,7 +166,6 @@ public interface UserApi {
   void loginUser(
     @Query("username") String username, @Query("password") String password, Callback<String> cb
   );
-  
   /**
    * Logs out current logged in user session
    * Sync method
@@ -199,7 +188,6 @@ public interface UserApi {
   void logoutUser(
     Callback<Void> cb
   );
-  
   /**
    * Updated user
    * Sync method
@@ -227,6 +215,4 @@ public interface UserApi {
   void updateUser(
     @Path("username") String username, @Body User body, Callback<Void> cb
   );
-  
 }
-
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Animal.java
new file mode 100644
index 00000000000..8df24899fb0
--- /dev/null
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Animal.java
@@ -0,0 +1,66 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class Animal   {
+  
+  @SerializedName("className")
+  private String className = null;
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Animal animal = (Animal) o;
+    return Objects.equals(className, animal.className);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Animal {\n");
+    
+    sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Cat.java
new file mode 100644
index 00000000000..60a99ed86da
--- /dev/null
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Cat.java
@@ -0,0 +1,82 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.client.model.Animal;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class Cat extends Animal  {
+  
+  @SerializedName("className")
+  private String className = null;
+
+  @SerializedName("declawed")
+  private Boolean declawed = null;
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Boolean getDeclawed() {
+    return declawed;
+  }
+  public void setDeclawed(Boolean declawed) {
+    this.declawed = declawed;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Cat cat = (Cat) o;
+    return Objects.equals(className, cat.className) &&
+        Objects.equals(declawed, cat.declawed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className, declawed);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Cat {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Category.java
index 67de63eb179..93ec7bd0877 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Category.java
@@ -4,24 +4,20 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
 
-
 public class Category   {
   
   @SerializedName("id")
   private Long id = null;
-  
+
   @SerializedName("name")
   private String name = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -32,7 +28,6 @@ public class Category   {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -43,7 +38,6 @@ public class Category   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
@@ -85,5 +79,3 @@ public class Category   {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Dog.java
new file mode 100644
index 00000000000..1c31fc93746
--- /dev/null
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Dog.java
@@ -0,0 +1,82 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.client.model.Animal;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class Dog extends Animal  {
+  
+  @SerializedName("className")
+  private String className = null;
+
+  @SerializedName("breed")
+  private String breed = null;
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getBreed() {
+    return breed;
+  }
+  public void setBreed(String breed) {
+    this.breed = breed;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Dog dog = (Dog) o;
+    return Objects.equals(className, dog.className) &&
+        Objects.equals(breed, dog.breed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className, breed);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Dog {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/FormatTest.java
new file mode 100644
index 00000000000..29d17bbdfe7
--- /dev/null
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/FormatTest.java
@@ -0,0 +1,233 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class FormatTest   {
+  
+  @SerializedName("integer")
+  private Integer integer = null;
+
+  @SerializedName("int32")
+  private Integer int32 = null;
+
+  @SerializedName("int64")
+  private Long int64 = null;
+
+  @SerializedName("number")
+  private BigDecimal number = null;
+
+  @SerializedName("float")
+  private Float _float = null;
+
+  @SerializedName("double")
+  private Double _double = null;
+
+  @SerializedName("string")
+  private String string = null;
+
+  @SerializedName("byte")
+  private byte[] _byte = null;
+
+  @SerializedName("binary")
+  private byte[] binary = null;
+
+  @SerializedName("date")
+  private Date date = null;
+
+  @SerializedName("dateTime")
+  private Date dateTime = null;
+
+  @SerializedName("password")
+  private String password = null;
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getInteger() {
+    return integer;
+  }
+  public void setInteger(Integer integer) {
+    this.integer = integer;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getInt32() {
+    return int32;
+  }
+  public void setInt32(Integer int32) {
+    this.int32 = int32;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Long getInt64() {
+    return int64;
+  }
+  public void setInt64(Long int64) {
+    this.int64 = int64;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public BigDecimal getNumber() {
+    return number;
+  }
+  public void setNumber(BigDecimal number) {
+    this.number = number;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Float getFloat() {
+    return _float;
+  }
+  public void setFloat(Float _float) {
+    this._float = _float;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Double getDouble() {
+    return _double;
+  }
+  public void setDouble(Double _double) {
+    this._double = _double;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getString() {
+    return string;
+  }
+  public void setString(String string) {
+    this.string = string;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public byte[] getByte() {
+    return _byte;
+  }
+  public void setByte(byte[] _byte) {
+    this._byte = _byte;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public byte[] getBinary() {
+    return binary;
+  }
+  public void setBinary(byte[] binary) {
+    this.binary = binary;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Date getDate() {
+    return date;
+  }
+  public void setDate(Date date) {
+    this.date = date;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Date getDateTime() {
+    return dateTime;
+  }
+  public void setDateTime(Date dateTime) {
+    this.dateTime = dateTime;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getPassword() {
+    return password;
+  }
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FormatTest formatTest = (FormatTest) o;
+    return Objects.equals(integer, formatTest.integer) &&
+        Objects.equals(int32, formatTest.int32) &&
+        Objects.equals(int64, formatTest.int64) &&
+        Objects.equals(number, formatTest.number) &&
+        Objects.equals(_float, formatTest._float) &&
+        Objects.equals(_double, formatTest._double) &&
+        Objects.equals(string, formatTest.string) &&
+        Objects.equals(_byte, formatTest._byte) &&
+        Objects.equals(binary, formatTest.binary) &&
+        Objects.equals(date, formatTest.date) &&
+        Objects.equals(dateTime, formatTest.dateTime) &&
+        Objects.equals(password, formatTest.password);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, password);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FormatTest {\n");
+    
+    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
+    sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
+    sb.append("    number: ").append(toIndentedString(number)).append("\n");
+    sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
+    sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
+    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
+    sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
+    sb.append("    date: ").append(toIndentedString(date)).append("\n");
+    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
+    sb.append("    password: ").append(toIndentedString(password)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/InlineResponse200.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/InlineResponse200.java
index 165f069a05b..b17bf005009 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/InlineResponse200.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/InlineResponse200.java
@@ -7,31 +7,23 @@ import io.swagger.client.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
 
-
 public class InlineResponse200   {
   
-  @SerializedName("photoUrls")
-  private List<String> photoUrls = new ArrayList<String>();
-  
-  @SerializedName("name")
-  private String name = null;
-  
-  @SerializedName("id")
-  private Long id = null;
-  
-  @SerializedName("category")
-  private Object category = null;
-  
   @SerializedName("tags")
   private List<Tag> tags = new ArrayList<Tag>();
-  
+
+  @SerializedName("id")
+  private Long id = null;
+
+  @SerializedName("category")
+  private Object category = null;
+
 
 public enum StatusEnum {
   @SerializedName("available")
@@ -57,53 +49,13 @@ public enum StatusEnum {
 
   @SerializedName("status")
   private StatusEnum status = null;
-  
 
-  
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public List<String> getPhotoUrls() {
-    return photoUrls;
-  }
-  public void setPhotoUrls(List<String> photoUrls) {
-    this.photoUrls = photoUrls;
-  }
+  @SerializedName("name")
+  private String name = null;
 
-  
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public String getName() {
-    return name;
-  }
-  public void setName(String name) {
-    this.name = name;
-  }
+  @SerializedName("photoUrls")
+  private List<String> photoUrls = new ArrayList<String>();
 
-  
-  /**
-   **/
-  @ApiModelProperty(required = true, value = "")
-  public Long getId() {
-    return id;
-  }
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public Object getCategory() {
-    return category;
-  }
-  public void setCategory(Object category) {
-    this.category = category;
-  }
-
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -114,7 +66,26 @@ public enum StatusEnum {
     this.tags = tags;
   }
 
-  
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Object getCategory() {
+    return category;
+  }
+  public void setCategory(Object category) {
+    this.category = category;
+  }
+
   /**
    * pet status in the store
    **/
@@ -126,7 +97,26 @@ public enum StatusEnum {
     this.status = status;
   }
 
-  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<String> getPhotoUrls() {
+    return photoUrls;
+  }
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -137,17 +127,17 @@ public enum StatusEnum {
       return false;
     }
     InlineResponse200 inlineResponse200 = (InlineResponse200) o;
-    return Objects.equals(photoUrls, inlineResponse200.photoUrls) &&
-        Objects.equals(name, inlineResponse200.name) &&
+    return Objects.equals(tags, inlineResponse200.tags) &&
         Objects.equals(id, inlineResponse200.id) &&
         Objects.equals(category, inlineResponse200.category) &&
-        Objects.equals(tags, inlineResponse200.tags) &&
-        Objects.equals(status, inlineResponse200.status);
+        Objects.equals(status, inlineResponse200.status) &&
+        Objects.equals(name, inlineResponse200.name) &&
+        Objects.equals(photoUrls, inlineResponse200.photoUrls);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(photoUrls, name, id, category, tags, status);
+    return Objects.hash(tags, id, category, status, name, photoUrls);
   }
 
   @Override
@@ -155,12 +145,12 @@ public enum StatusEnum {
     StringBuilder sb = new StringBuilder();
     sb.append("class InlineResponse200 {\n");
     
-    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -176,5 +166,3 @@ public enum StatusEnum {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Model200Response.java
index 80b0aed92a8..3cbb15006fb 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Model200Response.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Model200Response.java
@@ -4,21 +4,20 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
-
-
+/**
+ * Model for testing model name starting with number
+ **/
+@ApiModel(description = "Model for testing model name starting with number")
 public class Model200Response   {
   
   @SerializedName("name")
   private Integer name = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -29,7 +28,6 @@ public class Model200Response   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
@@ -69,5 +67,3 @@ public class Model200Response   {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ModelReturn.java
index ce8c1238fdb..a3ecfb92156 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -4,21 +4,20 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
-
-
+/**
+ * Model for testing reserved words
+ **/
+@ApiModel(description = "Model for testing reserved words")
 public class ModelReturn   {
   
   @SerializedName("return")
   private Integer _return = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -29,7 +28,6 @@ public class ModelReturn   {
     this._return = _return;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
@@ -69,5 +67,3 @@ public class ModelReturn   {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Name.java
index 370214bd21c..fd90800298e 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Name.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Name.java
@@ -4,27 +4,26 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
-
-
+/**
+ * Model for testing model name same as property name
+ **/
+@ApiModel(description = "Model for testing model name same as property name")
 public class Name   {
   
   @SerializedName("name")
   private Integer name = null;
-  
+
   @SerializedName("snake_case")
   private Integer snakeCase = null;
-  
 
-  
   /**
    **/
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
   }
@@ -32,18 +31,13 @@ public class Name   {
     this.name = name;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
   }
-  public void setSnakeCase(Integer snakeCase) {
-    this.snakeCase = snakeCase;
-  }
 
-  
 
   @Override
   public boolean equals(Object o) {
@@ -85,5 +79,3 @@ public class Name   {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Order.java
index e601bd7a15a..f1fb2ad7409 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Order.java
@@ -5,28 +5,26 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
 
-
 public class Order   {
   
   @SerializedName("id")
   private Long id = null;
-  
+
   @SerializedName("petId")
   private Long petId = null;
-  
+
   @SerializedName("quantity")
   private Integer quantity = null;
-  
+
   @SerializedName("shipDate")
   private Date shipDate = null;
-  
+
 
 public enum StatusEnum {
   @SerializedName("placed")
@@ -52,12 +50,10 @@ public enum StatusEnum {
 
   @SerializedName("status")
   private StatusEnum status = null;
-  
+
   @SerializedName("complete")
   private Boolean complete = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -65,7 +61,6 @@ public enum StatusEnum {
     return id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -76,7 +71,6 @@ public enum StatusEnum {
     this.petId = petId;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -87,7 +81,6 @@ public enum StatusEnum {
     this.quantity = quantity;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -98,7 +91,6 @@ public enum StatusEnum {
     this.shipDate = shipDate;
   }
 
-  
   /**
    * Order Status
    **/
@@ -110,7 +102,6 @@ public enum StatusEnum {
     this.status = status;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -121,7 +112,6 @@ public enum StatusEnum {
     this.complete = complete;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
@@ -171,5 +161,3 @@ public enum StatusEnum {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Pet.java
index 5d1210dc55b..bcee581aa97 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Pet.java
@@ -8,31 +8,29 @@ import io.swagger.client.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
 
-
 public class Pet   {
   
   @SerializedName("id")
   private Long id = null;
-  
+
   @SerializedName("category")
   private Category category = null;
-  
+
   @SerializedName("name")
   private String name = null;
-  
+
   @SerializedName("photoUrls")
   private List<String> photoUrls = new ArrayList<String>();
-  
+
   @SerializedName("tags")
   private List<Tag> tags = new ArrayList<Tag>();
-  
+
 
 public enum StatusEnum {
   @SerializedName("available")
@@ -58,9 +56,7 @@ public enum StatusEnum {
 
   @SerializedName("status")
   private StatusEnum status = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -71,7 +67,6 @@ public enum StatusEnum {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -82,7 +77,6 @@ public enum StatusEnum {
     this.category = category;
   }
 
-  
   /**
    **/
   @ApiModelProperty(required = true, value = "")
@@ -93,7 +87,6 @@ public enum StatusEnum {
     this.name = name;
   }
 
-  
   /**
    **/
   @ApiModelProperty(required = true, value = "")
@@ -104,7 +97,6 @@ public enum StatusEnum {
     this.photoUrls = photoUrls;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -115,7 +107,6 @@ public enum StatusEnum {
     this.tags = tags;
   }
 
-  
   /**
    * pet status in the store
    **/
@@ -127,7 +118,6 @@ public enum StatusEnum {
     this.status = status;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
@@ -177,5 +167,3 @@ public enum StatusEnum {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/SpecialModelName.java
index b5a96d5fc39..e2354b064b2 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -4,21 +4,17 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
 
-
 public class SpecialModelName   {
   
   @SerializedName("$special[property.name]")
   private Long specialPropertyName = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -29,7 +25,6 @@ public class SpecialModelName   {
     this.specialPropertyName = specialPropertyName;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
@@ -69,5 +64,3 @@ public class SpecialModelName   {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Tag.java
index 6ee49ee2166..9c5ac6cf9a7 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Tag.java
@@ -4,24 +4,20 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
 
-
 public class Tag   {
   
   @SerializedName("id")
   private Long id = null;
-  
+
   @SerializedName("name")
   private String name = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -32,7 +28,6 @@ public class Tag   {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -43,7 +38,6 @@ public class Tag   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
@@ -85,5 +79,3 @@ public class Tag   {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/User.java
index 98196393ef1..39e40837a6a 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/User.java
@@ -4,42 +4,38 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
 
-
 public class User   {
   
   @SerializedName("id")
   private Long id = null;
-  
+
   @SerializedName("username")
   private String username = null;
-  
+
   @SerializedName("firstName")
   private String firstName = null;
-  
+
   @SerializedName("lastName")
   private String lastName = null;
-  
+
   @SerializedName("email")
   private String email = null;
-  
+
   @SerializedName("password")
   private String password = null;
-  
+
   @SerializedName("phone")
   private String phone = null;
-  
+
   @SerializedName("userStatus")
   private Integer userStatus = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -50,7 +46,6 @@ public class User   {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -61,7 +56,6 @@ public class User   {
     this.username = username;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -72,7 +66,6 @@ public class User   {
     this.firstName = firstName;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -83,7 +76,6 @@ public class User   {
     this.lastName = lastName;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -94,7 +86,6 @@ public class User   {
     this.email = email;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -105,7 +96,6 @@ public class User   {
     this.password = password;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -116,7 +106,6 @@ public class User   {
     this.phone = phone;
   }
 
-  
   /**
    * User Status
    **/
@@ -128,7 +117,6 @@ public class User   {
     this.userStatus = userStatus;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
@@ -182,5 +170,3 @@ public class User   {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/java/retrofit2/build.gradle b/samples/client/petstore/java/retrofit2/build.gradle
index ab71653f739..a893deaa2ae 100644
--- a/samples/client/petstore/java/retrofit2/build.gradle
+++ b/samples/client/petstore/java/retrofit2/build.gradle
@@ -9,8 +9,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
 	apply plugin: 'com.github.dcendents.android-maven'
 
 	android {
-	    compileSdkVersion 22
-	    buildToolsVersion '22.0.0'
+	    compileSdkVersion 23
+	    buildToolsVersion '23.0.2'
 	    defaultConfig {
 	        minSdkVersion 14
-	        targetSdkVersion 22
+	        targetSdkVersion 23
 	    }
 	    compileOptions {
 	        sourceCompatibility JavaVersion.VERSION_1_7
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java
index d7254df29fc..dace285deca 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java
@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-14T22:17:54.660+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:36:36.537+02:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java
index 2cc69238a6b..f56c7de3ddf 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java
@@ -12,17 +12,12 @@ import io.swagger.client.model.Pet;
 import io.swagger.client.model.InlineResponse200;
 import java.io.File;
 
-
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
-
 public interface PetApi {
-  
   /**
    * Add a new pet to the store
    * 
@@ -35,7 +30,6 @@ public interface PetApi {
     @Body Pet body
   );
 
-  
   /**
    * Fake endpoint to test byte array in body parameter for adding a new pet to the store
    * 
@@ -43,12 +37,11 @@ public interface PetApi {
    * @return Call<Void>
    */
   
-  @POST("pet?testing_byte_array=true")
+  @POST("pet?testing_byte_array&#x3D;true")
   Call<Void> addPetUsingByteArray(
     @Body byte[] body
   );
 
-  
   /**
    * Deletes a pet
    * 
@@ -62,7 +55,6 @@ public interface PetApi {
     @Path("petId") Long petId, @Header("api_key") String apiKey
   );
 
-  
   /**
    * Finds Pets by status
    * Multiple status values can be provided with comma separated strings
@@ -75,7 +67,6 @@ public interface PetApi {
     @Query("status") List<String> status
   );
 
-  
   /**
    * Finds Pets by tags
    * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
@@ -88,7 +79,6 @@ public interface PetApi {
     @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
@@ -101,7 +91,6 @@ public interface PetApi {
     @Path("petId") Long petId
   );
 
-  
   /**
    * Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
    * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
@@ -109,12 +98,11 @@ public interface PetApi {
    * @return Call<InlineResponse200>
    */
   
-  @GET("pet/{petId}?response=inline_arbitrary_object")
+  @GET("pet/{petId}?response&#x3D;inline_arbitrary_object")
   Call<InlineResponse200> getPetByIdInObject(
     @Path("petId") Long petId
   );
 
-  
   /**
    * Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
    * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
@@ -122,12 +110,11 @@ public interface PetApi {
    * @return Call<byte[]>
    */
   
-  @GET("pet/{petId}?testing_byte_array=true")
+  @GET("pet/{petId}?testing_byte_array&#x3D;true")
   Call<byte[]> petPetIdtestingByteArraytrueGet(
     @Path("petId") Long petId
   );
 
-  
   /**
    * Update an existing pet
    * 
@@ -140,7 +127,6 @@ public interface PetApi {
     @Body Pet body
   );
 
-  
   /**
    * Updates a pet in the store with form data
    * 
@@ -156,7 +142,6 @@ public interface PetApi {
     @Path("petId") String petId, @Field("name") String name, @Field("status") String status
   );
 
-  
   /**
    * uploads an image
    * 
@@ -172,6 +157,4 @@ public interface PetApi {
     @Path("petId") Long petId, @Part("additionalMetadata") String additionalMetadata, @Part("file\"; filename=\"file\"") RequestBody file
   );
 
-  
 }
-
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/StoreApi.java
index d023308c32e..55a3ea5b46a 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/StoreApi.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/StoreApi.java
@@ -10,17 +10,12 @@ import okhttp3.RequestBody;
 
 import io.swagger.client.model.Order;
 
-
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
-
 public interface StoreApi {
-  
   /**
    * Delete purchase order by ID
    * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
@@ -33,7 +28,6 @@ public interface StoreApi {
     @Path("orderId") String orderId
   );
 
-  
   /**
    * Finds orders by status
    * A single status value can be provided as a string
@@ -46,7 +40,6 @@ public interface StoreApi {
     @Query("status") String status
   );
 
-  
   /**
    * Returns pet inventories by status
    * Returns a map of status codes to quantities
@@ -57,21 +50,19 @@ public interface StoreApi {
   Call<Map<String, Integer>> getInventory();
     
 
-  
   /**
    * Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
    * Returns an arbitrary object which is actually a map of status codes to quantities
    * @return Call<Object>
    */
   
-  @GET("store/inventory?response=arbitrary_object")
+  @GET("store/inventory?response&#x3D;arbitrary_object")
   Call<Object> getInventoryInObject();
     
 
-  
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+   * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return Call<Order>
    */
@@ -81,7 +72,6 @@ public interface StoreApi {
     @Path("orderId") String orderId
   );
 
-  
   /**
    * Place an order for a pet
    * 
@@ -94,6 +84,4 @@ public interface StoreApi {
     @Body Order body
   );
 
-  
 }
-
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/UserApi.java
index 08aeb90a583..ce02953a0c8 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/UserApi.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/UserApi.java
@@ -10,17 +10,12 @@ import okhttp3.RequestBody;
 
 import io.swagger.client.model.User;
 
-
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
-
 public interface UserApi {
-  
   /**
    * Create user
    * This can only be done by the logged in user.
@@ -33,7 +28,6 @@ public interface UserApi {
     @Body User body
   );
 
-  
   /**
    * Creates list of users with given input array
    * 
@@ -46,7 +40,6 @@ public interface UserApi {
     @Body List<User> body
   );
 
-  
   /**
    * Creates list of users with given input array
    * 
@@ -59,7 +52,6 @@ public interface UserApi {
     @Body List<User> body
   );
 
-  
   /**
    * Delete user
    * This can only be done by the logged in user.
@@ -72,11 +64,10 @@ public interface UserApi {
     @Path("username") String username
   );
 
-  
   /**
    * Get user by user name
    * 
-   * @param username The name that needs to be fetched. Use user1 for testing. (required)
+   * @param username The name that needs to be fetched. Use user1 for testing.  (required)
    * @return Call<User>
    */
   
@@ -85,7 +76,6 @@ public interface UserApi {
     @Path("username") String username
   );
 
-  
   /**
    * Logs user into the system
    * 
@@ -99,7 +89,6 @@ public interface UserApi {
     @Query("username") String username, @Query("password") String password
   );
 
-  
   /**
    * Logs out current logged in user session
    * 
@@ -110,7 +99,6 @@ public interface UserApi {
   Call<Void> logoutUser();
     
 
-  
   /**
    * Updated user
    * This can only be done by the logged in user.
@@ -124,6 +112,4 @@ public interface UserApi {
     @Path("username") String username, @Body User body
   );
 
-  
 }
-
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Animal.java
new file mode 100644
index 00000000000..8df24899fb0
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Animal.java
@@ -0,0 +1,66 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class Animal   {
+  
+  @SerializedName("className")
+  private String className = null;
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Animal animal = (Animal) o;
+    return Objects.equals(className, animal.className);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Animal {\n");
+    
+    sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Cat.java
new file mode 100644
index 00000000000..60a99ed86da
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Cat.java
@@ -0,0 +1,82 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.client.model.Animal;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class Cat extends Animal  {
+  
+  @SerializedName("className")
+  private String className = null;
+
+  @SerializedName("declawed")
+  private Boolean declawed = null;
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Boolean getDeclawed() {
+    return declawed;
+  }
+  public void setDeclawed(Boolean declawed) {
+    this.declawed = declawed;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Cat cat = (Cat) o;
+    return Objects.equals(className, cat.className) &&
+        Objects.equals(declawed, cat.declawed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className, declawed);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Cat {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Category.java
index 67de63eb179..93ec7bd0877 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Category.java
@@ -4,24 +4,20 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
 
-
 public class Category   {
   
   @SerializedName("id")
   private Long id = null;
-  
+
   @SerializedName("name")
   private String name = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -32,7 +28,6 @@ public class Category   {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -43,7 +38,6 @@ public class Category   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
@@ -85,5 +79,3 @@ public class Category   {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Dog.java
new file mode 100644
index 00000000000..1c31fc93746
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Dog.java
@@ -0,0 +1,82 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.client.model.Animal;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class Dog extends Animal  {
+  
+  @SerializedName("className")
+  private String className = null;
+
+  @SerializedName("breed")
+  private String breed = null;
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getBreed() {
+    return breed;
+  }
+  public void setBreed(String breed) {
+    this.breed = breed;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Dog dog = (Dog) o;
+    return Objects.equals(className, dog.className) &&
+        Objects.equals(breed, dog.breed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className, breed);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Dog {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/FormatTest.java
new file mode 100644
index 00000000000..29d17bbdfe7
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/FormatTest.java
@@ -0,0 +1,233 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class FormatTest   {
+  
+  @SerializedName("integer")
+  private Integer integer = null;
+
+  @SerializedName("int32")
+  private Integer int32 = null;
+
+  @SerializedName("int64")
+  private Long int64 = null;
+
+  @SerializedName("number")
+  private BigDecimal number = null;
+
+  @SerializedName("float")
+  private Float _float = null;
+
+  @SerializedName("double")
+  private Double _double = null;
+
+  @SerializedName("string")
+  private String string = null;
+
+  @SerializedName("byte")
+  private byte[] _byte = null;
+
+  @SerializedName("binary")
+  private byte[] binary = null;
+
+  @SerializedName("date")
+  private Date date = null;
+
+  @SerializedName("dateTime")
+  private Date dateTime = null;
+
+  @SerializedName("password")
+  private String password = null;
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getInteger() {
+    return integer;
+  }
+  public void setInteger(Integer integer) {
+    this.integer = integer;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getInt32() {
+    return int32;
+  }
+  public void setInt32(Integer int32) {
+    this.int32 = int32;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Long getInt64() {
+    return int64;
+  }
+  public void setInt64(Long int64) {
+    this.int64 = int64;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public BigDecimal getNumber() {
+    return number;
+  }
+  public void setNumber(BigDecimal number) {
+    this.number = number;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Float getFloat() {
+    return _float;
+  }
+  public void setFloat(Float _float) {
+    this._float = _float;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Double getDouble() {
+    return _double;
+  }
+  public void setDouble(Double _double) {
+    this._double = _double;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getString() {
+    return string;
+  }
+  public void setString(String string) {
+    this.string = string;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public byte[] getByte() {
+    return _byte;
+  }
+  public void setByte(byte[] _byte) {
+    this._byte = _byte;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public byte[] getBinary() {
+    return binary;
+  }
+  public void setBinary(byte[] binary) {
+    this.binary = binary;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Date getDate() {
+    return date;
+  }
+  public void setDate(Date date) {
+    this.date = date;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Date getDateTime() {
+    return dateTime;
+  }
+  public void setDateTime(Date dateTime) {
+    this.dateTime = dateTime;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getPassword() {
+    return password;
+  }
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FormatTest formatTest = (FormatTest) o;
+    return Objects.equals(integer, formatTest.integer) &&
+        Objects.equals(int32, formatTest.int32) &&
+        Objects.equals(int64, formatTest.int64) &&
+        Objects.equals(number, formatTest.number) &&
+        Objects.equals(_float, formatTest._float) &&
+        Objects.equals(_double, formatTest._double) &&
+        Objects.equals(string, formatTest.string) &&
+        Objects.equals(_byte, formatTest._byte) &&
+        Objects.equals(binary, formatTest.binary) &&
+        Objects.equals(date, formatTest.date) &&
+        Objects.equals(dateTime, formatTest.dateTime) &&
+        Objects.equals(password, formatTest.password);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, password);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FormatTest {\n");
+    
+    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
+    sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
+    sb.append("    number: ").append(toIndentedString(number)).append("\n");
+    sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
+    sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
+    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
+    sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
+    sb.append("    date: ").append(toIndentedString(date)).append("\n");
+    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
+    sb.append("    password: ").append(toIndentedString(password)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/InlineResponse200.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/InlineResponse200.java
index 165f069a05b..b17bf005009 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/InlineResponse200.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/InlineResponse200.java
@@ -7,31 +7,23 @@ import io.swagger.client.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
 
-
 public class InlineResponse200   {
   
-  @SerializedName("photoUrls")
-  private List<String> photoUrls = new ArrayList<String>();
-  
-  @SerializedName("name")
-  private String name = null;
-  
-  @SerializedName("id")
-  private Long id = null;
-  
-  @SerializedName("category")
-  private Object category = null;
-  
   @SerializedName("tags")
   private List<Tag> tags = new ArrayList<Tag>();
-  
+
+  @SerializedName("id")
+  private Long id = null;
+
+  @SerializedName("category")
+  private Object category = null;
+
 
 public enum StatusEnum {
   @SerializedName("available")
@@ -57,53 +49,13 @@ public enum StatusEnum {
 
   @SerializedName("status")
   private StatusEnum status = null;
-  
 
-  
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public List<String> getPhotoUrls() {
-    return photoUrls;
-  }
-  public void setPhotoUrls(List<String> photoUrls) {
-    this.photoUrls = photoUrls;
-  }
+  @SerializedName("name")
+  private String name = null;
 
-  
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public String getName() {
-    return name;
-  }
-  public void setName(String name) {
-    this.name = name;
-  }
+  @SerializedName("photoUrls")
+  private List<String> photoUrls = new ArrayList<String>();
 
-  
-  /**
-   **/
-  @ApiModelProperty(required = true, value = "")
-  public Long getId() {
-    return id;
-  }
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public Object getCategory() {
-    return category;
-  }
-  public void setCategory(Object category) {
-    this.category = category;
-  }
-
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -114,7 +66,26 @@ public enum StatusEnum {
     this.tags = tags;
   }
 
-  
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Object getCategory() {
+    return category;
+  }
+  public void setCategory(Object category) {
+    this.category = category;
+  }
+
   /**
    * pet status in the store
    **/
@@ -126,7 +97,26 @@ public enum StatusEnum {
     this.status = status;
   }
 
-  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<String> getPhotoUrls() {
+    return photoUrls;
+  }
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -137,17 +127,17 @@ public enum StatusEnum {
       return false;
     }
     InlineResponse200 inlineResponse200 = (InlineResponse200) o;
-    return Objects.equals(photoUrls, inlineResponse200.photoUrls) &&
-        Objects.equals(name, inlineResponse200.name) &&
+    return Objects.equals(tags, inlineResponse200.tags) &&
         Objects.equals(id, inlineResponse200.id) &&
         Objects.equals(category, inlineResponse200.category) &&
-        Objects.equals(tags, inlineResponse200.tags) &&
-        Objects.equals(status, inlineResponse200.status);
+        Objects.equals(status, inlineResponse200.status) &&
+        Objects.equals(name, inlineResponse200.name) &&
+        Objects.equals(photoUrls, inlineResponse200.photoUrls);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(photoUrls, name, id, category, tags, status);
+    return Objects.hash(tags, id, category, status, name, photoUrls);
   }
 
   @Override
@@ -155,12 +145,12 @@ public enum StatusEnum {
     StringBuilder sb = new StringBuilder();
     sb.append("class InlineResponse200 {\n");
     
-    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -176,5 +166,3 @@ public enum StatusEnum {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Model200Response.java
index 80b0aed92a8..3cbb15006fb 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Model200Response.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Model200Response.java
@@ -4,21 +4,20 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
-
-
+/**
+ * Model for testing model name starting with number
+ **/
+@ApiModel(description = "Model for testing model name starting with number")
 public class Model200Response   {
   
   @SerializedName("name")
   private Integer name = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -29,7 +28,6 @@ public class Model200Response   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
@@ -69,5 +67,3 @@ public class Model200Response   {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ModelReturn.java
index ce8c1238fdb..a3ecfb92156 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -4,21 +4,20 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
-
-
+/**
+ * Model for testing reserved words
+ **/
+@ApiModel(description = "Model for testing reserved words")
 public class ModelReturn   {
   
   @SerializedName("return")
   private Integer _return = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -29,7 +28,6 @@ public class ModelReturn   {
     this._return = _return;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
@@ -69,5 +67,3 @@ public class ModelReturn   {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Name.java
index 370214bd21c..fd90800298e 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Name.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Name.java
@@ -4,27 +4,26 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
-
-
+/**
+ * Model for testing model name same as property name
+ **/
+@ApiModel(description = "Model for testing model name same as property name")
 public class Name   {
   
   @SerializedName("name")
   private Integer name = null;
-  
+
   @SerializedName("snake_case")
   private Integer snakeCase = null;
-  
 
-  
   /**
    **/
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
   }
@@ -32,18 +31,13 @@ public class Name   {
     this.name = name;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
   }
-  public void setSnakeCase(Integer snakeCase) {
-    this.snakeCase = snakeCase;
-  }
 
-  
 
   @Override
   public boolean equals(Object o) {
@@ -85,5 +79,3 @@ public class Name   {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Order.java
index e601bd7a15a..f1fb2ad7409 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Order.java
@@ -5,28 +5,26 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
 
-
 public class Order   {
   
   @SerializedName("id")
   private Long id = null;
-  
+
   @SerializedName("petId")
   private Long petId = null;
-  
+
   @SerializedName("quantity")
   private Integer quantity = null;
-  
+
   @SerializedName("shipDate")
   private Date shipDate = null;
-  
+
 
 public enum StatusEnum {
   @SerializedName("placed")
@@ -52,12 +50,10 @@ public enum StatusEnum {
 
   @SerializedName("status")
   private StatusEnum status = null;
-  
+
   @SerializedName("complete")
   private Boolean complete = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -65,7 +61,6 @@ public enum StatusEnum {
     return id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -76,7 +71,6 @@ public enum StatusEnum {
     this.petId = petId;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -87,7 +81,6 @@ public enum StatusEnum {
     this.quantity = quantity;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -98,7 +91,6 @@ public enum StatusEnum {
     this.shipDate = shipDate;
   }
 
-  
   /**
    * Order Status
    **/
@@ -110,7 +102,6 @@ public enum StatusEnum {
     this.status = status;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -121,7 +112,6 @@ public enum StatusEnum {
     this.complete = complete;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
@@ -171,5 +161,3 @@ public enum StatusEnum {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Pet.java
index 5d1210dc55b..bcee581aa97 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Pet.java
@@ -8,31 +8,29 @@ import io.swagger.client.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
 
-
 public class Pet   {
   
   @SerializedName("id")
   private Long id = null;
-  
+
   @SerializedName("category")
   private Category category = null;
-  
+
   @SerializedName("name")
   private String name = null;
-  
+
   @SerializedName("photoUrls")
   private List<String> photoUrls = new ArrayList<String>();
-  
+
   @SerializedName("tags")
   private List<Tag> tags = new ArrayList<Tag>();
-  
+
 
 public enum StatusEnum {
   @SerializedName("available")
@@ -58,9 +56,7 @@ public enum StatusEnum {
 
   @SerializedName("status")
   private StatusEnum status = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -71,7 +67,6 @@ public enum StatusEnum {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -82,7 +77,6 @@ public enum StatusEnum {
     this.category = category;
   }
 
-  
   /**
    **/
   @ApiModelProperty(required = true, value = "")
@@ -93,7 +87,6 @@ public enum StatusEnum {
     this.name = name;
   }
 
-  
   /**
    **/
   @ApiModelProperty(required = true, value = "")
@@ -104,7 +97,6 @@ public enum StatusEnum {
     this.photoUrls = photoUrls;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -115,7 +107,6 @@ public enum StatusEnum {
     this.tags = tags;
   }
 
-  
   /**
    * pet status in the store
    **/
@@ -127,7 +118,6 @@ public enum StatusEnum {
     this.status = status;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
@@ -177,5 +167,3 @@ public enum StatusEnum {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/SpecialModelName.java
index b5a96d5fc39..e2354b064b2 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -4,21 +4,17 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
 
-
 public class SpecialModelName   {
   
   @SerializedName("$special[property.name]")
   private Long specialPropertyName = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -29,7 +25,6 @@ public class SpecialModelName   {
     this.specialPropertyName = specialPropertyName;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
@@ -69,5 +64,3 @@ public class SpecialModelName   {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Tag.java
index 6ee49ee2166..9c5ac6cf9a7 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Tag.java
@@ -4,24 +4,20 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
 
-
 public class Tag   {
   
   @SerializedName("id")
   private Long id = null;
-  
+
   @SerializedName("name")
   private String name = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -32,7 +28,6 @@ public class Tag   {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -43,7 +38,6 @@ public class Tag   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
@@ -85,5 +79,3 @@ public class Tag   {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/User.java
index 98196393ef1..39e40837a6a 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/User.java
@@ -4,42 +4,38 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
 
-
 public class User   {
   
   @SerializedName("id")
   private Long id = null;
-  
+
   @SerializedName("username")
   private String username = null;
-  
+
   @SerializedName("firstName")
   private String firstName = null;
-  
+
   @SerializedName("lastName")
   private String lastName = null;
-  
+
   @SerializedName("email")
   private String email = null;
-  
+
   @SerializedName("password")
   private String password = null;
-  
+
   @SerializedName("phone")
   private String phone = null;
-  
+
   @SerializedName("userStatus")
   private Integer userStatus = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -50,7 +46,6 @@ public class User   {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -61,7 +56,6 @@ public class User   {
     this.username = username;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -72,7 +66,6 @@ public class User   {
     this.firstName = firstName;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -83,7 +76,6 @@ public class User   {
     this.lastName = lastName;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -94,7 +86,6 @@ public class User   {
     this.email = email;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -105,7 +96,6 @@ public class User   {
     this.password = password;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -116,7 +106,6 @@ public class User   {
     this.phone = phone;
   }
 
-  
   /**
    * User Status
    **/
@@ -128,7 +117,6 @@ public class User   {
     this.userStatus = userStatus;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
@@ -182,5 +170,3 @@ public class User   {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/build.gradle b/samples/client/petstore/java/retrofit2rx/build.gradle
index c7139267298..123bae25560 100644
--- a/samples/client/petstore/java/retrofit2rx/build.gradle
+++ b/samples/client/petstore/java/retrofit2rx/build.gradle
@@ -9,8 +9,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
@@ -25,11 +25,11 @@ if(hasProperty('target') && target == 'android') {
 	apply plugin: 'com.github.dcendents.android-maven'
 
 	android {
-	    compileSdkVersion 22
-	    buildToolsVersion '22.0.0'
+	    compileSdkVersion 23
+	    buildToolsVersion '23.0.2'
 	    defaultConfig {
 	        minSdkVersion 14
-	        targetSdkVersion 22
+	        targetSdkVersion 23
 	    }
 	    compileOptions {
 	        sourceCompatibility JavaVersion.VERSION_1_7
@@ -46,6 +46,10 @@ if(hasProperty('target') && target == 'android') {
 	            }
 	        }
 	    }
+
+      dependencies {
+          provided 'javax.annotation:jsr250-api:1.0'
+      }
 	}
 
 	afterEvaluate {
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/StringUtil.java
index e8c0dc4d062..873647cb45e 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/StringUtil.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/StringUtil.java
@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-07T09:11:59.834Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-13T14:37:27.438+02:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java
index 33d4760a605..5f35286fb30 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java
@@ -12,17 +12,12 @@ import io.swagger.client.model.Pet;
 import io.swagger.client.model.InlineResponse200;
 import java.io.File;
 
-
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
-
 public interface PetApi {
-  
   /**
    * Add a new pet to the store
    * 
@@ -35,7 +30,6 @@ public interface PetApi {
     @Body Pet body
   );
 
-  
   /**
    * Fake endpoint to test byte array in body parameter for adding a new pet to the store
    * 
@@ -43,12 +37,11 @@ public interface PetApi {
    * @return Call<Void>
    */
   
-  @POST("pet?testing_byte_array=true")
+  @POST("pet?testing_byte_array&#x3D;true")
   Observable<Void> addPetUsingByteArray(
     @Body byte[] body
   );
 
-  
   /**
    * Deletes a pet
    * 
@@ -62,7 +55,6 @@ public interface PetApi {
     @Path("petId") Long petId, @Header("api_key") String apiKey
   );
 
-  
   /**
    * Finds Pets by status
    * Multiple status values can be provided with comma separated strings
@@ -75,7 +67,6 @@ public interface PetApi {
     @Query("status") List<String> status
   );
 
-  
   /**
    * Finds Pets by tags
    * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
@@ -88,7 +79,6 @@ public interface PetApi {
     @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
@@ -101,7 +91,6 @@ public interface PetApi {
     @Path("petId") Long petId
   );
 
-  
   /**
    * Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
    * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
@@ -109,12 +98,11 @@ public interface PetApi {
    * @return Call<InlineResponse200>
    */
   
-  @GET("pet/{petId}?response=inline_arbitrary_object")
+  @GET("pet/{petId}?response&#x3D;inline_arbitrary_object")
   Observable<InlineResponse200> getPetByIdInObject(
     @Path("petId") Long petId
   );
 
-  
   /**
    * Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
    * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
@@ -122,12 +110,11 @@ public interface PetApi {
    * @return Call<byte[]>
    */
   
-  @GET("pet/{petId}?testing_byte_array=true")
+  @GET("pet/{petId}?testing_byte_array&#x3D;true")
   Observable<byte[]> petPetIdtestingByteArraytrueGet(
     @Path("petId") Long petId
   );
 
-  
   /**
    * Update an existing pet
    * 
@@ -140,7 +127,6 @@ public interface PetApi {
     @Body Pet body
   );
 
-  
   /**
    * Updates a pet in the store with form data
    * 
@@ -156,7 +142,6 @@ public interface PetApi {
     @Path("petId") String petId, @Field("name") String name, @Field("status") String status
   );
 
-  
   /**
    * uploads an image
    * 
@@ -172,6 +157,4 @@ public interface PetApi {
     @Path("petId") Long petId, @Part("additionalMetadata") String additionalMetadata, @Part("file\"; filename=\"file\"") RequestBody file
   );
 
-  
 }
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/StoreApi.java
index b4effc010df..a0a60b0e3b6 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/StoreApi.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/StoreApi.java
@@ -10,17 +10,12 @@ import okhttp3.RequestBody;
 
 import io.swagger.client.model.Order;
 
-
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
-
 public interface StoreApi {
-  
   /**
    * Delete purchase order by ID
    * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
@@ -33,7 +28,6 @@ public interface StoreApi {
     @Path("orderId") String orderId
   );
 
-  
   /**
    * Finds orders by status
    * A single status value can be provided as a string
@@ -46,7 +40,6 @@ public interface StoreApi {
     @Query("status") String status
   );
 
-  
   /**
    * Returns pet inventories by status
    * Returns a map of status codes to quantities
@@ -57,21 +50,19 @@ public interface StoreApi {
   Observable<Map<String, Integer>> getInventory();
     
 
-  
   /**
    * Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
    * Returns an arbitrary object which is actually a map of status codes to quantities
    * @return Call<Object>
    */
   
-  @GET("store/inventory?response=arbitrary_object")
+  @GET("store/inventory?response&#x3D;arbitrary_object")
   Observable<Object> getInventoryInObject();
     
 
-  
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+   * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
    * @param orderId ID of pet that needs to be fetched (required)
    * @return Call<Order>
    */
@@ -81,7 +72,6 @@ public interface StoreApi {
     @Path("orderId") String orderId
   );
 
-  
   /**
    * Place an order for a pet
    * 
@@ -94,6 +84,4 @@ public interface StoreApi {
     @Body Order body
   );
 
-  
 }
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/UserApi.java
index 6019e10711d..e5a17e2bef9 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/UserApi.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/UserApi.java
@@ -10,17 +10,12 @@ import okhttp3.RequestBody;
 
 import io.swagger.client.model.User;
 
-
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
-
 public interface UserApi {
-  
   /**
    * Create user
    * This can only be done by the logged in user.
@@ -33,7 +28,6 @@ public interface UserApi {
     @Body User body
   );
 
-  
   /**
    * Creates list of users with given input array
    * 
@@ -46,7 +40,6 @@ public interface UserApi {
     @Body List<User> body
   );
 
-  
   /**
    * Creates list of users with given input array
    * 
@@ -59,7 +52,6 @@ public interface UserApi {
     @Body List<User> body
   );
 
-  
   /**
    * Delete user
    * This can only be done by the logged in user.
@@ -72,11 +64,10 @@ public interface UserApi {
     @Path("username") String username
   );
 
-  
   /**
    * Get user by user name
    * 
-   * @param username The name that needs to be fetched. Use user1 for testing. (required)
+   * @param username The name that needs to be fetched. Use user1 for testing.  (required)
    * @return Call<User>
    */
   
@@ -85,7 +76,6 @@ public interface UserApi {
     @Path("username") String username
   );
 
-  
   /**
    * Logs user into the system
    * 
@@ -99,7 +89,6 @@ public interface UserApi {
     @Query("username") String username, @Query("password") String password
   );
 
-  
   /**
    * Logs out current logged in user session
    * 
@@ -110,7 +99,6 @@ public interface UserApi {
   Observable<Void> logoutUser();
     
 
-  
   /**
    * Updated user
    * This can only be done by the logged in user.
@@ -124,6 +112,4 @@ public interface UserApi {
     @Path("username") String username, @Body User body
   );
 
-  
 }
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Animal.java
new file mode 100644
index 00000000000..8df24899fb0
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Animal.java
@@ -0,0 +1,66 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class Animal   {
+  
+  @SerializedName("className")
+  private String className = null;
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Animal animal = (Animal) o;
+    return Objects.equals(className, animal.className);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Animal {\n");
+    
+    sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Cat.java
new file mode 100644
index 00000000000..60a99ed86da
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Cat.java
@@ -0,0 +1,82 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.client.model.Animal;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class Cat extends Animal  {
+  
+  @SerializedName("className")
+  private String className = null;
+
+  @SerializedName("declawed")
+  private Boolean declawed = null;
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Boolean getDeclawed() {
+    return declawed;
+  }
+  public void setDeclawed(Boolean declawed) {
+    this.declawed = declawed;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Cat cat = (Cat) o;
+    return Objects.equals(className, cat.className) &&
+        Objects.equals(declawed, cat.declawed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className, declawed);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Cat {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Category.java
index 67de63eb179..93ec7bd0877 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Category.java
@@ -4,24 +4,20 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
 
-
 public class Category   {
   
   @SerializedName("id")
   private Long id = null;
-  
+
   @SerializedName("name")
   private String name = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -32,7 +28,6 @@ public class Category   {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -43,7 +38,6 @@ public class Category   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
@@ -85,5 +79,3 @@ public class Category   {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Dog.java
new file mode 100644
index 00000000000..1c31fc93746
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Dog.java
@@ -0,0 +1,82 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.client.model.Animal;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class Dog extends Animal  {
+  
+  @SerializedName("className")
+  private String className = null;
+
+  @SerializedName("breed")
+  private String breed = null;
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getBreed() {
+    return breed;
+  }
+  public void setBreed(String breed) {
+    this.breed = breed;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Dog dog = (Dog) o;
+    return Objects.equals(className, dog.className) &&
+        Objects.equals(breed, dog.breed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className, breed);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Dog {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/FormatTest.java
new file mode 100644
index 00000000000..29d17bbdfe7
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/FormatTest.java
@@ -0,0 +1,233 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class FormatTest   {
+  
+  @SerializedName("integer")
+  private Integer integer = null;
+
+  @SerializedName("int32")
+  private Integer int32 = null;
+
+  @SerializedName("int64")
+  private Long int64 = null;
+
+  @SerializedName("number")
+  private BigDecimal number = null;
+
+  @SerializedName("float")
+  private Float _float = null;
+
+  @SerializedName("double")
+  private Double _double = null;
+
+  @SerializedName("string")
+  private String string = null;
+
+  @SerializedName("byte")
+  private byte[] _byte = null;
+
+  @SerializedName("binary")
+  private byte[] binary = null;
+
+  @SerializedName("date")
+  private Date date = null;
+
+  @SerializedName("dateTime")
+  private Date dateTime = null;
+
+  @SerializedName("password")
+  private String password = null;
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getInteger() {
+    return integer;
+  }
+  public void setInteger(Integer integer) {
+    this.integer = integer;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getInt32() {
+    return int32;
+  }
+  public void setInt32(Integer int32) {
+    this.int32 = int32;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Long getInt64() {
+    return int64;
+  }
+  public void setInt64(Long int64) {
+    this.int64 = int64;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public BigDecimal getNumber() {
+    return number;
+  }
+  public void setNumber(BigDecimal number) {
+    this.number = number;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Float getFloat() {
+    return _float;
+  }
+  public void setFloat(Float _float) {
+    this._float = _float;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Double getDouble() {
+    return _double;
+  }
+  public void setDouble(Double _double) {
+    this._double = _double;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getString() {
+    return string;
+  }
+  public void setString(String string) {
+    this.string = string;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public byte[] getByte() {
+    return _byte;
+  }
+  public void setByte(byte[] _byte) {
+    this._byte = _byte;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public byte[] getBinary() {
+    return binary;
+  }
+  public void setBinary(byte[] binary) {
+    this.binary = binary;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Date getDate() {
+    return date;
+  }
+  public void setDate(Date date) {
+    this.date = date;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Date getDateTime() {
+    return dateTime;
+  }
+  public void setDateTime(Date dateTime) {
+    this.dateTime = dateTime;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getPassword() {
+    return password;
+  }
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FormatTest formatTest = (FormatTest) o;
+    return Objects.equals(integer, formatTest.integer) &&
+        Objects.equals(int32, formatTest.int32) &&
+        Objects.equals(int64, formatTest.int64) &&
+        Objects.equals(number, formatTest.number) &&
+        Objects.equals(_float, formatTest._float) &&
+        Objects.equals(_double, formatTest._double) &&
+        Objects.equals(string, formatTest.string) &&
+        Objects.equals(_byte, formatTest._byte) &&
+        Objects.equals(binary, formatTest.binary) &&
+        Objects.equals(date, formatTest.date) &&
+        Objects.equals(dateTime, formatTest.dateTime) &&
+        Objects.equals(password, formatTest.password);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, password);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FormatTest {\n");
+    
+    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
+    sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
+    sb.append("    number: ").append(toIndentedString(number)).append("\n");
+    sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
+    sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
+    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
+    sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
+    sb.append("    date: ").append(toIndentedString(date)).append("\n");
+    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
+    sb.append("    password: ").append(toIndentedString(password)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/InlineResponse200.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/InlineResponse200.java
index 165f069a05b..b17bf005009 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/InlineResponse200.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/InlineResponse200.java
@@ -7,31 +7,23 @@ import io.swagger.client.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
 
-
 public class InlineResponse200   {
   
-  @SerializedName("photoUrls")
-  private List<String> photoUrls = new ArrayList<String>();
-  
-  @SerializedName("name")
-  private String name = null;
-  
-  @SerializedName("id")
-  private Long id = null;
-  
-  @SerializedName("category")
-  private Object category = null;
-  
   @SerializedName("tags")
   private List<Tag> tags = new ArrayList<Tag>();
-  
+
+  @SerializedName("id")
+  private Long id = null;
+
+  @SerializedName("category")
+  private Object category = null;
+
 
 public enum StatusEnum {
   @SerializedName("available")
@@ -57,53 +49,13 @@ public enum StatusEnum {
 
   @SerializedName("status")
   private StatusEnum status = null;
-  
 
-  
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public List<String> getPhotoUrls() {
-    return photoUrls;
-  }
-  public void setPhotoUrls(List<String> photoUrls) {
-    this.photoUrls = photoUrls;
-  }
+  @SerializedName("name")
+  private String name = null;
 
-  
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public String getName() {
-    return name;
-  }
-  public void setName(String name) {
-    this.name = name;
-  }
+  @SerializedName("photoUrls")
+  private List<String> photoUrls = new ArrayList<String>();
 
-  
-  /**
-   **/
-  @ApiModelProperty(required = true, value = "")
-  public Long getId() {
-    return id;
-  }
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public Object getCategory() {
-    return category;
-  }
-  public void setCategory(Object category) {
-    this.category = category;
-  }
-
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -114,7 +66,26 @@ public enum StatusEnum {
     this.tags = tags;
   }
 
-  
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Object getCategory() {
+    return category;
+  }
+  public void setCategory(Object category) {
+    this.category = category;
+  }
+
   /**
    * pet status in the store
    **/
@@ -126,7 +97,26 @@ public enum StatusEnum {
     this.status = status;
   }
 
-  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<String> getPhotoUrls() {
+    return photoUrls;
+  }
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -137,17 +127,17 @@ public enum StatusEnum {
       return false;
     }
     InlineResponse200 inlineResponse200 = (InlineResponse200) o;
-    return Objects.equals(photoUrls, inlineResponse200.photoUrls) &&
-        Objects.equals(name, inlineResponse200.name) &&
+    return Objects.equals(tags, inlineResponse200.tags) &&
         Objects.equals(id, inlineResponse200.id) &&
         Objects.equals(category, inlineResponse200.category) &&
-        Objects.equals(tags, inlineResponse200.tags) &&
-        Objects.equals(status, inlineResponse200.status);
+        Objects.equals(status, inlineResponse200.status) &&
+        Objects.equals(name, inlineResponse200.name) &&
+        Objects.equals(photoUrls, inlineResponse200.photoUrls);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(photoUrls, name, id, category, tags, status);
+    return Objects.hash(tags, id, category, status, name, photoUrls);
   }
 
   @Override
@@ -155,12 +145,12 @@ public enum StatusEnum {
     StringBuilder sb = new StringBuilder();
     sb.append("class InlineResponse200 {\n");
     
-    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -176,5 +166,3 @@ public enum StatusEnum {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Model200Response.java
index 80b0aed92a8..3cbb15006fb 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Model200Response.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Model200Response.java
@@ -4,21 +4,20 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
-
-
+/**
+ * Model for testing model name starting with number
+ **/
+@ApiModel(description = "Model for testing model name starting with number")
 public class Model200Response   {
   
   @SerializedName("name")
   private Integer name = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -29,7 +28,6 @@ public class Model200Response   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
@@ -69,5 +67,3 @@ public class Model200Response   {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ModelReturn.java
index ce8c1238fdb..a3ecfb92156 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -4,21 +4,20 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
-
-
+/**
+ * Model for testing reserved words
+ **/
+@ApiModel(description = "Model for testing reserved words")
 public class ModelReturn   {
   
   @SerializedName("return")
   private Integer _return = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -29,7 +28,6 @@ public class ModelReturn   {
     this._return = _return;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
@@ -69,5 +67,3 @@ public class ModelReturn   {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Name.java
index 370214bd21c..fd90800298e 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Name.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Name.java
@@ -4,27 +4,26 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
-
-
+/**
+ * Model for testing model name same as property name
+ **/
+@ApiModel(description = "Model for testing model name same as property name")
 public class Name   {
   
   @SerializedName("name")
   private Integer name = null;
-  
+
   @SerializedName("snake_case")
   private Integer snakeCase = null;
-  
 
-  
   /**
    **/
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
   }
@@ -32,18 +31,13 @@ public class Name   {
     this.name = name;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
   }
-  public void setSnakeCase(Integer snakeCase) {
-    this.snakeCase = snakeCase;
-  }
 
-  
 
   @Override
   public boolean equals(Object o) {
@@ -85,5 +79,3 @@ public class Name   {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Order.java
index e601bd7a15a..f1fb2ad7409 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Order.java
@@ -5,28 +5,26 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
 
-
 public class Order   {
   
   @SerializedName("id")
   private Long id = null;
-  
+
   @SerializedName("petId")
   private Long petId = null;
-  
+
   @SerializedName("quantity")
   private Integer quantity = null;
-  
+
   @SerializedName("shipDate")
   private Date shipDate = null;
-  
+
 
 public enum StatusEnum {
   @SerializedName("placed")
@@ -52,12 +50,10 @@ public enum StatusEnum {
 
   @SerializedName("status")
   private StatusEnum status = null;
-  
+
   @SerializedName("complete")
   private Boolean complete = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -65,7 +61,6 @@ public enum StatusEnum {
     return id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -76,7 +71,6 @@ public enum StatusEnum {
     this.petId = petId;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -87,7 +81,6 @@ public enum StatusEnum {
     this.quantity = quantity;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -98,7 +91,6 @@ public enum StatusEnum {
     this.shipDate = shipDate;
   }
 
-  
   /**
    * Order Status
    **/
@@ -110,7 +102,6 @@ public enum StatusEnum {
     this.status = status;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -121,7 +112,6 @@ public enum StatusEnum {
     this.complete = complete;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
@@ -171,5 +161,3 @@ public enum StatusEnum {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Pet.java
index 5d1210dc55b..bcee581aa97 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Pet.java
@@ -8,31 +8,29 @@ import io.swagger.client.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
 
-
 public class Pet   {
   
   @SerializedName("id")
   private Long id = null;
-  
+
   @SerializedName("category")
   private Category category = null;
-  
+
   @SerializedName("name")
   private String name = null;
-  
+
   @SerializedName("photoUrls")
   private List<String> photoUrls = new ArrayList<String>();
-  
+
   @SerializedName("tags")
   private List<Tag> tags = new ArrayList<Tag>();
-  
+
 
 public enum StatusEnum {
   @SerializedName("available")
@@ -58,9 +56,7 @@ public enum StatusEnum {
 
   @SerializedName("status")
   private StatusEnum status = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -71,7 +67,6 @@ public enum StatusEnum {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -82,7 +77,6 @@ public enum StatusEnum {
     this.category = category;
   }
 
-  
   /**
    **/
   @ApiModelProperty(required = true, value = "")
@@ -93,7 +87,6 @@ public enum StatusEnum {
     this.name = name;
   }
 
-  
   /**
    **/
   @ApiModelProperty(required = true, value = "")
@@ -104,7 +97,6 @@ public enum StatusEnum {
     this.photoUrls = photoUrls;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -115,7 +107,6 @@ public enum StatusEnum {
     this.tags = tags;
   }
 
-  
   /**
    * pet status in the store
    **/
@@ -127,7 +118,6 @@ public enum StatusEnum {
     this.status = status;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
@@ -177,5 +167,3 @@ public enum StatusEnum {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/SpecialModelName.java
index b5a96d5fc39..e2354b064b2 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -4,21 +4,17 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
 
-
 public class SpecialModelName   {
   
   @SerializedName("$special[property.name]")
   private Long specialPropertyName = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -29,7 +25,6 @@ public class SpecialModelName   {
     this.specialPropertyName = specialPropertyName;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
@@ -69,5 +64,3 @@ public class SpecialModelName   {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Tag.java
index 6ee49ee2166..9c5ac6cf9a7 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Tag.java
@@ -4,24 +4,20 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
 
-
 public class Tag   {
   
   @SerializedName("id")
   private Long id = null;
-  
+
   @SerializedName("name")
   private String name = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -32,7 +28,6 @@ public class Tag   {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -43,7 +38,6 @@ public class Tag   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
@@ -85,5 +79,3 @@ public class Tag   {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/User.java
index 98196393ef1..39e40837a6a 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/User.java
@@ -4,42 +4,38 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 import com.google.gson.annotations.SerializedName;
 
 
 
 
 
-
 public class User   {
   
   @SerializedName("id")
   private Long id = null;
-  
+
   @SerializedName("username")
   private String username = null;
-  
+
   @SerializedName("firstName")
   private String firstName = null;
-  
+
   @SerializedName("lastName")
   private String lastName = null;
-  
+
   @SerializedName("email")
   private String email = null;
-  
+
   @SerializedName("password")
   private String password = null;
-  
+
   @SerializedName("phone")
   private String phone = null;
-  
+
   @SerializedName("userStatus")
   private Integer userStatus = null;
-  
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -50,7 +46,6 @@ public class User   {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -61,7 +56,6 @@ public class User   {
     this.username = username;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -72,7 +66,6 @@ public class User   {
     this.firstName = firstName;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -83,7 +76,6 @@ public class User   {
     this.lastName = lastName;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -94,7 +86,6 @@ public class User   {
     this.email = email;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -105,7 +96,6 @@ public class User   {
     this.password = password;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -116,7 +106,6 @@ public class User   {
     this.phone = phone;
   }
 
-  
   /**
    * User Status
    **/
@@ -128,7 +117,6 @@ public class User   {
     this.userStatus = userStatus;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
@@ -182,5 +170,3 @@ public class User   {
     return o.toString().replace("\n", "\n    ");
   }
 }
-
-
diff --git a/samples/client/petstore/javascript-closure-angular/API/Client/ApiResponse.js b/samples/client/petstore/javascript-closure-angular/API/Client/ApiResponse.js
new file mode 100644
index 00000000000..0ec7148bc9a
--- /dev/null
+++ b/samples/client/petstore/javascript-closure-angular/API/Client/ApiResponse.js
@@ -0,0 +1,25 @@
+goog.provide('API.Client.ApiResponse');
+
+/**
+ * @record
+ */
+API.Client.ApiResponse = function() {}
+
+/**
+ * @type {!number}
+ * @export
+ */
+API.Client.ApiResponse.prototype.code;
+
+/**
+ * @type {!string}
+ * @export
+ */
+API.Client.ApiResponse.prototype.type;
+
+/**
+ * @type {!string}
+ * @export
+ */
+API.Client.ApiResponse.prototype.message;
+
diff --git a/samples/client/petstore/javascript-closure-angular/API/Client/PetApi.js b/samples/client/petstore/javascript-closure-angular/API/Client/PetApi.js
index e39dcfc7e24..5cf1c6d751d 100644
--- a/samples/client/petstore/javascript-closure-angular/API/Client/PetApi.js
+++ b/samples/client/petstore/javascript-closure-angular/API/Client/PetApi.js
@@ -3,9 +3,9 @@
  * Do not edit this file by hand or your changes will be lost next time it is
  * generated.
  *
- * This is a sample server Petstore server.  You can find out more about Swagger at &lt;a href=\&quot;http://swagger.io\&quot;&gt;http://swagger.io&lt;/a&gt; or on irc.freenode.net, #swagger.  For this sample, you can use the api key \&quot;special-key\&quot; to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key &#x60;special-key&#x60; to test the authorization filters.
  * Version: 1.0.0
- * Generated at: 2016-02-02T00:45:38.616-07:00
+ * Generated at: 2016-04-16T18:02:07.029+08:00
  * Generated by: class io.swagger.codegen.languages.JavascriptClosureAngularClientCodegen
  */
 /**
@@ -15,6 +15,7 @@
 
 goog.provide('API.Client.PetApi');
 
+goog.require('API.Client.ApiResponse');
 goog.require('API.Client.Pet');
 
 /**
@@ -44,49 +45,14 @@ API.Client.PetApi = function($http, $httpParamSerializer, $injector) {
 }
 API.Client.PetApi.$inject = ['$http', '$httpParamSerializer', '$injector'];
 
-/**
- * Update an existing pet
- * 
- * @param {!Pet=} opt_body Pet object that needs to be added to the store
- * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
- * @return {!angular.$q.Promise}
- */
-API.Client.PetApi.prototype.updatePet = function(opt_body, opt_extraHttpRequestParams) {
-  /** @const {string} */
-  var path = this.basePath_ + '/pet';
-
-  /** @type {!Object} */
-  var queryParameters = {};
-
-  /** @type {!Object} */
-  var headerParams = angular.extend({}, this.defaultHeaders);
-  /** @type {!Object} */
-  var httpRequestParams = {
-    method: 'PUT',
-    url: path,
-    json: true,
-    data: opt_body,
-    
-    
-    params: queryParameters,
-    headers: headerParams
-  };
-
-  if (opt_extraHttpRequestParams) {
-    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
-  }
-
-  return this.http_(httpRequestParams);
-}
-
 /**
  * Add a new pet to the store
  * 
- * @param {!Pet=} opt_body Pet object that needs to be added to the store
+ * @param {!Pet} body Pet object that needs to be added to the store
  * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
  * @return {!angular.$q.Promise}
  */
-API.Client.PetApi.prototype.addPet = function(opt_body, opt_extraHttpRequestParams) {
+API.Client.PetApi.prototype.addPet = function(body, opt_extraHttpRequestParams) {
   /** @const {string} */
   var path = this.basePath_ + '/pet';
 
@@ -95,181 +61,17 @@ API.Client.PetApi.prototype.addPet = function(opt_body, opt_extraHttpRequestPara
 
   /** @type {!Object} */
   var headerParams = angular.extend({}, this.defaultHeaders);
+  // verify required parameter 'body' is set
+  if (!body) {
+    throw new Error('Missing required parameter body when calling addPet');
+  }
   /** @type {!Object} */
   var httpRequestParams = {
     method: 'POST',
     url: path,
     json: true,
-    data: opt_body,
-    
-    
-    params: queryParameters,
-    headers: headerParams
-  };
-
-  if (opt_extraHttpRequestParams) {
-    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
-  }
-
-  return this.http_(httpRequestParams);
-}
-
-/**
- * Finds Pets by status
- * Multiple status values can be provided with comma seperated strings
- * @param {!Array<!string>=} opt_status Status values that need to be considered for filter
- * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
- * @return {!angular.$q.Promise<!Array<!API.Client.Pet>>}
- */
-API.Client.PetApi.prototype.findPetsByStatus = function(opt_status, opt_extraHttpRequestParams) {
-  /** @const {string} */
-  var path = this.basePath_ + '/pet/findByStatus';
-
-  /** @type {!Object} */
-  var queryParameters = {};
-
-  /** @type {!Object} */
-  var headerParams = angular.extend({}, this.defaultHeaders);
-  if (opt_status !== undefined) {
-    queryParameters['status'] = opt_status;
-  }
-
-  /** @type {!Object} */
-  var httpRequestParams = {
-    method: 'GET',
-    url: path,
-    json: true,
-    
-    
-    params: queryParameters,
-    headers: headerParams
-  };
-
-  if (opt_extraHttpRequestParams) {
-    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
-  }
-
-  return this.http_(httpRequestParams);
-}
-
-/**
- * Finds Pets by tags
- * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
- * @param {!Array<!string>=} opt_tags Tags to filter by
- * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
- * @return {!angular.$q.Promise<!Array<!API.Client.Pet>>}
- */
-API.Client.PetApi.prototype.findPetsByTags = function(opt_tags, opt_extraHttpRequestParams) {
-  /** @const {string} */
-  var path = this.basePath_ + '/pet/findByTags';
-
-  /** @type {!Object} */
-  var queryParameters = {};
-
-  /** @type {!Object} */
-  var headerParams = angular.extend({}, this.defaultHeaders);
-  if (opt_tags !== undefined) {
-    queryParameters['tags'] = opt_tags;
-  }
-
-  /** @type {!Object} */
-  var httpRequestParams = {
-    method: 'GET',
-    url: path,
-    json: true,
-    
-    
-    params: queryParameters,
-    headers: headerParams
-  };
-
-  if (opt_extraHttpRequestParams) {
-    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
-  }
-
-  return this.http_(httpRequestParams);
-}
-
-/**
- * Find pet by ID
- * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
- * @param {!number} petId ID of pet that needs to be fetched
- * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
- * @return {!angular.$q.Promise<!API.Client.Pet>}
- */
-API.Client.PetApi.prototype.getPetById = function(petId, opt_extraHttpRequestParams) {
-  /** @const {string} */
-  var path = this.basePath_ + '/pet/{petId}'
-      .replace('{' + 'petId' + '}', String(petId));
-
-  /** @type {!Object} */
-  var queryParameters = {};
-
-  /** @type {!Object} */
-  var headerParams = angular.extend({}, this.defaultHeaders);
-  // verify required parameter 'petId' is set
-  if (!petId) {
-    throw new Error('Missing required parameter petId when calling getPetById');
-  }
-  /** @type {!Object} */
-  var httpRequestParams = {
-    method: 'GET',
-    url: path,
-    json: true,
-    
-    
-    params: queryParameters,
-    headers: headerParams
-  };
-
-  if (opt_extraHttpRequestParams) {
-    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
-  }
-
-  return this.http_(httpRequestParams);
-}
-
-/**
- * Updates a pet in the store with form data
- * 
- * @param {!string} petId ID of pet that needs to be updated
- * @param {!string=} opt_name Updated name of the pet
- * @param {!string=} opt_status Updated status of the pet
- * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
- * @return {!angular.$q.Promise}
- */
-API.Client.PetApi.prototype.updatePetWithForm = function(petId, opt_name, opt_status, opt_extraHttpRequestParams) {
-  /** @const {string} */
-  var path = this.basePath_ + '/pet/{petId}'
-      .replace('{' + 'petId' + '}', String(petId));
-
-  /** @type {!Object} */
-  var queryParameters = {};
-
-  /** @type {!Object} */
-  var headerParams = angular.extend({}, this.defaultHeaders);
-  /** @type {!Object} */
-  var formParams = {};
-
-  // verify required parameter 'petId' is set
-  if (!petId) {
-    throw new Error('Missing required parameter petId when calling updatePetWithForm');
-  }
-  headerParams['Content-Type'] = 'application/x-www-form-urlencoded';
-
-  formParams['name'] = opt_name;
-
-  formParams['status'] = opt_status;
-
-  /** @type {!Object} */
-  var httpRequestParams = {
-    method: 'POST',
-    url: path,
-    json: false,
-    
-    data: this.httpParamSerializer_(formParams),
-    
-    params: queryParameters,
+    data: body,
+        params: queryParameters,
     headers: headerParams
   };
 
@@ -309,8 +111,209 @@ API.Client.PetApi.prototype.deletePet = function(petId, opt_apiKey, opt_extraHtt
     method: 'DELETE',
     url: path,
     json: true,
-    
-    
+            params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Finds Pets by status
+ * Multiple status values can be provided with comma separated strings
+ * @param {!Array<!string>} status Status values that need to be considered for filter
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise<!Array<!API.Client.Pet>>}
+ */
+API.Client.PetApi.prototype.findPetsByStatus = function(status, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/pet/findByStatus';
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  // verify required parameter 'status' is set
+  if (!status) {
+    throw new Error('Missing required parameter status when calling findPetsByStatus');
+  }
+  if (status !== undefined) {
+    queryParameters['status'] = status;
+  }
+
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'GET',
+    url: path,
+    json: true,
+            params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Finds Pets by tags
+ * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+ * @param {!Array<!string>} tags Tags to filter by
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise<!Array<!API.Client.Pet>>}
+ */
+API.Client.PetApi.prototype.findPetsByTags = function(tags, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/pet/findByTags';
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  // verify required parameter 'tags' is set
+  if (!tags) {
+    throw new Error('Missing required parameter tags when calling findPetsByTags');
+  }
+  if (tags !== undefined) {
+    queryParameters['tags'] = tags;
+  }
+
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'GET',
+    url: path,
+    json: true,
+            params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Find pet by ID
+ * Returns a single pet
+ * @param {!number} petId ID of pet to return
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise<!API.Client.Pet>}
+ */
+API.Client.PetApi.prototype.getPetById = function(petId, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/pet/{petId}'
+      .replace('{' + 'petId' + '}', String(petId));
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  // verify required parameter 'petId' is set
+  if (!petId) {
+    throw new Error('Missing required parameter petId when calling getPetById');
+  }
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'GET',
+    url: path,
+    json: true,
+            params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Update an existing pet
+ * 
+ * @param {!Pet} body Pet object that needs to be added to the store
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise}
+ */
+API.Client.PetApi.prototype.updatePet = function(body, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/pet';
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  // verify required parameter 'body' is set
+  if (!body) {
+    throw new Error('Missing required parameter body when calling updatePet');
+  }
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'PUT',
+    url: path,
+    json: true,
+    data: body,
+        params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Updates a pet in the store with form data
+ * 
+ * @param {!number} petId ID of pet that needs to be updated
+ * @param {!string=} opt_name Updated name of the pet
+ * @param {!string=} opt_status Updated status of the pet
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise}
+ */
+API.Client.PetApi.prototype.updatePetWithForm = function(petId, opt_name, opt_status, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/pet/{petId}'
+      .replace('{' + 'petId' + '}', String(petId));
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  /** @type {!Object} */
+  var formParams = {};
+
+  // verify required parameter 'petId' is set
+  if (!petId) {
+    throw new Error('Missing required parameter petId when calling updatePetWithForm');
+  }
+  headerParams['Content-Type'] = 'application/x-www-form-urlencoded';
+
+  formParams['name'] = opt_name;
+
+  formParams['status'] = opt_status;
+
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'POST',
+    url: path,
+    json: false,
+        data: this.httpParamSerializer_(formParams),
     params: queryParameters,
     headers: headerParams
   };
@@ -329,7 +332,7 @@ API.Client.PetApi.prototype.deletePet = function(petId, opt_apiKey, opt_extraHtt
  * @param {!string=} opt_additionalMetadata Additional data to pass to server
  * @param {!Object=} opt_file file to upload
  * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
- * @return {!angular.$q.Promise}
+ * @return {!angular.$q.Promise<!API.Client.ApiResponse>}
  */
 API.Client.PetApi.prototype.uploadFile = function(petId, opt_additionalMetadata, opt_file, opt_extraHttpRequestParams) {
   /** @const {string} */
@@ -359,83 +362,7 @@ API.Client.PetApi.prototype.uploadFile = function(petId, opt_additionalMetadata,
     method: 'POST',
     url: path,
     json: false,
-    
-    data: this.httpParamSerializer_(formParams),
-    
-    params: queryParameters,
-    headers: headerParams
-  };
-
-  if (opt_extraHttpRequestParams) {
-    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
-  }
-
-  return this.http_(httpRequestParams);
-}
-
-/**
- * Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
- * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
- * @param {!number} petId ID of pet that needs to be fetched
- * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
- * @return {!angular.$q.Promise<!string>}
- */
-API.Client.PetApi.prototype.getPetByIdWithByteArray = function(petId, opt_extraHttpRequestParams) {
-  /** @const {string} */
-  var path = this.basePath_ + '/pet/{petId}?testing_byte_array=true'
-      .replace('{' + 'petId' + '}', String(petId));
-
-  /** @type {!Object} */
-  var queryParameters = {};
-
-  /** @type {!Object} */
-  var headerParams = angular.extend({}, this.defaultHeaders);
-  // verify required parameter 'petId' is set
-  if (!petId) {
-    throw new Error('Missing required parameter petId when calling getPetByIdWithByteArray');
-  }
-  /** @type {!Object} */
-  var httpRequestParams = {
-    method: 'GET',
-    url: path,
-    json: true,
-    
-    
-    params: queryParameters,
-    headers: headerParams
-  };
-
-  if (opt_extraHttpRequestParams) {
-    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
-  }
-
-  return this.http_(httpRequestParams);
-}
-
-/**
- * Fake endpoint to test byte array in body parameter for adding a new pet to the store
- * 
- * @param {!string=} opt_body Pet object in the form of byte array
- * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
- * @return {!angular.$q.Promise}
- */
-API.Client.PetApi.prototype.addPetUsingByteArray = function(opt_body, opt_extraHttpRequestParams) {
-  /** @const {string} */
-  var path = this.basePath_ + '/pet?testing_byte_array=true';
-
-  /** @type {!Object} */
-  var queryParameters = {};
-
-  /** @type {!Object} */
-  var headerParams = angular.extend({}, this.defaultHeaders);
-  /** @type {!Object} */
-  var httpRequestParams = {
-    method: 'POST',
-    url: path,
-    json: true,
-    data: opt_body,
-    
-    
+        data: this.httpParamSerializer_(formParams),
     params: queryParameters,
     headers: headerParams
   };
diff --git a/samples/client/petstore/javascript-closure-angular/API/Client/StoreApi.js b/samples/client/petstore/javascript-closure-angular/API/Client/StoreApi.js
index f312b7b20ce..e6c1216099a 100644
--- a/samples/client/petstore/javascript-closure-angular/API/Client/StoreApi.js
+++ b/samples/client/petstore/javascript-closure-angular/API/Client/StoreApi.js
@@ -3,9 +3,9 @@
  * Do not edit this file by hand or your changes will be lost next time it is
  * generated.
  *
- * This is a sample server Petstore server.  You can find out more about Swagger at &lt;a href=\&quot;http://swagger.io\&quot;&gt;http://swagger.io&lt;/a&gt; or on irc.freenode.net, #swagger.  For this sample, you can use the api key \&quot;special-key\&quot; to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key &#x60;special-key&#x60; to test the authorization filters.
  * Version: 1.0.0
- * Generated at: 2016-02-02T00:45:38.616-07:00
+ * Generated at: 2016-04-16T18:02:07.029+08:00
  * Generated by: class io.swagger.codegen.languages.JavascriptClosureAngularClientCodegen
  */
 /**
@@ -44,113 +44,6 @@ API.Client.StoreApi = function($http, $httpParamSerializer, $injector) {
 }
 API.Client.StoreApi.$inject = ['$http', '$httpParamSerializer', '$injector'];
 
-/**
- * Returns pet inventories by status
- * Returns a map of status codes to quantities
- * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
- * @return {!angular.$q.Promise<!Object<!string, number>>}
- */
-API.Client.StoreApi.prototype.getInventory = function(opt_extraHttpRequestParams) {
-  /** @const {string} */
-  var path = this.basePath_ + '/store/inventory';
-
-  /** @type {!Object} */
-  var queryParameters = {};
-
-  /** @type {!Object} */
-  var headerParams = angular.extend({}, this.defaultHeaders);
-  /** @type {!Object} */
-  var httpRequestParams = {
-    method: 'GET',
-    url: path,
-    json: true,
-    
-    
-    params: queryParameters,
-    headers: headerParams
-  };
-
-  if (opt_extraHttpRequestParams) {
-    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
-  }
-
-  return this.http_(httpRequestParams);
-}
-
-/**
- * Place an order for a pet
- * 
- * @param {!Order=} opt_body order placed for purchasing the pet
- * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
- * @return {!angular.$q.Promise<!API.Client.Order>}
- */
-API.Client.StoreApi.prototype.placeOrder = function(opt_body, opt_extraHttpRequestParams) {
-  /** @const {string} */
-  var path = this.basePath_ + '/store/order';
-
-  /** @type {!Object} */
-  var queryParameters = {};
-
-  /** @type {!Object} */
-  var headerParams = angular.extend({}, this.defaultHeaders);
-  /** @type {!Object} */
-  var httpRequestParams = {
-    method: 'POST',
-    url: path,
-    json: true,
-    data: opt_body,
-    
-    
-    params: queryParameters,
-    headers: headerParams
-  };
-
-  if (opt_extraHttpRequestParams) {
-    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
-  }
-
-  return this.http_(httpRequestParams);
-}
-
-/**
- * Find purchase order by ID
- * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
- * @param {!string} orderId ID of pet that needs to be fetched
- * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
- * @return {!angular.$q.Promise<!API.Client.Order>}
- */
-API.Client.StoreApi.prototype.getOrderById = function(orderId, opt_extraHttpRequestParams) {
-  /** @const {string} */
-  var path = this.basePath_ + '/store/order/{orderId}'
-      .replace('{' + 'orderId' + '}', String(orderId));
-
-  /** @type {!Object} */
-  var queryParameters = {};
-
-  /** @type {!Object} */
-  var headerParams = angular.extend({}, this.defaultHeaders);
-  // verify required parameter 'orderId' is set
-  if (!orderId) {
-    throw new Error('Missing required parameter orderId when calling getOrderById');
-  }
-  /** @type {!Object} */
-  var httpRequestParams = {
-    method: 'GET',
-    url: path,
-    json: true,
-    
-    
-    params: queryParameters,
-    headers: headerParams
-  };
-
-  if (opt_extraHttpRequestParams) {
-    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
-  }
-
-  return this.http_(httpRequestParams);
-}
-
 /**
  * Delete purchase order by ID
  * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
@@ -177,9 +70,112 @@ API.Client.StoreApi.prototype.deleteOrder = function(orderId, opt_extraHttpReque
     method: 'DELETE',
     url: path,
     json: true,
-    
-    
-    params: queryParameters,
+            params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Returns pet inventories by status
+ * Returns a map of status codes to quantities
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise<!Object<!string, number>>}
+ */
+API.Client.StoreApi.prototype.getInventory = function(opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/store/inventory';
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'GET',
+    url: path,
+    json: true,
+            params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Find purchase order by ID
+ * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+ * @param {!number} orderId ID of pet that needs to be fetched
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise<!API.Client.Order>}
+ */
+API.Client.StoreApi.prototype.getOrderById = function(orderId, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/store/order/{orderId}'
+      .replace('{' + 'orderId' + '}', String(orderId));
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  // verify required parameter 'orderId' is set
+  if (!orderId) {
+    throw new Error('Missing required parameter orderId when calling getOrderById');
+  }
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'GET',
+    url: path,
+    json: true,
+            params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Place an order for a pet
+ * 
+ * @param {!Order} body order placed for purchasing the pet
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise<!API.Client.Order>}
+ */
+API.Client.StoreApi.prototype.placeOrder = function(body, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/store/order';
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  // verify required parameter 'body' is set
+  if (!body) {
+    throw new Error('Missing required parameter body when calling placeOrder');
+  }
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'POST',
+    url: path,
+    json: true,
+    data: body,
+        params: queryParameters,
     headers: headerParams
   };
 
diff --git a/samples/client/petstore/javascript-closure-angular/API/Client/UserApi.js b/samples/client/petstore/javascript-closure-angular/API/Client/UserApi.js
index 4c97786fa9f..97b524c9d8a 100644
--- a/samples/client/petstore/javascript-closure-angular/API/Client/UserApi.js
+++ b/samples/client/petstore/javascript-closure-angular/API/Client/UserApi.js
@@ -3,9 +3,9 @@
  * Do not edit this file by hand or your changes will be lost next time it is
  * generated.
  *
- * This is a sample server Petstore server.  You can find out more about Swagger at &lt;a href=\&quot;http://swagger.io\&quot;&gt;http://swagger.io&lt;/a&gt; or on irc.freenode.net, #swagger.  For this sample, you can use the api key \&quot;special-key\&quot; to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key &#x60;special-key&#x60; to test the authorization filters.
  * Version: 1.0.0
- * Generated at: 2016-02-02T00:45:38.616-07:00
+ * Generated at: 2016-04-16T18:02:07.029+08:00
  * Generated by: class io.swagger.codegen.languages.JavascriptClosureAngularClientCodegen
  */
 /**
@@ -47,11 +47,11 @@ API.Client.UserApi.$inject = ['$http', '$httpParamSerializer', '$injector'];
 /**
  * Create user
  * This can only be done by the logged in user.
- * @param {!User=} opt_body Created user object
+ * @param {!User} body Created user object
  * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
  * @return {!angular.$q.Promise}
  */
-API.Client.UserApi.prototype.createUser = function(opt_body, opt_extraHttpRequestParams) {
+API.Client.UserApi.prototype.createUser = function(body, opt_extraHttpRequestParams) {
   /** @const {string} */
   var path = this.basePath_ + '/user';
 
@@ -60,15 +60,17 @@ API.Client.UserApi.prototype.createUser = function(opt_body, opt_extraHttpReques
 
   /** @type {!Object} */
   var headerParams = angular.extend({}, this.defaultHeaders);
+  // verify required parameter 'body' is set
+  if (!body) {
+    throw new Error('Missing required parameter body when calling createUser');
+  }
   /** @type {!Object} */
   var httpRequestParams = {
     method: 'POST',
     url: path,
     json: true,
-    data: opt_body,
-    
-    
-    params: queryParameters,
+    data: body,
+        params: queryParameters,
     headers: headerParams
   };
 
@@ -82,11 +84,11 @@ API.Client.UserApi.prototype.createUser = function(opt_body, opt_extraHttpReques
 /**
  * Creates list of users with given input array
  * 
- * @param {!Array<!API.Client.User>=} opt_body List of user object
+ * @param {!Array<!API.Client.User>} body List of user object
  * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
  * @return {!angular.$q.Promise}
  */
-API.Client.UserApi.prototype.createUsersWithArrayInput = function(opt_body, opt_extraHttpRequestParams) {
+API.Client.UserApi.prototype.createUsersWithArrayInput = function(body, opt_extraHttpRequestParams) {
   /** @const {string} */
   var path = this.basePath_ + '/user/createWithArray';
 
@@ -95,15 +97,17 @@ API.Client.UserApi.prototype.createUsersWithArrayInput = function(opt_body, opt_
 
   /** @type {!Object} */
   var headerParams = angular.extend({}, this.defaultHeaders);
+  // verify required parameter 'body' is set
+  if (!body) {
+    throw new Error('Missing required parameter body when calling createUsersWithArrayInput');
+  }
   /** @type {!Object} */
   var httpRequestParams = {
     method: 'POST',
     url: path,
     json: true,
-    data: opt_body,
-    
-    
-    params: queryParameters,
+    data: body,
+        params: queryParameters,
     headers: headerParams
   };
 
@@ -117,11 +121,11 @@ API.Client.UserApi.prototype.createUsersWithArrayInput = function(opt_body, opt_
 /**
  * Creates list of users with given input array
  * 
- * @param {!Array<!API.Client.User>=} opt_body List of user object
+ * @param {!Array<!API.Client.User>} body List of user object
  * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
  * @return {!angular.$q.Promise}
  */
-API.Client.UserApi.prototype.createUsersWithListInput = function(opt_body, opt_extraHttpRequestParams) {
+API.Client.UserApi.prototype.createUsersWithListInput = function(body, opt_extraHttpRequestParams) {
   /** @const {string} */
   var path = this.basePath_ + '/user/createWithList';
 
@@ -130,171 +134,17 @@ API.Client.UserApi.prototype.createUsersWithListInput = function(opt_body, opt_e
 
   /** @type {!Object} */
   var headerParams = angular.extend({}, this.defaultHeaders);
+  // verify required parameter 'body' is set
+  if (!body) {
+    throw new Error('Missing required parameter body when calling createUsersWithListInput');
+  }
   /** @type {!Object} */
   var httpRequestParams = {
     method: 'POST',
     url: path,
     json: true,
-    data: opt_body,
-    
-    
-    params: queryParameters,
-    headers: headerParams
-  };
-
-  if (opt_extraHttpRequestParams) {
-    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
-  }
-
-  return this.http_(httpRequestParams);
-}
-
-/**
- * Logs user into the system
- * 
- * @param {!string=} opt_username The user name for login
- * @param {!string=} opt_password The password for login in clear text
- * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
- * @return {!angular.$q.Promise<!string>}
- */
-API.Client.UserApi.prototype.loginUser = function(opt_username, opt_password, opt_extraHttpRequestParams) {
-  /** @const {string} */
-  var path = this.basePath_ + '/user/login';
-
-  /** @type {!Object} */
-  var queryParameters = {};
-
-  /** @type {!Object} */
-  var headerParams = angular.extend({}, this.defaultHeaders);
-  if (opt_username !== undefined) {
-    queryParameters['username'] = opt_username;
-  }
-
-  if (opt_password !== undefined) {
-    queryParameters['password'] = opt_password;
-  }
-
-  /** @type {!Object} */
-  var httpRequestParams = {
-    method: 'GET',
-    url: path,
-    json: true,
-    
-    
-    params: queryParameters,
-    headers: headerParams
-  };
-
-  if (opt_extraHttpRequestParams) {
-    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
-  }
-
-  return this.http_(httpRequestParams);
-}
-
-/**
- * Logs out current logged in user session
- * 
- * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
- * @return {!angular.$q.Promise}
- */
-API.Client.UserApi.prototype.logoutUser = function(opt_extraHttpRequestParams) {
-  /** @const {string} */
-  var path = this.basePath_ + '/user/logout';
-
-  /** @type {!Object} */
-  var queryParameters = {};
-
-  /** @type {!Object} */
-  var headerParams = angular.extend({}, this.defaultHeaders);
-  /** @type {!Object} */
-  var httpRequestParams = {
-    method: 'GET',
-    url: path,
-    json: true,
-    
-    
-    params: queryParameters,
-    headers: headerParams
-  };
-
-  if (opt_extraHttpRequestParams) {
-    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
-  }
-
-  return this.http_(httpRequestParams);
-}
-
-/**
- * Get user by user name
- * 
- * @param {!string} username The name that needs to be fetched. Use user1 for testing.
- * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
- * @return {!angular.$q.Promise<!API.Client.User>}
- */
-API.Client.UserApi.prototype.getUserByName = function(username, opt_extraHttpRequestParams) {
-  /** @const {string} */
-  var path = this.basePath_ + '/user/{username}'
-      .replace('{' + 'username' + '}', String(username));
-
-  /** @type {!Object} */
-  var queryParameters = {};
-
-  /** @type {!Object} */
-  var headerParams = angular.extend({}, this.defaultHeaders);
-  // verify required parameter 'username' is set
-  if (!username) {
-    throw new Error('Missing required parameter username when calling getUserByName');
-  }
-  /** @type {!Object} */
-  var httpRequestParams = {
-    method: 'GET',
-    url: path,
-    json: true,
-    
-    
-    params: queryParameters,
-    headers: headerParams
-  };
-
-  if (opt_extraHttpRequestParams) {
-    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
-  }
-
-  return this.http_(httpRequestParams);
-}
-
-/**
- * Updated user
- * This can only be done by the logged in user.
- * @param {!string} username name that need to be deleted
- * @param {!User=} opt_body Updated user object
- * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
- * @return {!angular.$q.Promise}
- */
-API.Client.UserApi.prototype.updateUser = function(username, opt_body, opt_extraHttpRequestParams) {
-  /** @const {string} */
-  var path = this.basePath_ + '/user/{username}'
-      .replace('{' + 'username' + '}', String(username));
-
-  /** @type {!Object} */
-  var queryParameters = {};
-
-  /** @type {!Object} */
-  var headerParams = angular.extend({}, this.defaultHeaders);
-  // verify required parameter 'username' is set
-  if (!username) {
-    throw new Error('Missing required parameter username when calling updateUser');
-  }
-  /** @type {!Object} */
-  var httpRequestParams = {
-    method: 'PUT',
-    url: path,
-    json: true,
-    data: opt_body,
-    
-    
-    params: queryParameters,
+    data: body,
+        params: queryParameters,
     headers: headerParams
   };
 
@@ -331,9 +181,167 @@ API.Client.UserApi.prototype.deleteUser = function(username, opt_extraHttpReques
     method: 'DELETE',
     url: path,
     json: true,
-    
-    
-    params: queryParameters,
+            params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Get user by user name
+ * 
+ * @param {!string} username The name that needs to be fetched. Use user1 for testing. 
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise<!API.Client.User>}
+ */
+API.Client.UserApi.prototype.getUserByName = function(username, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/user/{username}'
+      .replace('{' + 'username' + '}', String(username));
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  // verify required parameter 'username' is set
+  if (!username) {
+    throw new Error('Missing required parameter username when calling getUserByName');
+  }
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'GET',
+    url: path,
+    json: true,
+            params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Logs user into the system
+ * 
+ * @param {!string} username The user name for login
+ * @param {!string} password The password for login in clear text
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise<!string>}
+ */
+API.Client.UserApi.prototype.loginUser = function(username, password, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/user/login';
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  // verify required parameter 'username' is set
+  if (!username) {
+    throw new Error('Missing required parameter username when calling loginUser');
+  }
+  // verify required parameter 'password' is set
+  if (!password) {
+    throw new Error('Missing required parameter password when calling loginUser');
+  }
+  if (username !== undefined) {
+    queryParameters['username'] = username;
+  }
+
+  if (password !== undefined) {
+    queryParameters['password'] = password;
+  }
+
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'GET',
+    url: path,
+    json: true,
+            params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Logs out current logged in user session
+ * 
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise}
+ */
+API.Client.UserApi.prototype.logoutUser = function(opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/user/logout';
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'GET',
+    url: path,
+    json: true,
+            params: queryParameters,
+    headers: headerParams
+  };
+
+  if (opt_extraHttpRequestParams) {
+    httpRequestParams = angular.extend(httpRequestParams, opt_extraHttpRequestParams);
+  }
+
+  return this.http_(httpRequestParams);
+}
+
+/**
+ * Updated user
+ * This can only be done by the logged in user.
+ * @param {!string} username name that need to be deleted
+ * @param {!User} body Updated user object
+ * @param {!angular.$http.Config=} opt_extraHttpRequestParams Extra HTTP parameters to send.
+ * @return {!angular.$q.Promise}
+ */
+API.Client.UserApi.prototype.updateUser = function(username, body, opt_extraHttpRequestParams) {
+  /** @const {string} */
+  var path = this.basePath_ + '/user/{username}'
+      .replace('{' + 'username' + '}', String(username));
+
+  /** @type {!Object} */
+  var queryParameters = {};
+
+  /** @type {!Object} */
+  var headerParams = angular.extend({}, this.defaultHeaders);
+  // verify required parameter 'username' is set
+  if (!username) {
+    throw new Error('Missing required parameter username when calling updateUser');
+  }
+  // verify required parameter 'body' is set
+  if (!body) {
+    throw new Error('Missing required parameter body when calling updateUser');
+  }
+  /** @type {!Object} */
+  var httpRequestParams = {
+    method: 'PUT',
+    url: path,
+    json: true,
+    data: body,
+        params: queryParameters,
     headers: headerParams
   };
 
diff --git a/samples/client/petstore/javascript-promise/README.md b/samples/client/petstore/javascript-promise/README.md
index 3fc0c158a2a..2b49c2d1519 100644
--- a/samples/client/petstore/javascript-promise/README.md
+++ b/samples/client/petstore/javascript-promise/README.md
@@ -6,7 +6,7 @@ This SDK is automatically generated by the [Swagger Codegen](https://github.com/
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build date: 2016-03-30T20:58:13.565+08:00
+- Build date: 2016-04-11T22:19:40.915+08:00
 - Build package: class io.swagger.codegen.languages.JavascriptClientCodegen
 
 ## Installation
@@ -80,20 +80,20 @@ All URIs are relative to *http://petstore.swagger.io/v2*
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
 *SwaggerPetstore.PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
-*SwaggerPetstore.PetApi* | [**addPetUsingByteArray**](docs/PetApi.md#addPetUsingByteArray) | **POST** /pet?testing_byte_array=true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
+*SwaggerPetstore.PetApi* | [**addPetUsingByteArray**](docs/PetApi.md#addPetUsingByteArray) | **POST** /pet?testing_byte_array&#x3D;true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
 *SwaggerPetstore.PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
 *SwaggerPetstore.PetApi* | [**findPetsByStatus**](docs/PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status
 *SwaggerPetstore.PetApi* | [**findPetsByTags**](docs/PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags
 *SwaggerPetstore.PetApi* | [**getPetById**](docs/PetApi.md#getPetById) | **GET** /pet/{petId} | Find pet by ID
-*SwaggerPetstore.PetApi* | [**getPetByIdInObject**](docs/PetApi.md#getPetByIdInObject) | **GET** /pet/{petId}?response=inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
-*SwaggerPetstore.PetApi* | [**petPetIdtestingByteArraytrueGet**](docs/PetApi.md#petPetIdtestingByteArraytrueGet) | **GET** /pet/{petId}?testing_byte_array=true | Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+*SwaggerPetstore.PetApi* | [**getPetByIdInObject**](docs/PetApi.md#getPetByIdInObject) | **GET** /pet/{petId}?response&#x3D;inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+*SwaggerPetstore.PetApi* | [**petPetIdtestingByteArraytrueGet**](docs/PetApi.md#petPetIdtestingByteArraytrueGet) | **GET** /pet/{petId}?testing_byte_array&#x3D;true | Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
 *SwaggerPetstore.PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 *SwaggerPetstore.PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *SwaggerPetstore.PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
 *SwaggerPetstore.StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
 *SwaggerPetstore.StoreApi* | [**findOrdersByStatus**](docs/StoreApi.md#findOrdersByStatus) | **GET** /store/findByStatus | Finds orders by status
 *SwaggerPetstore.StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
-*SwaggerPetstore.StoreApi* | [**getInventoryInObject**](docs/StoreApi.md#getInventoryInObject) | **GET** /store/inventory?response=arbitrary_object | Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+*SwaggerPetstore.StoreApi* | [**getInventoryInObject**](docs/StoreApi.md#getInventoryInObject) | **GET** /store/inventory?response&#x3D;arbitrary_object | Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
 *SwaggerPetstore.StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{orderId} | Find purchase order by ID
 *SwaggerPetstore.StoreApi* | [**placeOrder**](docs/StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet
 *SwaggerPetstore.UserApi* | [**createUser**](docs/UserApi.md#createUser) | **POST** /user | Create user
@@ -112,6 +112,7 @@ Class | Method | HTTP request | Description
  - [SwaggerPetstore.Cat](docs/Cat.md)
  - [SwaggerPetstore.Category](docs/Category.md)
  - [SwaggerPetstore.Dog](docs/Dog.md)
+ - [SwaggerPetstore.FormatTest](docs/FormatTest.md)
  - [SwaggerPetstore.InlineResponse200](docs/InlineResponse200.md)
  - [SwaggerPetstore.Model200Response](docs/Model200Response.md)
  - [SwaggerPetstore.ModelReturn](docs/ModelReturn.md)
@@ -164,7 +165,7 @@ Class | Method | HTTP request | Description
 
 - **Type**: OAuth
 - **Flow**: implicit
-- **Authorizatoin URL**: http://petstore.swagger.io/api/oauth/dialog
+- **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
 - **Scopes**: 
   - write:pets: modify pets in your account
   - read:pets: read your pets
diff --git a/samples/client/petstore/javascript-promise/docs/FormatTest.md b/samples/client/petstore/javascript-promise/docs/FormatTest.md
new file mode 100644
index 00000000000..57a4fb132d5
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/docs/FormatTest.md
@@ -0,0 +1,18 @@
+# SwaggerPetstore.FormatTest
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**integer** | **Integer** |  | [optional] 
+**int32** | **Integer** |  | [optional] 
+**int64** | **Integer** |  | [optional] 
+**_number** | **Number** |  | 
+**_float** | **Number** |  | [optional] 
+**_double** | **Number** |  | [optional] 
+**_string** | **String** |  | [optional] 
+**_byte** | **String** |  | [optional] 
+**binary** | **String** |  | [optional] 
+**_date** | **Date** |  | [optional] 
+**dateTime** | **String** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript-promise/docs/Name.md b/samples/client/petstore/javascript-promise/docs/Name.md
index 5086f6c5a3e..f0e693f2f56 100644
--- a/samples/client/petstore/javascript-promise/docs/Name.md
+++ b/samples/client/petstore/javascript-promise/docs/Name.md
@@ -3,7 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**name** | **Integer** |  | [optional] 
+**name** | **Integer** |  | 
 **snakeCase** | **Integer** |  | [optional] 
 
 
diff --git a/samples/client/petstore/javascript-promise/docs/PetApi.md b/samples/client/petstore/javascript-promise/docs/PetApi.md
index 77d9630f888..5aecb88ee7c 100644
--- a/samples/client/petstore/javascript-promise/docs/PetApi.md
+++ b/samples/client/petstore/javascript-promise/docs/PetApi.md
@@ -5,13 +5,13 @@ All URIs are relative to *http://petstore.swagger.io/v2*
 Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**addPet**](PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
-[**addPetUsingByteArray**](PetApi.md#addPetUsingByteArray) | **POST** /pet?testing_byte_array=true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
+[**addPetUsingByteArray**](PetApi.md#addPetUsingByteArray) | **POST** /pet?testing_byte_array&#x3D;true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
 [**deletePet**](PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
 [**findPetsByStatus**](PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status
 [**findPetsByTags**](PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags
 [**getPetById**](PetApi.md#getPetById) | **GET** /pet/{petId} | Find pet by ID
-[**getPetByIdInObject**](PetApi.md#getPetByIdInObject) | **GET** /pet/{petId}?response=inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
-[**petPetIdtestingByteArraytrueGet**](PetApi.md#petPetIdtestingByteArraytrueGet) | **GET** /pet/{petId}?testing_byte_array=true | Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+[**getPetByIdInObject**](PetApi.md#getPetByIdInObject) | **GET** /pet/{petId}?response&#x3D;inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+[**petPetIdtestingByteArraytrueGet**](PetApi.md#petPetIdtestingByteArraytrueGet) | **GET** /pet/{petId}?testing_byte_array&#x3D;true | Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
 [**updatePet**](PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 [**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 [**uploadFile**](PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
@@ -61,7 +61,7 @@ null (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
  - **Accept**: application/json, application/xml
@@ -110,7 +110,7 @@ null (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
  - **Accept**: application/json, application/xml
@@ -162,7 +162,7 @@ null (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -211,7 +211,7 @@ Name | Type | Description  | Notes
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -260,7 +260,7 @@ Name | Type | Description  | Notes
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -314,7 +314,7 @@ Name | Type | Description  | Notes
 
 [api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -368,7 +368,7 @@ Name | Type | Description  | Notes
 
 [api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -422,7 +422,7 @@ Name | Type | Description  | Notes
 
 [api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -471,7 +471,7 @@ null (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
  - **Accept**: application/json, application/xml
@@ -525,7 +525,7 @@ null (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: application/json, application/xml
@@ -579,7 +579,7 @@ null (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: multipart/form-data
  - **Accept**: application/json, application/xml
diff --git a/samples/client/petstore/javascript-promise/docs/StoreApi.md b/samples/client/petstore/javascript-promise/docs/StoreApi.md
index 930586a96f5..d083e46c0db 100644
--- a/samples/client/petstore/javascript-promise/docs/StoreApi.md
+++ b/samples/client/petstore/javascript-promise/docs/StoreApi.md
@@ -7,7 +7,7 @@ Method | HTTP request | Description
 [**deleteOrder**](StoreApi.md#deleteOrder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
 [**findOrdersByStatus**](StoreApi.md#findOrdersByStatus) | **GET** /store/findByStatus | Finds orders by status
 [**getInventory**](StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
-[**getInventoryInObject**](StoreApi.md#getInventoryInObject) | **GET** /store/inventory?response=arbitrary_object | Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+[**getInventoryInObject**](StoreApi.md#getInventoryInObject) | **GET** /store/inventory?response&#x3D;arbitrary_object | Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
 [**getOrderById**](StoreApi.md#getOrderById) | **GET** /store/order/{orderId} | Find purchase order by ID
 [**placeOrder**](StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet
 
@@ -50,7 +50,7 @@ null (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -107,7 +107,7 @@ Name | Type | Description  | Notes
 
 [test_api_client_id](../README.md#test_api_client_id), [test_api_client_secret](../README.md#test_api_client_secret)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -151,7 +151,7 @@ This endpoint does not need any parameter.
 
 [api_key](../README.md#api_key)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -195,7 +195,7 @@ This endpoint does not need any parameter.
 
 [api_key](../README.md#api_key)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -206,7 +206,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
 
 ### Example
 ```javascript
@@ -251,7 +251,7 @@ Name | Type | Description  | Notes
 
 [test_api_key_header](../README.md#test_api_key_header), [test_api_key_query](../README.md#test_api_key_query)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -308,7 +308,7 @@ Name | Type | Description  | Notes
 
 [test_api_client_id](../README.md#test_api_client_id), [test_api_client_secret](../README.md#test_api_client_secret)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
diff --git a/samples/client/petstore/javascript-promise/docs/UserApi.md b/samples/client/petstore/javascript-promise/docs/UserApi.md
index 1c14b708231..b68f2e8bffc 100644
--- a/samples/client/petstore/javascript-promise/docs/UserApi.md
+++ b/samples/client/petstore/javascript-promise/docs/UserApi.md
@@ -53,7 +53,7 @@ null (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -97,7 +97,7 @@ null (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -141,7 +141,7 @@ null (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -190,7 +190,7 @@ null (empty response body)
 
 [test_http_basic](../README.md#test_http_basic)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -209,7 +209,7 @@ var SwaggerPetstore = require('swagger-petstore');
 
 var apiInstance = new SwaggerPetstore.UserApi()
 
-var username = "username_example"; // {String} The name that needs to be fetched. Use user1 for testing.
+var username = "username_example"; // {String} The name that needs to be fetched. Use user1 for testing. 
 
 apiInstance.getUserByName(username).then(function(data) {
   console.log('API called successfully. Returned data: ' + data);
@@ -223,7 +223,7 @@ apiInstance.getUserByName(username).then(function(data) {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **username** | **String**| The name that needs to be fetched. Use user1 for testing. | 
+ **username** | **String**| The name that needs to be fetched. Use user1 for testing.  | 
 
 ### Return type
 
@@ -233,7 +233,7 @@ Name | Type | Description  | Notes
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -279,7 +279,7 @@ Name | Type | Description  | Notes
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -316,7 +316,7 @@ null (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -363,7 +363,7 @@ null (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
diff --git a/samples/client/petstore/javascript-promise/src/ApiClient.js b/samples/client/petstore/javascript-promise/src/ApiClient.js
index 8943bd4792b..da6c506ba64 100644
--- a/samples/client/petstore/javascript-promise/src/ApiClient.js
+++ b/samples/client/petstore/javascript-promise/src/ApiClient.js
@@ -48,7 +48,6 @@
       'test_api_key_query': {type: 'apiKey', 'in': 'query', name: 'test_api_key_query'},
       'petstore_auth': {type: 'oauth2'}
     };
-
     /**
      * The default HTTP headers to be included for all API calls.
      * @type {Array.<String>}
diff --git a/samples/client/petstore/javascript-promise/src/api/StoreApi.js b/samples/client/petstore/javascript-promise/src/api/StoreApi.js
index 32a6dce47e9..77d0276ead0 100644
--- a/samples/client/petstore/javascript-promise/src/api/StoreApi.js
+++ b/samples/client/petstore/javascript-promise/src/api/StoreApi.js
@@ -169,7 +169,7 @@
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
      * @param {String} orderId ID of pet that needs to be fetched
      * data is of type: {module:model/Order}
      */
diff --git a/samples/client/petstore/javascript-promise/src/api/UserApi.js b/samples/client/petstore/javascript-promise/src/api/UserApi.js
index 8914d9c883d..b2f3e8c16c9 100644
--- a/samples/client/petstore/javascript-promise/src/api/UserApi.js
+++ b/samples/client/petstore/javascript-promise/src/api/UserApi.js
@@ -172,7 +172,7 @@
     /**
      * Get user by user name
      * 
-     * @param {String} username The name that needs to be fetched. Use user1 for testing.
+     * @param {String} username The name that needs to be fetched. Use user1 for testing. 
      * data is of type: {module:model/User}
      */
     this.getUserByName = function(username) {
diff --git a/samples/client/petstore/javascript-promise/src/index.js b/samples/client/petstore/javascript-promise/src/index.js
index da193f80e4d..c29f14094f9 100644
--- a/samples/client/petstore/javascript-promise/src/index.js
+++ b/samples/client/petstore/javascript-promise/src/index.js
@@ -1,16 +1,16 @@
 (function(factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.
-    define(['./ApiClient', './model/Animal', './model/Cat', './model/Category', './model/Dog', './model/InlineResponse200', './model/Model200Response', './model/ModelReturn', './model/Name', './model/Order', './model/Pet', './model/SpecialModelName', './model/Tag', './model/User', './api/PetApi', './api/StoreApi', './api/UserApi'], factory);
+    define(['./ApiClient', './model/Animal', './model/Cat', './model/Category', './model/Dog', './model/FormatTest', './model/InlineResponse200', './model/Model200Response', './model/ModelReturn', './model/Name', './model/Order', './model/Pet', './model/SpecialModelName', './model/Tag', './model/User', './api/PetApi', './api/StoreApi', './api/UserApi'], factory);
   } else if (typeof module === 'object' && module.exports) {
     // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('./ApiClient'), require('./model/Animal'), require('./model/Cat'), require('./model/Category'), require('./model/Dog'), require('./model/InlineResponse200'), require('./model/Model200Response'), require('./model/ModelReturn'), require('./model/Name'), require('./model/Order'), require('./model/Pet'), require('./model/SpecialModelName'), require('./model/Tag'), require('./model/User'), require('./api/PetApi'), require('./api/StoreApi'), require('./api/UserApi'));
+    module.exports = factory(require('./ApiClient'), require('./model/Animal'), require('./model/Cat'), require('./model/Category'), require('./model/Dog'), require('./model/FormatTest'), require('./model/InlineResponse200'), require('./model/Model200Response'), require('./model/ModelReturn'), require('./model/Name'), require('./model/Order'), require('./model/Pet'), require('./model/SpecialModelName'), require('./model/Tag'), require('./model/User'), require('./api/PetApi'), require('./api/StoreApi'), require('./api/UserApi'));
   }
-}(function(ApiClient, Animal, Cat, Category, Dog, InlineResponse200, Model200Response, ModelReturn, Name, Order, Pet, SpecialModelName, Tag, User, PetApi, StoreApi, UserApi) {
+}(function(ApiClient, Animal, Cat, Category, Dog, FormatTest, InlineResponse200, Model200Response, ModelReturn, Name, Order, Pet, SpecialModelName, Tag, User, PetApi, StoreApi, UserApi) {
   'use strict';
 
   /**
-   * This is a sample server Petstore server.  You can find out more about Swagger at &lt;a href=\&quot;http://swagger.io\&quot;&gt;http://swagger.io&lt;/a&gt; or on irc.freenode.net, #swagger.  For this sample, you can use the api key \&quot;special-key\&quot; to test the authorization filters.<br>
+   * This is a sample server Petstore server.  You can find out more about Swagger at &lt;a href&#x3D;\&quot;http://swagger.io\&quot;&gt;http://swagger.io&lt;/a&gt; or on irc.freenode.net, #swagger.  For this sample, you can use the api key \&quot;special-key\&quot; to test the authorization filters.<br>
    * The <code>index</code> module provides access to constructors for all the classes which comprise the public API.
    * <p>
    * An AMD (recommended!) or CommonJS application will generally do something equivalent to the following:
@@ -66,6 +66,11 @@
      * @property {module:model/Dog}
      */
     Dog: Dog,
+    /**
+     * The FormatTest model constructor.
+     * @property {module:model/FormatTest}
+     */
+    FormatTest: FormatTest,
     /**
      * The InlineResponse200 model constructor.
      * @property {module:model/InlineResponse200}
diff --git a/samples/client/petstore/javascript-promise/src/model/FormatTest.js b/samples/client/petstore/javascript-promise/src/model/FormatTest.js
new file mode 100644
index 00000000000..46a9bc854fc
--- /dev/null
+++ b/samples/client/petstore/javascript-promise/src/model/FormatTest.js
@@ -0,0 +1,153 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.FormatTest = factory(root.SwaggerPetstore.ApiClient);
+  }
+}(this, function(ApiClient) {
+  'use strict';
+
+  /**
+   * The FormatTest model module.
+   * @module model/FormatTest
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new <code>FormatTest</code>.
+   * @alias module:model/FormatTest
+   * @class
+   * @param _number
+   */
+  var exports = function(_number) {
+
+
+
+
+    this['number'] = _number;
+
+
+
+
+
+
+
+  };
+
+  /**
+   * Constructs a <code>FormatTest</code> from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/FormatTest} obj Optional instance to populate.
+   * @return {module:model/FormatTest} The populated <code>FormatTest</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) { 
+      obj = obj || new exports();
+
+      if (data.hasOwnProperty('integer')) {
+        obj['integer'] = ApiClient.convertToType(data['integer'], 'Integer');
+      }
+      if (data.hasOwnProperty('int32')) {
+        obj['int32'] = ApiClient.convertToType(data['int32'], 'Integer');
+      }
+      if (data.hasOwnProperty('int64')) {
+        obj['int64'] = ApiClient.convertToType(data['int64'], 'Integer');
+      }
+      if (data.hasOwnProperty('number')) {
+        obj['number'] = ApiClient.convertToType(data['number'], 'Number');
+      }
+      if (data.hasOwnProperty('float')) {
+        obj['float'] = ApiClient.convertToType(data['float'], 'Number');
+      }
+      if (data.hasOwnProperty('double')) {
+        obj['double'] = ApiClient.convertToType(data['double'], 'Number');
+      }
+      if (data.hasOwnProperty('string')) {
+        obj['string'] = ApiClient.convertToType(data['string'], 'String');
+      }
+      if (data.hasOwnProperty('byte')) {
+        obj['byte'] = ApiClient.convertToType(data['byte'], 'String');
+      }
+      if (data.hasOwnProperty('binary')) {
+        obj['binary'] = ApiClient.convertToType(data['binary'], 'String');
+      }
+      if (data.hasOwnProperty('date')) {
+        obj['date'] = ApiClient.convertToType(data['date'], 'Date');
+      }
+      if (data.hasOwnProperty('dateTime')) {
+        obj['dateTime'] = ApiClient.convertToType(data['dateTime'], 'String');
+      }
+    }
+    return obj;
+  }
+
+
+  /**
+   * @member {Integer} integer
+   */
+  exports.prototype['integer'] = undefined;
+
+  /**
+   * @member {Integer} int32
+   */
+  exports.prototype['int32'] = undefined;
+
+  /**
+   * @member {Integer} int64
+   */
+  exports.prototype['int64'] = undefined;
+
+  /**
+   * @member {Number} number
+   */
+  exports.prototype['number'] = undefined;
+
+  /**
+   * @member {Number} float
+   */
+  exports.prototype['float'] = undefined;
+
+  /**
+   * @member {Number} double
+   */
+  exports.prototype['double'] = undefined;
+
+  /**
+   * @member {String} string
+   */
+  exports.prototype['string'] = undefined;
+
+  /**
+   * @member {String} byte
+   */
+  exports.prototype['byte'] = undefined;
+
+  /**
+   * @member {String} binary
+   */
+  exports.prototype['binary'] = undefined;
+
+  /**
+   * @member {Date} date
+   */
+  exports.prototype['date'] = undefined;
+
+  /**
+   * @member {String} dateTime
+   */
+  exports.prototype['dateTime'] = undefined;
+
+
+
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript-promise/src/model/Model200Response.js b/samples/client/petstore/javascript-promise/src/model/Model200Response.js
index fb559f5ebaa..1682ed079fc 100644
--- a/samples/client/petstore/javascript-promise/src/model/Model200Response.js
+++ b/samples/client/petstore/javascript-promise/src/model/Model200Response.js
@@ -23,6 +23,7 @@
 
   /**
    * Constructs a new <code>Model200Response</code>.
+   * Model for testing model name starting with number
    * @alias module:model/Model200Response
    * @class
    */
diff --git a/samples/client/petstore/javascript-promise/src/model/ModelReturn.js b/samples/client/petstore/javascript-promise/src/model/ModelReturn.js
index d5036e230ea..86d28d038a9 100644
--- a/samples/client/petstore/javascript-promise/src/model/ModelReturn.js
+++ b/samples/client/petstore/javascript-promise/src/model/ModelReturn.js
@@ -23,6 +23,7 @@
 
   /**
    * Constructs a new <code>ModelReturn</code>.
+   * Model for testing reserved words
    * @alias module:model/ModelReturn
    * @class
    */
diff --git a/samples/client/petstore/javascript-promise/src/model/Name.js b/samples/client/petstore/javascript-promise/src/model/Name.js
index a5a070025f7..c8bd6862c97 100644
--- a/samples/client/petstore/javascript-promise/src/model/Name.js
+++ b/samples/client/petstore/javascript-promise/src/model/Name.js
@@ -23,12 +23,14 @@
 
   /**
    * Constructs a new <code>Name</code>.
+   * Model for testing model name same as property name
    * @alias module:model/Name
    * @class
+   * @param name
    */
-  var exports = function() {
-
+  var exports = function(name) {
 
+    this['name'] = name;
 
   };
 
diff --git a/samples/client/petstore/javascript/README.md b/samples/client/petstore/javascript/README.md
index 0867d3ec1d5..c57237d7ceb 100644
--- a/samples/client/petstore/javascript/README.md
+++ b/samples/client/petstore/javascript/README.md
@@ -6,7 +6,7 @@ This SDK is automatically generated by the [Swagger Codegen](https://github.com/
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build date: 2016-03-30T20:58:07.996+08:00
+- Build date: 2016-04-11T22:17:15.122+08:00
 - Build package: class io.swagger.codegen.languages.JavascriptClientCodegen
 
 ## Installation
@@ -83,20 +83,20 @@ All URIs are relative to *http://petstore.swagger.io/v2*
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
 *SwaggerPetstore.PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
-*SwaggerPetstore.PetApi* | [**addPetUsingByteArray**](docs/PetApi.md#addPetUsingByteArray) | **POST** /pet?testing_byte_array=true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
+*SwaggerPetstore.PetApi* | [**addPetUsingByteArray**](docs/PetApi.md#addPetUsingByteArray) | **POST** /pet?testing_byte_array&#x3D;true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
 *SwaggerPetstore.PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
 *SwaggerPetstore.PetApi* | [**findPetsByStatus**](docs/PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status
 *SwaggerPetstore.PetApi* | [**findPetsByTags**](docs/PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags
 *SwaggerPetstore.PetApi* | [**getPetById**](docs/PetApi.md#getPetById) | **GET** /pet/{petId} | Find pet by ID
-*SwaggerPetstore.PetApi* | [**getPetByIdInObject**](docs/PetApi.md#getPetByIdInObject) | **GET** /pet/{petId}?response=inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
-*SwaggerPetstore.PetApi* | [**petPetIdtestingByteArraytrueGet**](docs/PetApi.md#petPetIdtestingByteArraytrueGet) | **GET** /pet/{petId}?testing_byte_array=true | Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+*SwaggerPetstore.PetApi* | [**getPetByIdInObject**](docs/PetApi.md#getPetByIdInObject) | **GET** /pet/{petId}?response&#x3D;inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+*SwaggerPetstore.PetApi* | [**petPetIdtestingByteArraytrueGet**](docs/PetApi.md#petPetIdtestingByteArraytrueGet) | **GET** /pet/{petId}?testing_byte_array&#x3D;true | Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
 *SwaggerPetstore.PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 *SwaggerPetstore.PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *SwaggerPetstore.PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
 *SwaggerPetstore.StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
 *SwaggerPetstore.StoreApi* | [**findOrdersByStatus**](docs/StoreApi.md#findOrdersByStatus) | **GET** /store/findByStatus | Finds orders by status
 *SwaggerPetstore.StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
-*SwaggerPetstore.StoreApi* | [**getInventoryInObject**](docs/StoreApi.md#getInventoryInObject) | **GET** /store/inventory?response=arbitrary_object | Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+*SwaggerPetstore.StoreApi* | [**getInventoryInObject**](docs/StoreApi.md#getInventoryInObject) | **GET** /store/inventory?response&#x3D;arbitrary_object | Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
 *SwaggerPetstore.StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{orderId} | Find purchase order by ID
 *SwaggerPetstore.StoreApi* | [**placeOrder**](docs/StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet
 *SwaggerPetstore.UserApi* | [**createUser**](docs/UserApi.md#createUser) | **POST** /user | Create user
@@ -115,6 +115,7 @@ Class | Method | HTTP request | Description
  - [SwaggerPetstore.Cat](docs/Cat.md)
  - [SwaggerPetstore.Category](docs/Category.md)
  - [SwaggerPetstore.Dog](docs/Dog.md)
+ - [SwaggerPetstore.FormatTest](docs/FormatTest.md)
  - [SwaggerPetstore.InlineResponse200](docs/InlineResponse200.md)
  - [SwaggerPetstore.Model200Response](docs/Model200Response.md)
  - [SwaggerPetstore.ModelReturn](docs/ModelReturn.md)
@@ -167,7 +168,7 @@ Class | Method | HTTP request | Description
 
 - **Type**: OAuth
 - **Flow**: implicit
-- **Authorizatoin URL**: http://petstore.swagger.io/api/oauth/dialog
+- **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
 - **Scopes**: 
   - write:pets: modify pets in your account
   - read:pets: read your pets
diff --git a/samples/client/petstore/javascript/docs/FormatTest.md b/samples/client/petstore/javascript/docs/FormatTest.md
new file mode 100644
index 00000000000..57a4fb132d5
--- /dev/null
+++ b/samples/client/petstore/javascript/docs/FormatTest.md
@@ -0,0 +1,18 @@
+# SwaggerPetstore.FormatTest
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**integer** | **Integer** |  | [optional] 
+**int32** | **Integer** |  | [optional] 
+**int64** | **Integer** |  | [optional] 
+**_number** | **Number** |  | 
+**_float** | **Number** |  | [optional] 
+**_double** | **Number** |  | [optional] 
+**_string** | **String** |  | [optional] 
+**_byte** | **String** |  | [optional] 
+**binary** | **String** |  | [optional] 
+**_date** | **Date** |  | [optional] 
+**dateTime** | **String** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript/docs/Name.md b/samples/client/petstore/javascript/docs/Name.md
index 5086f6c5a3e..f0e693f2f56 100644
--- a/samples/client/petstore/javascript/docs/Name.md
+++ b/samples/client/petstore/javascript/docs/Name.md
@@ -3,7 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**name** | **Integer** |  | [optional] 
+**name** | **Integer** |  | 
 **snakeCase** | **Integer** |  | [optional] 
 
 
diff --git a/samples/client/petstore/javascript/docs/PetApi.md b/samples/client/petstore/javascript/docs/PetApi.md
index e33bf7c3b12..35a760e218b 100644
--- a/samples/client/petstore/javascript/docs/PetApi.md
+++ b/samples/client/petstore/javascript/docs/PetApi.md
@@ -5,13 +5,13 @@ All URIs are relative to *http://petstore.swagger.io/v2*
 Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**addPet**](PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
-[**addPetUsingByteArray**](PetApi.md#addPetUsingByteArray) | **POST** /pet?testing_byte_array=true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
+[**addPetUsingByteArray**](PetApi.md#addPetUsingByteArray) | **POST** /pet?testing_byte_array&#x3D;true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
 [**deletePet**](PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
 [**findPetsByStatus**](PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status
 [**findPetsByTags**](PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags
 [**getPetById**](PetApi.md#getPetById) | **GET** /pet/{petId} | Find pet by ID
-[**getPetByIdInObject**](PetApi.md#getPetByIdInObject) | **GET** /pet/{petId}?response=inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
-[**petPetIdtestingByteArraytrueGet**](PetApi.md#petPetIdtestingByteArraytrueGet) | **GET** /pet/{petId}?testing_byte_array=true | Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+[**getPetByIdInObject**](PetApi.md#getPetByIdInObject) | **GET** /pet/{petId}?response&#x3D;inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+[**petPetIdtestingByteArraytrueGet**](PetApi.md#petPetIdtestingByteArraytrueGet) | **GET** /pet/{petId}?testing_byte_array&#x3D;true | Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
 [**updatePet**](PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 [**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 [**uploadFile**](PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
@@ -64,7 +64,7 @@ null (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
  - **Accept**: application/json, application/xml
@@ -116,7 +116,7 @@ null (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
  - **Accept**: application/json, application/xml
@@ -171,7 +171,7 @@ null (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -223,7 +223,7 @@ Name | Type | Description  | Notes
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -275,7 +275,7 @@ Name | Type | Description  | Notes
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -332,7 +332,7 @@ Name | Type | Description  | Notes
 
 [api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -389,7 +389,7 @@ Name | Type | Description  | Notes
 
 [api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -446,7 +446,7 @@ Name | Type | Description  | Notes
 
 [api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -498,7 +498,7 @@ null (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
  - **Accept**: application/json, application/xml
@@ -555,7 +555,7 @@ null (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: application/json, application/xml
@@ -612,7 +612,7 @@ null (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: multipart/form-data
  - **Accept**: application/json, application/xml
diff --git a/samples/client/petstore/javascript/docs/StoreApi.md b/samples/client/petstore/javascript/docs/StoreApi.md
index b2ea41e35ee..6ad8406dfc9 100644
--- a/samples/client/petstore/javascript/docs/StoreApi.md
+++ b/samples/client/petstore/javascript/docs/StoreApi.md
@@ -7,7 +7,7 @@ Method | HTTP request | Description
 [**deleteOrder**](StoreApi.md#deleteOrder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
 [**findOrdersByStatus**](StoreApi.md#findOrdersByStatus) | **GET** /store/findByStatus | Finds orders by status
 [**getInventory**](StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
-[**getInventoryInObject**](StoreApi.md#getInventoryInObject) | **GET** /store/inventory?response=arbitrary_object | Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+[**getInventoryInObject**](StoreApi.md#getInventoryInObject) | **GET** /store/inventory?response&#x3D;arbitrary_object | Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
 [**getOrderById**](StoreApi.md#getOrderById) | **GET** /store/order/{orderId} | Find purchase order by ID
 [**placeOrder**](StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet
 
@@ -53,7 +53,7 @@ null (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -113,7 +113,7 @@ Name | Type | Description  | Notes
 
 [test_api_client_id](../README.md#test_api_client_id), [test_api_client_secret](../README.md#test_api_client_secret)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -160,7 +160,7 @@ This endpoint does not need any parameter.
 
 [api_key](../README.md#api_key)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -207,7 +207,7 @@ This endpoint does not need any parameter.
 
 [api_key](../README.md#api_key)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -218,7 +218,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
 
 ### Example
 ```javascript
@@ -266,7 +266,7 @@ Name | Type | Description  | Notes
 
 [test_api_key_header](../README.md#test_api_key_header), [test_api_key_query](../README.md#test_api_key_query)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -326,7 +326,7 @@ Name | Type | Description  | Notes
 
 [test_api_client_id](../README.md#test_api_client_id), [test_api_client_secret](../README.md#test_api_client_secret)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
diff --git a/samples/client/petstore/javascript/docs/UserApi.md b/samples/client/petstore/javascript/docs/UserApi.md
index f2fcf2c4b52..4e990c89426 100644
--- a/samples/client/petstore/javascript/docs/UserApi.md
+++ b/samples/client/petstore/javascript/docs/UserApi.md
@@ -56,7 +56,7 @@ null (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -103,7 +103,7 @@ null (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -150,7 +150,7 @@ null (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -202,7 +202,7 @@ null (empty response body)
 
 [test_http_basic](../README.md#test_http_basic)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -221,7 +221,7 @@ var SwaggerPetstore = require('swagger-petstore');
 
 var apiInstance = new SwaggerPetstore.UserApi()
 
-var username = "username_example"; // {String} The name that needs to be fetched. Use user1 for testing.
+var username = "username_example"; // {String} The name that needs to be fetched. Use user1 for testing. 
 
 
 var callback = function(error, data, response) {
@@ -238,7 +238,7 @@ api.getUserByName(username, callback);
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **username** | **String**| The name that needs to be fetched. Use user1 for testing. | 
+ **username** | **String**| The name that needs to be fetched. Use user1 for testing.  | 
 
 ### Return type
 
@@ -248,7 +248,7 @@ Name | Type | Description  | Notes
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -297,7 +297,7 @@ Name | Type | Description  | Notes
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -337,7 +337,7 @@ null (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -387,7 +387,7 @@ null (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
diff --git a/samples/client/petstore/javascript/src/ApiClient.js b/samples/client/petstore/javascript/src/ApiClient.js
index 71dd888d7d9..2b6c0c5b192 100644
--- a/samples/client/petstore/javascript/src/ApiClient.js
+++ b/samples/client/petstore/javascript/src/ApiClient.js
@@ -48,7 +48,6 @@
       'test_api_key_query': {type: 'apiKey', 'in': 'query', name: 'test_api_key_query'},
       'petstore_auth': {type: 'oauth2'}
     };
-
     /**
      * The default HTTP headers to be included for all API calls.
      * @type {Array.<String>}
diff --git a/samples/client/petstore/javascript/src/api/StoreApi.js b/samples/client/petstore/javascript/src/api/StoreApi.js
index bcef8b433c1..cdda27abba4 100644
--- a/samples/client/petstore/javascript/src/api/StoreApi.js
+++ b/samples/client/petstore/javascript/src/api/StoreApi.js
@@ -208,7 +208,7 @@
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
      * @param {String} orderId ID of pet that needs to be fetched
      * @param {module:api/StoreApi~getOrderByIdCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {module:model/Order}
diff --git a/samples/client/petstore/javascript/src/api/UserApi.js b/samples/client/petstore/javascript/src/api/UserApi.js
index 3060a13e70c..30f18bbb755 100644
--- a/samples/client/petstore/javascript/src/api/UserApi.js
+++ b/samples/client/petstore/javascript/src/api/UserApi.js
@@ -211,7 +211,7 @@
     /**
      * Get user by user name
      * 
-     * @param {String} username The name that needs to be fetched. Use user1 for testing.
+     * @param {String} username The name that needs to be fetched. Use user1 for testing. 
      * @param {module:api/UserApi~getUserByNameCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {module:model/User}
      */
diff --git a/samples/client/petstore/javascript/src/index.js b/samples/client/petstore/javascript/src/index.js
index da193f80e4d..c29f14094f9 100644
--- a/samples/client/petstore/javascript/src/index.js
+++ b/samples/client/petstore/javascript/src/index.js
@@ -1,16 +1,16 @@
 (function(factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.
-    define(['./ApiClient', './model/Animal', './model/Cat', './model/Category', './model/Dog', './model/InlineResponse200', './model/Model200Response', './model/ModelReturn', './model/Name', './model/Order', './model/Pet', './model/SpecialModelName', './model/Tag', './model/User', './api/PetApi', './api/StoreApi', './api/UserApi'], factory);
+    define(['./ApiClient', './model/Animal', './model/Cat', './model/Category', './model/Dog', './model/FormatTest', './model/InlineResponse200', './model/Model200Response', './model/ModelReturn', './model/Name', './model/Order', './model/Pet', './model/SpecialModelName', './model/Tag', './model/User', './api/PetApi', './api/StoreApi', './api/UserApi'], factory);
   } else if (typeof module === 'object' && module.exports) {
     // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('./ApiClient'), require('./model/Animal'), require('./model/Cat'), require('./model/Category'), require('./model/Dog'), require('./model/InlineResponse200'), require('./model/Model200Response'), require('./model/ModelReturn'), require('./model/Name'), require('./model/Order'), require('./model/Pet'), require('./model/SpecialModelName'), require('./model/Tag'), require('./model/User'), require('./api/PetApi'), require('./api/StoreApi'), require('./api/UserApi'));
+    module.exports = factory(require('./ApiClient'), require('./model/Animal'), require('./model/Cat'), require('./model/Category'), require('./model/Dog'), require('./model/FormatTest'), require('./model/InlineResponse200'), require('./model/Model200Response'), require('./model/ModelReturn'), require('./model/Name'), require('./model/Order'), require('./model/Pet'), require('./model/SpecialModelName'), require('./model/Tag'), require('./model/User'), require('./api/PetApi'), require('./api/StoreApi'), require('./api/UserApi'));
   }
-}(function(ApiClient, Animal, Cat, Category, Dog, InlineResponse200, Model200Response, ModelReturn, Name, Order, Pet, SpecialModelName, Tag, User, PetApi, StoreApi, UserApi) {
+}(function(ApiClient, Animal, Cat, Category, Dog, FormatTest, InlineResponse200, Model200Response, ModelReturn, Name, Order, Pet, SpecialModelName, Tag, User, PetApi, StoreApi, UserApi) {
   'use strict';
 
   /**
-   * This is a sample server Petstore server.  You can find out more about Swagger at &lt;a href=\&quot;http://swagger.io\&quot;&gt;http://swagger.io&lt;/a&gt; or on irc.freenode.net, #swagger.  For this sample, you can use the api key \&quot;special-key\&quot; to test the authorization filters.<br>
+   * This is a sample server Petstore server.  You can find out more about Swagger at &lt;a href&#x3D;\&quot;http://swagger.io\&quot;&gt;http://swagger.io&lt;/a&gt; or on irc.freenode.net, #swagger.  For this sample, you can use the api key \&quot;special-key\&quot; to test the authorization filters.<br>
    * The <code>index</code> module provides access to constructors for all the classes which comprise the public API.
    * <p>
    * An AMD (recommended!) or CommonJS application will generally do something equivalent to the following:
@@ -66,6 +66,11 @@
      * @property {module:model/Dog}
      */
     Dog: Dog,
+    /**
+     * The FormatTest model constructor.
+     * @property {module:model/FormatTest}
+     */
+    FormatTest: FormatTest,
     /**
      * The InlineResponse200 model constructor.
      * @property {module:model/InlineResponse200}
diff --git a/samples/client/petstore/javascript/src/model/FormatTest.js b/samples/client/petstore/javascript/src/model/FormatTest.js
new file mode 100644
index 00000000000..46a9bc854fc
--- /dev/null
+++ b/samples/client/petstore/javascript/src/model/FormatTest.js
@@ -0,0 +1,153 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['../ApiClient'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.FormatTest = factory(root.SwaggerPetstore.ApiClient);
+  }
+}(this, function(ApiClient) {
+  'use strict';
+
+  /**
+   * The FormatTest model module.
+   * @module model/FormatTest
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new <code>FormatTest</code>.
+   * @alias module:model/FormatTest
+   * @class
+   * @param _number
+   */
+  var exports = function(_number) {
+
+
+
+
+    this['number'] = _number;
+
+
+
+
+
+
+
+  };
+
+  /**
+   * Constructs a <code>FormatTest</code> from a plain JavaScript object, optionally creating a new instance.
+   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+   * @param {Object} data The plain JavaScript object bearing properties of interest.
+   * @param {module:model/FormatTest} obj Optional instance to populate.
+   * @return {module:model/FormatTest} The populated <code>FormatTest</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) { 
+      obj = obj || new exports();
+
+      if (data.hasOwnProperty('integer')) {
+        obj['integer'] = ApiClient.convertToType(data['integer'], 'Integer');
+      }
+      if (data.hasOwnProperty('int32')) {
+        obj['int32'] = ApiClient.convertToType(data['int32'], 'Integer');
+      }
+      if (data.hasOwnProperty('int64')) {
+        obj['int64'] = ApiClient.convertToType(data['int64'], 'Integer');
+      }
+      if (data.hasOwnProperty('number')) {
+        obj['number'] = ApiClient.convertToType(data['number'], 'Number');
+      }
+      if (data.hasOwnProperty('float')) {
+        obj['float'] = ApiClient.convertToType(data['float'], 'Number');
+      }
+      if (data.hasOwnProperty('double')) {
+        obj['double'] = ApiClient.convertToType(data['double'], 'Number');
+      }
+      if (data.hasOwnProperty('string')) {
+        obj['string'] = ApiClient.convertToType(data['string'], 'String');
+      }
+      if (data.hasOwnProperty('byte')) {
+        obj['byte'] = ApiClient.convertToType(data['byte'], 'String');
+      }
+      if (data.hasOwnProperty('binary')) {
+        obj['binary'] = ApiClient.convertToType(data['binary'], 'String');
+      }
+      if (data.hasOwnProperty('date')) {
+        obj['date'] = ApiClient.convertToType(data['date'], 'Date');
+      }
+      if (data.hasOwnProperty('dateTime')) {
+        obj['dateTime'] = ApiClient.convertToType(data['dateTime'], 'String');
+      }
+    }
+    return obj;
+  }
+
+
+  /**
+   * @member {Integer} integer
+   */
+  exports.prototype['integer'] = undefined;
+
+  /**
+   * @member {Integer} int32
+   */
+  exports.prototype['int32'] = undefined;
+
+  /**
+   * @member {Integer} int64
+   */
+  exports.prototype['int64'] = undefined;
+
+  /**
+   * @member {Number} number
+   */
+  exports.prototype['number'] = undefined;
+
+  /**
+   * @member {Number} float
+   */
+  exports.prototype['float'] = undefined;
+
+  /**
+   * @member {Number} double
+   */
+  exports.prototype['double'] = undefined;
+
+  /**
+   * @member {String} string
+   */
+  exports.prototype['string'] = undefined;
+
+  /**
+   * @member {String} byte
+   */
+  exports.prototype['byte'] = undefined;
+
+  /**
+   * @member {String} binary
+   */
+  exports.prototype['binary'] = undefined;
+
+  /**
+   * @member {Date} date
+   */
+  exports.prototype['date'] = undefined;
+
+  /**
+   * @member {String} dateTime
+   */
+  exports.prototype['dateTime'] = undefined;
+
+
+
+
+  return exports;
+}));
diff --git a/samples/client/petstore/javascript/src/model/Model200Response.js b/samples/client/petstore/javascript/src/model/Model200Response.js
index fb559f5ebaa..1682ed079fc 100644
--- a/samples/client/petstore/javascript/src/model/Model200Response.js
+++ b/samples/client/petstore/javascript/src/model/Model200Response.js
@@ -23,6 +23,7 @@
 
   /**
    * Constructs a new <code>Model200Response</code>.
+   * Model for testing model name starting with number
    * @alias module:model/Model200Response
    * @class
    */
diff --git a/samples/client/petstore/javascript/src/model/ModelReturn.js b/samples/client/petstore/javascript/src/model/ModelReturn.js
index d5036e230ea..86d28d038a9 100644
--- a/samples/client/petstore/javascript/src/model/ModelReturn.js
+++ b/samples/client/petstore/javascript/src/model/ModelReturn.js
@@ -23,6 +23,7 @@
 
   /**
    * Constructs a new <code>ModelReturn</code>.
+   * Model for testing reserved words
    * @alias module:model/ModelReturn
    * @class
    */
diff --git a/samples/client/petstore/javascript/src/model/Name.js b/samples/client/petstore/javascript/src/model/Name.js
index a5a070025f7..c8bd6862c97 100644
--- a/samples/client/petstore/javascript/src/model/Name.js
+++ b/samples/client/petstore/javascript/src/model/Name.js
@@ -23,12 +23,14 @@
 
   /**
    * Constructs a new <code>Name</code>.
+   * Model for testing model name same as property name
    * @alias module:model/Name
    * @class
+   * @param name
    */
-  var exports = function() {
-
+  var exports = function(name) {
 
+    this['name'] = name;
 
   };
 
diff --git a/samples/client/petstore/objc/README.md b/samples/client/petstore/objc/README.md
index 8da8058bc76..5223de2bc98 100644
--- a/samples/client/petstore/objc/README.md
+++ b/samples/client/petstore/objc/README.md
@@ -6,7 +6,7 @@ This ObjC package is automatically generated by the [Swagger Codegen](https://gi
 
 - API version: 1.0.0
 - Package version: 
-- Build date: 2016-04-10T18:34:45.604+08:00
+- Build date: 2016-04-12T15:30:12.334+08:00
 - Build package: class io.swagger.codegen.languages.ObjcClientCodegen
 
 ## Requirements
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGPetApi.h b/samples/client/petstore/objc/SwaggerClient/SWGPetApi.h
index 1142ff5311f..7f3abaa3949 100644
--- a/samples/client/petstore/objc/SwaggerClient/SWGPetApi.h
+++ b/samples/client/petstore/objc/SwaggerClient/SWGPetApi.h
@@ -25,7 +25,7 @@
 /// Add a new pet to the store
 /// 
 ///
-/// @param body Pet object that needs to be added to the store
+/// @param body Pet object that needs to be added to the store (optional)
 /// 
 ///
 /// @return 
@@ -38,7 +38,7 @@
 /// Fake endpoint to test byte array in body parameter for adding a new pet to the store
 /// 
 ///
-/// @param body Pet object in the form of byte array
+/// @param body Pet object in the form of byte array (optional)
 /// 
 ///
 /// @return 
@@ -52,7 +52,7 @@
 /// 
 ///
 /// @param petId Pet id to delete
-/// @param apiKey 
+/// @param apiKey  (optional)
 /// 
 ///
 /// @return 
@@ -66,7 +66,7 @@
 /// Finds Pets by status
 /// Multiple status values can be provided with comma separated strings
 ///
-/// @param status Status values that need to be considered for query
+/// @param status Status values that need to be considered for query (optional) (default to available)
 /// 
 ///
 /// @return NSArray<SWGPet>*
@@ -79,7 +79,7 @@
 /// Finds Pets by tags
 /// Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
 ///
-/// @param tags Tags to filter by
+/// @param tags Tags to filter by (optional)
 /// 
 ///
 /// @return NSArray<SWGPet>*
@@ -131,7 +131,7 @@
 /// Update an existing pet
 /// 
 ///
-/// @param body Pet object that needs to be added to the store
+/// @param body Pet object that needs to be added to the store (optional)
 /// 
 ///
 /// @return 
@@ -145,8 +145,8 @@
 /// 
 ///
 /// @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 name Updated name of the pet (optional)
+/// @param status Updated status of the pet (optional)
 /// 
 ///
 /// @return 
@@ -162,8 +162,8 @@
 /// 
 ///
 /// @param petId ID of pet to update
-/// @param additionalMetadata Additional data to pass to server
-/// @param file file to upload
+/// @param additionalMetadata Additional data to pass to server (optional)
+/// @param file file to upload (optional)
 /// 
 ///
 /// @return 
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGStoreApi.h b/samples/client/petstore/objc/SwaggerClient/SWGStoreApi.h
index d565a01e15b..039f07c8df7 100644
--- a/samples/client/petstore/objc/SwaggerClient/SWGStoreApi.h
+++ b/samples/client/petstore/objc/SwaggerClient/SWGStoreApi.h
@@ -37,7 +37,7 @@
 /// Finds orders by status
 /// A single status value can be provided as a string
 ///
-/// @param status Status value that needs to be considered for query
+/// @param status Status value that needs to be considered for query (optional) (default to placed)
 /// 
 ///
 /// @return NSArray<SWGOrder>*
@@ -87,7 +87,7 @@
 /// Place an order for a pet
 /// 
 ///
-/// @param body order placed for purchasing the pet
+/// @param body order placed for purchasing the pet (optional)
 /// 
 ///
 /// @return SWGOrder*
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGUserApi.h b/samples/client/petstore/objc/SwaggerClient/SWGUserApi.h
index aa1c99c6595..6f3561dfbf3 100644
--- a/samples/client/petstore/objc/SwaggerClient/SWGUserApi.h
+++ b/samples/client/petstore/objc/SwaggerClient/SWGUserApi.h
@@ -24,7 +24,7 @@
 /// Create user
 /// This can only be done by the logged in user.
 ///
-/// @param body Created user object
+/// @param body Created user object (optional)
 /// 
 ///
 /// @return 
@@ -37,7 +37,7 @@
 /// Creates list of users with given input array
 /// 
 ///
-/// @param body List of user object
+/// @param body List of user object (optional)
 /// 
 ///
 /// @return 
@@ -50,7 +50,7 @@
 /// Creates list of users with given input array
 /// 
 ///
-/// @param body List of user object
+/// @param body List of user object (optional)
 /// 
 ///
 /// @return 
@@ -89,8 +89,8 @@
 /// Logs user into the system
 /// 
 ///
-/// @param username The user name for login
-/// @param password The password for login in clear text
+/// @param username The user name for login (optional)
+/// @param password The password for login in clear text (optional)
 /// 
 ///
 /// @return NSString*
@@ -117,7 +117,7 @@
 /// This can only be done by the logged in user.
 ///
 /// @param username name that need to be deleted
-/// @param body Updated user object
+/// @param body Updated user object (optional)
 /// 
 ///
 /// @return 
diff --git a/samples/client/petstore/perl/README.md b/samples/client/petstore/perl/README.md
index 72fc2e26429..a4c5c47558a 100644
--- a/samples/client/petstore/perl/README.md
+++ b/samples/client/petstore/perl/README.md
@@ -2,7 +2,7 @@
 
 WWW::SwaggerClient::Role - a Moose role for the Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 # VERSION
 
@@ -10,7 +10,7 @@ Automatically generated by the [Swagger Codegen](https://github.com/swagger-api/
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build date: 2016-03-30T20:57:51.908+08:00
+- Build date: 2016-04-13T22:41:41.133+08:00
 - Build package: class io.swagger.codegen.languages.PerlClientCodegen
 
 ## A note on Moose
@@ -232,10 +232,11 @@ use WWW::SwaggerClient::UserApi;
 To load the models:
 ```perl
 use WWW::SwaggerClient::Object::Animal;
+use WWW::SwaggerClient::Object::ApiResponse;
 use WWW::SwaggerClient::Object::Cat;
 use WWW::SwaggerClient::Object::Category;
 use WWW::SwaggerClient::Object::Dog;
-use WWW::SwaggerClient::Object::InlineResponse200;
+use WWW::SwaggerClient::Object::FormatTest;
 use WWW::SwaggerClient::Object::Model200Response;
 use WWW::SwaggerClient::Object::ModelReturn;
 use WWW::SwaggerClient::Object::Name;
@@ -261,10 +262,11 @@ use WWW::SwaggerClient::UserApi;
 
 # load the models
 use WWW::SwaggerClient::Object::Animal;
+use WWW::SwaggerClient::Object::ApiResponse;
 use WWW::SwaggerClient::Object::Cat;
 use WWW::SwaggerClient::Object::Category;
 use WWW::SwaggerClient::Object::Dog;
-use WWW::SwaggerClient::Object::InlineResponse200;
+use WWW::SwaggerClient::Object::FormatTest;
 use WWW::SwaggerClient::Object::Model200Response;
 use WWW::SwaggerClient::Object::ModelReturn;
 use WWW::SwaggerClient::Object::Name;
@@ -299,20 +301,15 @@ All URIs are relative to *http://petstore.swagger.io/v2*
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
 *PetApi* | [**add_pet**](docs/PetApi.md#add_pet) | **POST** /pet | Add a new pet to the store
-*PetApi* | [**add_pet_using_byte_array**](docs/PetApi.md#add_pet_using_byte_array) | **POST** /pet?testing_byte_array=true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
 *PetApi* | [**delete_pet**](docs/PetApi.md#delete_pet) | **DELETE** /pet/{petId} | Deletes a pet
 *PetApi* | [**find_pets_by_status**](docs/PetApi.md#find_pets_by_status) | **GET** /pet/findByStatus | Finds Pets by status
 *PetApi* | [**find_pets_by_tags**](docs/PetApi.md#find_pets_by_tags) | **GET** /pet/findByTags | Finds Pets by tags
 *PetApi* | [**get_pet_by_id**](docs/PetApi.md#get_pet_by_id) | **GET** /pet/{petId} | Find pet by ID
-*PetApi* | [**get_pet_by_id_in_object**](docs/PetApi.md#get_pet_by_id_in_object) | **GET** /pet/{petId}?response=inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
-*PetApi* | [**pet_pet_idtesting_byte_arraytrue_get**](docs/PetApi.md#pet_pet_idtesting_byte_arraytrue_get) | **GET** /pet/{petId}?testing_byte_array=true | Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
 *PetApi* | [**update_pet**](docs/PetApi.md#update_pet) | **PUT** /pet | Update an existing pet
 *PetApi* | [**update_pet_with_form**](docs/PetApi.md#update_pet_with_form) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *PetApi* | [**upload_file**](docs/PetApi.md#upload_file) | **POST** /pet/{petId}/uploadImage | uploads an image
 *StoreApi* | [**delete_order**](docs/StoreApi.md#delete_order) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
-*StoreApi* | [**find_orders_by_status**](docs/StoreApi.md#find_orders_by_status) | **GET** /store/findByStatus | Finds orders by status
 *StoreApi* | [**get_inventory**](docs/StoreApi.md#get_inventory) | **GET** /store/inventory | Returns pet inventories by status
-*StoreApi* | [**get_inventory_in_object**](docs/StoreApi.md#get_inventory_in_object) | **GET** /store/inventory?response=arbitrary_object | Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
 *StoreApi* | [**get_order_by_id**](docs/StoreApi.md#get_order_by_id) | **GET** /store/order/{orderId} | Find purchase order by ID
 *StoreApi* | [**place_order**](docs/StoreApi.md#place_order) | **POST** /store/order | Place an order for a pet
 *UserApi* | [**create_user**](docs/UserApi.md#create_user) | **POST** /user | Create user
@@ -327,10 +324,11 @@ Class | Method | HTTP request | Description
 
 # DOCUMENTATION FOR MODELS
  - [WWW::SwaggerClient::Object::Animal](docs/Animal.md)
+ - [WWW::SwaggerClient::Object::ApiResponse](docs/ApiResponse.md)
  - [WWW::SwaggerClient::Object::Cat](docs/Cat.md)
  - [WWW::SwaggerClient::Object::Category](docs/Category.md)
  - [WWW::SwaggerClient::Object::Dog](docs/Dog.md)
- - [WWW::SwaggerClient::Object::InlineResponse200](docs/InlineResponse200.md)
+ - [WWW::SwaggerClient::Object::FormatTest](docs/FormatTest.md)
  - [WWW::SwaggerClient::Object::Model200Response](docs/Model200Response.md)
  - [WWW::SwaggerClient::Object::ModelReturn](docs/ModelReturn.md)
  - [WWW::SwaggerClient::Object::Name](docs/Name.md)
@@ -343,40 +341,12 @@ Class | Method | HTTP request | Description
 
 # DOCUMENTATION FOR AUTHORIATION
 
-## test_api_key_header
-
-- **Type**: API key 
-- **API key parameter name**: test_api_key_header
-- **Location**: HTTP header
-
 ## api_key
 
 - **Type**: API key 
 - **API key parameter name**: api_key
 - **Location**: HTTP header
 
-## test_http_basic
-
-- **Type**: HTTP basic authentication
-
-## test_api_client_secret
-
-- **Type**: API key 
-- **API key parameter name**: x-test_api_client_secret
-- **Location**: HTTP header
-
-## test_api_client_id
-
-- **Type**: API key 
-- **API key parameter name**: x-test_api_client_id
-- **Location**: HTTP header
-
-## test_api_key_query
-
-- **Type**: API key 
-- **API key parameter name**: test_api_key_query
-- **Location**: URL query string
-
 ## petstore_auth
 
 - **Type**: OAuth
diff --git a/samples/client/petstore/perl/docs/ApiResponse.md b/samples/client/petstore/perl/docs/ApiResponse.md
new file mode 100644
index 00000000000..914cebf88ed
--- /dev/null
+++ b/samples/client/petstore/perl/docs/ApiResponse.md
@@ -0,0 +1,17 @@
+# WWW::SwaggerClient::Object::ApiResponse
+
+## Load the model package
+```perl
+use WWW::SwaggerClient::Object::ApiResponse;
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**code** | **int** |  | [optional] 
+**type** | **string** |  | [optional] 
+**message** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/perl/docs/FormatTest.md b/samples/client/petstore/perl/docs/FormatTest.md
new file mode 100644
index 00000000000..60cd71ac61f
--- /dev/null
+++ b/samples/client/petstore/perl/docs/FormatTest.md
@@ -0,0 +1,26 @@
+# WWW::SwaggerClient::Object::FormatTest
+
+## Load the model package
+```perl
+use WWW::SwaggerClient::Object::FormatTest;
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**integer** | **int** |  | [optional] 
+**int32** | **int** |  | [optional] 
+**int64** | **int** |  | [optional] 
+**number** | [**Number**](Number.md) |  | 
+**float** | **double** |  | [optional] 
+**double** | **double** |  | [optional] 
+**string** | **string** |  | [optional] 
+**byte** | **string** |  | [optional] 
+**binary** | **string** |  | [optional] 
+**date** | **DateTime** |  | [optional] 
+**date_time** | **DateTime** |  | [optional] 
+**password** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/perl/docs/Name.md b/samples/client/petstore/perl/docs/Name.md
index 13b5d0dde82..7109642a08b 100644
--- a/samples/client/petstore/perl/docs/Name.md
+++ b/samples/client/petstore/perl/docs/Name.md
@@ -8,7 +8,7 @@ use WWW::SwaggerClient::Object::Name;
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**name** | **int** |  | [optional] 
+**name** | **int** |  | 
 **snake_case** | **int** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/client/petstore/perl/docs/Order.md b/samples/client/petstore/perl/docs/Order.md
index 542a3a91240..cffb6a6af23 100644
--- a/samples/client/petstore/perl/docs/Order.md
+++ b/samples/client/petstore/perl/docs/Order.md
@@ -13,7 +13,7 @@ Name | Type | Description | Notes
 **quantity** | **int** |  | [optional] 
 **ship_date** | **DateTime** |  | [optional] 
 **status** | **string** | Order Status | [optional] 
-**complete** | **boolean** |  | [optional] 
+**complete** | **boolean** |  | [optional] [default to false]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/perl/docs/PetApi.md b/samples/client/petstore/perl/docs/PetApi.md
index 971dc0772c8..c696eac92cd 100644
--- a/samples/client/petstore/perl/docs/PetApi.md
+++ b/samples/client/petstore/perl/docs/PetApi.md
@@ -10,13 +10,13 @@ All URIs are relative to *http://petstore.swagger.io/v2*
 Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**add_pet**](PetApi.md#add_pet) | **POST** /pet | Add a new pet to the store
-[**add_pet_using_byte_array**](PetApi.md#add_pet_using_byte_array) | **POST** /pet?testing_byte_array=true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
+[**add_pet_using_byte_array**](PetApi.md#add_pet_using_byte_array) | **POST** /pet?testing_byte_array&#x3D;true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
 [**delete_pet**](PetApi.md#delete_pet) | **DELETE** /pet/{petId} | Deletes a pet
 [**find_pets_by_status**](PetApi.md#find_pets_by_status) | **GET** /pet/findByStatus | Finds Pets by status
 [**find_pets_by_tags**](PetApi.md#find_pets_by_tags) | **GET** /pet/findByTags | Finds Pets by tags
 [**get_pet_by_id**](PetApi.md#get_pet_by_id) | **GET** /pet/{petId} | Find pet by ID
-[**get_pet_by_id_in_object**](PetApi.md#get_pet_by_id_in_object) | **GET** /pet/{petId}?response=inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
-[**pet_pet_idtesting_byte_arraytrue_get**](PetApi.md#pet_pet_idtesting_byte_arraytrue_get) | **GET** /pet/{petId}?testing_byte_array=true | Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+[**get_pet_by_id_in_object**](PetApi.md#get_pet_by_id_in_object) | **GET** /pet/{petId}?response&#x3D;inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+[**pet_pet_idtesting_byte_arraytrue_get**](PetApi.md#pet_pet_idtesting_byte_arraytrue_get) | **GET** /pet/{petId}?testing_byte_array&#x3D;true | Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
 [**update_pet**](PetApi.md#update_pet) | **PUT** /pet | Update an existing pet
 [**update_pet_with_form**](PetApi.md#update_pet_with_form) | **POST** /pet/{petId} | Updates a pet in the store with form data
 [**upload_file**](PetApi.md#upload_file) | **POST** /pet/{petId}/uploadImage | uploads an image
@@ -61,7 +61,7 @@ void (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
  - **Accept**: application/json, application/xml
@@ -107,7 +107,7 @@ void (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
  - **Accept**: application/json, application/xml
@@ -155,7 +155,7 @@ void (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -202,7 +202,7 @@ Name | Type | Description  | Notes
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -249,7 +249,7 @@ Name | Type | Description  | Notes
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -300,7 +300,7 @@ Name | Type | Description  | Notes
 
 [api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -351,7 +351,7 @@ Name | Type | Description  | Notes
 
 [api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -402,7 +402,7 @@ Name | Type | Description  | Notes
 
 [api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -448,7 +448,7 @@ void (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
  - **Accept**: application/json, application/xml
@@ -498,7 +498,7 @@ void (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: application/json, application/xml
@@ -548,7 +548,7 @@ void (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: multipart/form-data
  - **Accept**: application/json, application/xml
diff --git a/samples/client/petstore/perl/docs/StoreApi.md b/samples/client/petstore/perl/docs/StoreApi.md
index 7b9e35c977d..15b02bca3fd 100644
--- a/samples/client/petstore/perl/docs/StoreApi.md
+++ b/samples/client/petstore/perl/docs/StoreApi.md
@@ -12,7 +12,7 @@ Method | HTTP request | Description
 [**delete_order**](StoreApi.md#delete_order) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
 [**find_orders_by_status**](StoreApi.md#find_orders_by_status) | **GET** /store/findByStatus | Finds orders by status
 [**get_inventory**](StoreApi.md#get_inventory) | **GET** /store/inventory | Returns pet inventories by status
-[**get_inventory_in_object**](StoreApi.md#get_inventory_in_object) | **GET** /store/inventory?response=arbitrary_object | Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+[**get_inventory_in_object**](StoreApi.md#get_inventory_in_object) | **GET** /store/inventory?response&#x3D;arbitrary_object | Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
 [**get_order_by_id**](StoreApi.md#get_order_by_id) | **GET** /store/order/{orderId} | Find purchase order by ID
 [**place_order**](StoreApi.md#place_order) | **POST** /store/order | Place an order for a pet
 
@@ -53,7 +53,7 @@ void (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -106,7 +106,7 @@ Name | Type | Description  | Notes
 
 [test_api_client_id](../README.md#test_api_client_id), [test_api_client_secret](../README.md#test_api_client_secret)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -151,7 +151,7 @@ This endpoint does not need any parameter.
 
 [api_key](../README.md#api_key)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -196,7 +196,7 @@ This endpoint does not need any parameter.
 
 [api_key](../README.md#api_key)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -249,7 +249,7 @@ Name | Type | Description  | Notes
 
 [test_api_key_header](../README.md#test_api_key_header), [test_api_key_query](../README.md#test_api_key_query)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -302,7 +302,7 @@ Name | Type | Description  | Notes
 
 [test_api_client_id](../README.md#test_api_client_id), [test_api_client_secret](../README.md#test_api_client_secret)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
diff --git a/samples/client/petstore/perl/docs/UserApi.md b/samples/client/petstore/perl/docs/UserApi.md
index 7330c1b3980..faa4c799739 100644
--- a/samples/client/petstore/perl/docs/UserApi.md
+++ b/samples/client/petstore/perl/docs/UserApi.md
@@ -45,7 +45,7 @@ if ($@) {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**User**](User.md)| Created user object | [optional] 
+ **body** | [**User**](User.md)| Created user object | 
 
 ### Return type
 
@@ -55,10 +55,10 @@ void (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
@@ -88,7 +88,7 @@ if ($@) {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**ARRAY[User]**](User.md)| List of user object | [optional] 
+ **body** | [**ARRAY[User]**](User.md)| List of user object | 
 
 ### Return type
 
@@ -98,10 +98,10 @@ void (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
@@ -131,7 +131,7 @@ if ($@) {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**ARRAY[User]**](User.md)| List of user object | [optional] 
+ **body** | [**ARRAY[User]**](User.md)| List of user object | 
 
 ### Return type
 
@@ -141,10 +141,10 @@ void (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
@@ -159,10 +159,6 @@ This can only be done by the logged in user.
 ```perl
 use Data::Dumper;
 
-# Configure HTTP basic authorization: test_http_basic
-$WWW::SwaggerClient::Configuration::username = 'YOUR_USERNAME';
-$WWW::SwaggerClient::Configuration::password = 'YOUR_PASSWORD';
-
 my $api_instance = WWW::SwaggerClient::UserApi->new();
 my $username = 'username_example'; # string | The name that needs to be deleted
 
@@ -186,12 +182,12 @@ void (empty response body)
 
 ### Authorization
 
-[test_http_basic](../README.md#test_http_basic)
+No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
@@ -207,7 +203,7 @@ Get user by user name
 use Data::Dumper;
 
 my $api_instance = WWW::SwaggerClient::UserApi->new();
-my $username = 'username_example'; # string | The name that needs to be fetched. Use user1 for testing.
+my $username = 'username_example'; # string | The name that needs to be fetched. Use user1 for testing. 
 
 eval { 
     my $result = $api_instance->get_user_by_name(username => $username);
@@ -222,7 +218,7 @@ if ($@) {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **username** | **string**| The name that needs to be fetched. Use user1 for testing. | 
+ **username** | **string**| The name that needs to be fetched. Use user1 for testing.  | 
 
 ### Return type
 
@@ -232,10 +228,10 @@ Name | Type | Description  | Notes
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
@@ -267,8 +263,8 @@ if ($@) {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **username** | **string**| The user name for login | [optional] 
- **password** | **string**| The password for login in clear text | [optional] 
+ **username** | **string**| The user name for login | 
+ **password** | **string**| The password for login in clear text | 
 
 ### Return type
 
@@ -278,10 +274,10 @@ Name | Type | Description  | Notes
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
@@ -317,10 +313,10 @@ void (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
@@ -352,7 +348,7 @@ if ($@) {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **username** | **string**| name that need to be deleted | 
- **body** | [**User**](User.md)| Updated user object | [optional] 
+ **body** | [**User**](User.md)| Updated user object | 
 
 ### Return type
 
@@ -362,10 +358,10 @@ void (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm
index 86dba7e1bcd..3dfa6633ee5 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm
@@ -319,13 +319,6 @@ sub update_params_for_auth {
         if (!defined($auth)) {
             # TODO show warning about auth setting not defined
         }
-        elsif ($auth eq 'test_api_key_header') {
-            
-            my $api_key = $self->get_api_key_with_prefix('test_api_key_header');
-            if ($api_key) {
-                $header_params->{'test_api_key_header'} = $api_key;
-            }
-        }
         elsif ($auth eq 'api_key') {
             
             my $api_key = $self->get_api_key_with_prefix('api_key');
@@ -333,40 +326,12 @@ sub update_params_for_auth {
                 $header_params->{'api_key'} = $api_key;
             }
         }
-        elsif ($auth eq 'test_http_basic') {
-            
-            if ($WWW::SwaggerClient::Configuration::username || $WWW::SwaggerClient::Configuration::password) {
-                $header_params->{'Authorization'} = 'Basic ' . encode_base64($WWW::SwaggerClient::Configuration::username . ":" . $WWW::SwaggerClient::Configuration::password);
-            }
-        }
-        elsif ($auth eq 'test_api_client_secret') {
-            
-            my $api_key = $self->get_api_key_with_prefix('x-test_api_client_secret');
-            if ($api_key) {
-                $header_params->{'x-test_api_client_secret'} = $api_key;
-            }
-        }
-        elsif ($auth eq 'test_api_client_id') {
-            
-            my $api_key = $self->get_api_key_with_prefix('x-test_api_client_id');
-            if ($api_key) {
-                $header_params->{'x-test_api_client_id'} = $api_key;
-            }
-        }
-        elsif ($auth eq 'test_api_key_query') {
-            
-            my $api_key = $self->get_api_key_with_prefix('test_api_key_query');
-            if ($api_key) {
-                $query_params->{'test_api_key_query'} = $api_key;
-            }
-        }
-        elsif ($auth eq 'petstore_auth') {
+elsif ($auth eq 'petstore_auth') {
             
             if ($WWW::SwaggerClient::Configuration::access_token) {
                 $header_params->{'Authorization'} = 'Bearer ' . $WWW::SwaggerClient::Configuration::access_token;
             }
         }
-        
         else {
        	    # TODO show warning about security definition not found
         }
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Animal.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Animal.pm
index c2e124ad8b4..eb1b10034e9 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Animal.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Animal.pm
@@ -110,7 +110,6 @@ __PACKAGE__->method_documentation({
     	format => '',
     	read_only => '',
     		},
-    
 });
 
 __PACKAGE__->swagger_types( {
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ApiResponse.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ApiResponse.pm
new file mode 100644
index 00000000000..9203da585b7
--- /dev/null
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ApiResponse.pm
@@ -0,0 +1,144 @@
+package WWW::SwaggerClient::Object::ApiResponse;
+
+require 5.6.0;
+use strict;
+use warnings;
+use utf8;
+use JSON qw(decode_json);
+use Data::Dumper;
+use Module::Runtime qw(use_module);
+use Log::Any qw($log);
+use Date::Parse;
+use DateTime;
+
+use base ("Class::Accessor", "Class::Data::Inheritable");
+
+
+#
+#
+#
+#NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+#
+
+__PACKAGE__->mk_classdata('attribute_map' => {});
+__PACKAGE__->mk_classdata('swagger_types' => {});
+__PACKAGE__->mk_classdata('method_documentation' => {}); 
+__PACKAGE__->mk_classdata('class_documentation' => {});
+
+# new object
+sub new { 
+    my ($class, %args) = @_; 
+
+	my $self = bless {}, $class;
+	
+	foreach my $attribute (keys %{$class->attribute_map}) {
+		my $args_key = $class->attribute_map->{$attribute};
+		$self->$attribute( $args{ $args_key } );
+	}
+	
+	return $self;
+}  
+
+# return perl hash
+sub to_hash {
+    return decode_json(JSON->new->convert_blessed->encode( shift ));
+}
+
+# used by JSON for serialization
+sub TO_JSON { 
+    my $self = shift;
+    my $_data = {};
+    foreach my $_key (keys %{$self->attribute_map}) {
+        if (defined $self->{$_key}) {
+            $_data->{$self->attribute_map->{$_key}} = $self->{$_key};
+        }
+    }
+    return $_data;
+}
+
+# from Perl hashref
+sub from_hash {
+    my ($self, $hash) = @_;
+
+    # loop through attributes and use swagger_types to deserialize the data
+    while ( my ($_key, $_type) = each %{$self->swagger_types} ) {
+    	my $_json_attribute = $self->attribute_map->{$_key}; 
+        if ($_type =~ /^array\[/i) { # array
+            my $_subclass = substr($_type, 6, -1);
+            my @_array = ();
+            foreach my $_element (@{$hash->{$_json_attribute}}) {
+                push @_array, $self->_deserialize($_subclass, $_element);
+            }
+            $self->{$_key} = \@_array;
+        } elsif (exists $hash->{$_json_attribute}) { #hash(model), primitive, datetime
+            $self->{$_key} = $self->_deserialize($_type, $hash->{$_json_attribute});
+        } else {
+        	$log->debugf("Warning: %s (%s) does not exist in input hash\n", $_key, $_json_attribute);
+        }
+    }
+  
+    return $self;
+}
+
+# deserialize non-array data
+sub _deserialize {
+    my ($self, $type, $data) = @_;
+    $log->debugf("deserializing %s with %s",Dumper($data), $type);
+        
+    if ($type eq 'DateTime') {
+        return DateTime->from_epoch(epoch => str2time($data));
+    } elsif ( grep( /^$type$/, ('int', 'double', 'string', 'boolean'))) {
+        return $data;
+    } else { # hash(model)
+        my $_instance = eval "WWW::SwaggerClient::Object::$type->new()";
+        return $_instance->from_hash($data);
+    }
+}
+
+
+
+__PACKAGE__->class_documentation({description => '',
+                                  class => 'ApiResponse',
+                                  required => [], # TODO
+}                                 );
+
+__PACKAGE__->method_documentation({
+    'code' => {
+    	datatype => 'int',
+    	base_name => 'code',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    'type' => {
+    	datatype => 'string',
+    	base_name => 'type',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    'message' => {
+    	datatype => 'string',
+    	base_name => 'message',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+});
+
+__PACKAGE__->swagger_types( {
+    'code' => 'int',
+    'type' => 'string',
+    'message' => 'string'
+} );
+
+__PACKAGE__->attribute_map( {
+    'code' => 'code',
+    'type' => 'type',
+    'message' => 'message'
+} );
+
+__PACKAGE__->mk_accessors(keys %{__PACKAGE__->attribute_map});
+
+
+1;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Cat.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Cat.pm
index 05500d61ad0..41e542afd9f 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Cat.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Cat.pm
@@ -117,7 +117,6 @@ __PACKAGE__->method_documentation({
     	format => '',
     	read_only => '',
     		},
-    
 });
 
 __PACKAGE__->swagger_types( {
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 39767d613ed..2d49d6a99b8 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Category.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Category.pm
@@ -117,7 +117,6 @@ __PACKAGE__->method_documentation({
     	format => '',
     	read_only => '',
     		},
-    
 });
 
 __PACKAGE__->swagger_types( {
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Dog.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Dog.pm
index b4192ec71cd..6ac41e2a9ff 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Dog.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Dog.pm
@@ -117,7 +117,6 @@ __PACKAGE__->method_documentation({
     	format => '',
     	read_only => '',
     		},
-    
 });
 
 __PACKAGE__->swagger_types( {
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/FormatTest.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/FormatTest.pm
new file mode 100644
index 00000000000..725c290b11d
--- /dev/null
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/FormatTest.pm
@@ -0,0 +1,225 @@
+package WWW::SwaggerClient::Object::FormatTest;
+
+require 5.6.0;
+use strict;
+use warnings;
+use utf8;
+use JSON qw(decode_json);
+use Data::Dumper;
+use Module::Runtime qw(use_module);
+use Log::Any qw($log);
+use Date::Parse;
+use DateTime;
+
+use base ("Class::Accessor", "Class::Data::Inheritable");
+
+
+#
+#
+#
+#NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+#
+
+__PACKAGE__->mk_classdata('attribute_map' => {});
+__PACKAGE__->mk_classdata('swagger_types' => {});
+__PACKAGE__->mk_classdata('method_documentation' => {}); 
+__PACKAGE__->mk_classdata('class_documentation' => {});
+
+# new object
+sub new { 
+    my ($class, %args) = @_; 
+
+	my $self = bless {}, $class;
+	
+	foreach my $attribute (keys %{$class->attribute_map}) {
+		my $args_key = $class->attribute_map->{$attribute};
+		$self->$attribute( $args{ $args_key } );
+	}
+	
+	return $self;
+}  
+
+# return perl hash
+sub to_hash {
+    return decode_json(JSON->new->convert_blessed->encode( shift ));
+}
+
+# used by JSON for serialization
+sub TO_JSON { 
+    my $self = shift;
+    my $_data = {};
+    foreach my $_key (keys %{$self->attribute_map}) {
+        if (defined $self->{$_key}) {
+            $_data->{$self->attribute_map->{$_key}} = $self->{$_key};
+        }
+    }
+    return $_data;
+}
+
+# from Perl hashref
+sub from_hash {
+    my ($self, $hash) = @_;
+
+    # loop through attributes and use swagger_types to deserialize the data
+    while ( my ($_key, $_type) = each %{$self->swagger_types} ) {
+    	my $_json_attribute = $self->attribute_map->{$_key}; 
+        if ($_type =~ /^array\[/i) { # array
+            my $_subclass = substr($_type, 6, -1);
+            my @_array = ();
+            foreach my $_element (@{$hash->{$_json_attribute}}) {
+                push @_array, $self->_deserialize($_subclass, $_element);
+            }
+            $self->{$_key} = \@_array;
+        } elsif (exists $hash->{$_json_attribute}) { #hash(model), primitive, datetime
+            $self->{$_key} = $self->_deserialize($_type, $hash->{$_json_attribute});
+        } else {
+        	$log->debugf("Warning: %s (%s) does not exist in input hash\n", $_key, $_json_attribute);
+        }
+    }
+  
+    return $self;
+}
+
+# deserialize non-array data
+sub _deserialize {
+    my ($self, $type, $data) = @_;
+    $log->debugf("deserializing %s with %s",Dumper($data), $type);
+        
+    if ($type eq 'DateTime') {
+        return DateTime->from_epoch(epoch => str2time($data));
+    } elsif ( grep( /^$type$/, ('int', 'double', 'string', 'boolean'))) {
+        return $data;
+    } else { # hash(model)
+        my $_instance = eval "WWW::SwaggerClient::Object::$type->new()";
+        return $_instance->from_hash($data);
+    }
+}
+
+
+
+__PACKAGE__->class_documentation({description => '',
+                                  class => 'FormatTest',
+                                  required => [], # TODO
+}                                 );
+
+__PACKAGE__->method_documentation({
+    'integer' => {
+    	datatype => 'int',
+    	base_name => 'integer',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    'int32' => {
+    	datatype => 'int',
+    	base_name => 'int32',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    'int64' => {
+    	datatype => 'int',
+    	base_name => 'int64',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    'number' => {
+    	datatype => 'Number',
+    	base_name => 'number',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    'float' => {
+    	datatype => 'double',
+    	base_name => 'float',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    'double' => {
+    	datatype => 'double',
+    	base_name => 'double',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    'string' => {
+    	datatype => 'string',
+    	base_name => 'string',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    'byte' => {
+    	datatype => 'string',
+    	base_name => 'byte',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    'binary' => {
+    	datatype => 'string',
+    	base_name => 'binary',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    'date' => {
+    	datatype => 'DateTime',
+    	base_name => 'date',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    'date_time' => {
+    	datatype => 'DateTime',
+    	base_name => 'dateTime',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    'password' => {
+    	datatype => 'string',
+    	base_name => 'password',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+});
+
+__PACKAGE__->swagger_types( {
+    'integer' => 'int',
+    'int32' => 'int',
+    'int64' => 'int',
+    'number' => 'Number',
+    'float' => 'double',
+    'double' => 'double',
+    'string' => 'string',
+    'byte' => 'string',
+    'binary' => 'string',
+    'date' => 'DateTime',
+    'date_time' => 'DateTime',
+    'password' => 'string'
+} );
+
+__PACKAGE__->attribute_map( {
+    'integer' => 'integer',
+    'int32' => 'int32',
+    'int64' => 'int64',
+    'number' => 'number',
+    'float' => 'float',
+    'double' => 'double',
+    'string' => 'string',
+    'byte' => 'byte',
+    'binary' => 'binary',
+    'date' => 'date',
+    'date_time' => 'dateTime',
+    'password' => 'password'
+} );
+
+__PACKAGE__->mk_accessors(keys %{__PACKAGE__->attribute_map});
+
+
+1;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/InlineResponse200.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/InlineResponse200.pm
index 90f7bad236e..2f8c7f1dacd 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/InlineResponse200.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/InlineResponse200.pm
@@ -145,7 +145,6 @@ __PACKAGE__->method_documentation({
     	format => '',
     	read_only => '',
     		},
-    
 });
 
 __PACKAGE__->swagger_types( {
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Model200Response.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Model200Response.pm
index 8ec16d4b97a..d64f9497753 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Model200Response.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Model200Response.pm
@@ -15,7 +15,7 @@ use base ("Class::Accessor", "Class::Data::Inheritable");
 
 
 #
-#
+#Model for testing model name starting with number
 #
 #NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
 #
@@ -97,7 +97,7 @@ sub _deserialize {
 
 
 
-__PACKAGE__->class_documentation({description => '',
+__PACKAGE__->class_documentation({description => 'Model for testing model name starting with number',
                                   class => 'Model200Response',
                                   required => [], # TODO
 }                                 );
@@ -110,7 +110,6 @@ __PACKAGE__->method_documentation({
     	format => '',
     	read_only => '',
     		},
-    
 });
 
 __PACKAGE__->swagger_types( {
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ModelReturn.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ModelReturn.pm
index 5436aae64bc..682d26d7436 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ModelReturn.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ModelReturn.pm
@@ -15,7 +15,7 @@ use base ("Class::Accessor", "Class::Data::Inheritable");
 
 
 #
-#
+#Model for testing reserved words
 #
 #NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
 #
@@ -97,7 +97,7 @@ sub _deserialize {
 
 
 
-__PACKAGE__->class_documentation({description => '',
+__PACKAGE__->class_documentation({description => 'Model for testing reserved words',
                                   class => 'ModelReturn',
                                   required => [], # TODO
 }                                 );
@@ -110,7 +110,6 @@ __PACKAGE__->method_documentation({
     	format => '',
     	read_only => '',
     		},
-    
 });
 
 __PACKAGE__->swagger_types( {
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Name.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Name.pm
index f136a7f031e..b5a58e0d5fa 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Name.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Name.pm
@@ -15,7 +15,7 @@ use base ("Class::Accessor", "Class::Data::Inheritable");
 
 
 #
-#
+#Model for testing model name same as property name
 #
 #NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
 #
@@ -97,7 +97,7 @@ sub _deserialize {
 
 
 
-__PACKAGE__->class_documentation({description => '',
+__PACKAGE__->class_documentation({description => 'Model for testing model name same as property name',
                                   class => 'Name',
                                   required => [], # TODO
 }                                 );
@@ -117,7 +117,6 @@ __PACKAGE__->method_documentation({
     	format => '',
     	read_only => '',
     		},
-    
 });
 
 __PACKAGE__->swagger_types( {
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 500218017bc..6590dba2293 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Order.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Order.pm
@@ -145,7 +145,6 @@ __PACKAGE__->method_documentation({
     	format => '',
     	read_only => '',
     		},
-    
 });
 
 __PACKAGE__->swagger_types( {
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 eadf72be005..50334ab062a 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Pet.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Pet.pm
@@ -145,7 +145,6 @@ __PACKAGE__->method_documentation({
     	format => '',
     	read_only => '',
     		},
-    
 });
 
 __PACKAGE__->swagger_types( {
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/SpecialModelName.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/SpecialModelName.pm
index b720c10b1a6..5666b39c07b 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/SpecialModelName.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/SpecialModelName.pm
@@ -110,7 +110,6 @@ __PACKAGE__->method_documentation({
     	format => '',
     	read_only => '',
     		},
-    
 });
 
 __PACKAGE__->swagger_types( {
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 e114c1e1ec0..b60ccc4a005 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Tag.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Tag.pm
@@ -117,7 +117,6 @@ __PACKAGE__->method_documentation({
     	format => '',
     	read_only => '',
     		},
-    
 });
 
 __PACKAGE__->swagger_types( {
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 463424288d8..8b0555d8aaa 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/User.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/User.pm
@@ -159,7 +159,6 @@ __PACKAGE__->method_documentation({
     	format => '',
     	read_only => '',
     		},
-    
 });
 
 __PACKAGE__->swagger_types( {
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm
index c55c9a5fecf..fd1b4092302 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm
@@ -56,13 +56,13 @@ sub new {
 #
 # Add a new pet to the store
 # 
-# @param Pet $body Pet object that needs to be added to the store (optional)
+# @param Pet $body Pet object that needs to be added to the store (required)
 {
     my $params = {
     'body' => {
         data_type => 'Pet',
         description => 'Pet object that needs to be added to the store',
-        required => '0',
+        required => '1',
     },
     };
     __PACKAGE__->method_documentation->{ add_pet } = { 
@@ -76,7 +76,10 @@ sub new {
 sub add_pet {
     my ($self, %args) = @_;
 
-    
+    # verify the required parameter 'body' is set
+    unless (exists $args{'body'}) {
+      croak("Missing the required parameter 'body' when calling add_pet");
+    }
 
     # parse inputs
     my $_resource_path = '/pet';
@@ -88,16 +91,12 @@ sub add_pet {
     my $form_params = {};
 
     # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json');
     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'}) {
@@ -108,77 +107,10 @@ sub add_pet {
     my $auth_settings = [qw(petstore_auth )];
 
     # make the API Call
-    
     $self->{api_client}->call_api($_resource_path, $_method,
                                            $query_params, $form_params,
                                            $header_params, $_body_data, $auth_settings);
     return;
-    
-}
-
-#
-# add_pet_using_byte_array
-#
-# Fake endpoint to test byte array in body parameter for adding a new pet to the store
-# 
-# @param string $body Pet object in the form of byte array (optional)
-{
-    my $params = {
-    'body' => {
-        data_type => 'string',
-        description => 'Pet object in the form of byte array',
-        required => '0',
-    },
-    };
-    __PACKAGE__->method_documentation->{ add_pet_using_byte_array } = { 
-    	summary => 'Fake endpoint to test byte array in body parameter for adding a new pet to the store',
-        params => $params,
-        returns => undef,
-        };
-}
-# @return void
-#
-sub add_pet_using_byte_array {
-    my ($self, %args) = @_;
-
-    
-
-    # parse inputs
-    my $_resource_path = '/pet?testing_byte_array=true';
-    $_resource_path =~ s/{format}/json/; # default format to json
-
-    my $_method = 'POST';
-    my $query_params = {};
-    my $header_params = {};
-    my $form_params = {};
-
-    # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
-    if ($_header_accept) {
-        $header_params->{'Accept'} = $_header_accept;
-    }
-    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type('application/json', 'application/xml');
-
-    
-    
-    
-    
-    my $_body_data;
-    # body params
-    if ( exists $args{'body'}) {
-        $_body_data = $args{'body'};
-    }
-
-    # authentication setting, if any
-    my $auth_settings = [qw(petstore_auth )];
-
-    # make the API Call
-    
-    $self->{api_client}->call_api($_resource_path, $_method,
-                                           $query_params, $form_params,
-                                           $header_params, $_body_data, $auth_settings);
-    return;
-    
 }
 
 #
@@ -212,12 +144,10 @@ sub add_pet_using_byte_array {
 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}';
@@ -229,37 +159,33 @@ sub delete_pet {
     my $form_params = {};
 
     # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json');
     if ($_header_accept) {
         $header_params->{'Accept'} = $_header_accept;
     }
     $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
 
-    
     # header params
     if ( exists $args{'api_key'}) {
         $header_params->{'api_key'} = $self->{api_client}->to_header_value($args{'api_key'});
     }
+
     # path params
     if ( exists $args{'pet_id'}) {
         my $_base_variable = "{" . "petId" . "}";
         my $_base_value = $self->{api_client}->to_path_value($args{'pet_id'});
         $_resource_path =~ s/$_base_variable/$_base_value/g;
     }
-    
-    my $_body_data;
-    
 
+    my $_body_data;
     # authentication setting, if any
     my $auth_settings = [qw(petstore_auth )];
 
     # make the API Call
-    
     $self->{api_client}->call_api($_resource_path, $_method,
                                            $query_params, $form_params,
                                            $header_params, $_body_data, $auth_settings);
     return;
-    
 }
 
 #
@@ -267,13 +193,13 @@ sub delete_pet {
 #
 # Finds Pets by status
 # 
-# @param ARRAY[string] $status Status values that need to be considered for query (optional, default to available)
+# @param ARRAY[string] $status Status values that need to be considered for filter (required)
 {
     my $params = {
     'status' => {
         data_type => 'ARRAY[string]',
-        description => 'Status values that need to be considered for query',
-        required => '0',
+        description => 'Status values that need to be considered for filter',
+        required => '1',
     },
     };
     __PACKAGE__->method_documentation->{ find_pets_by_status } = { 
@@ -287,7 +213,10 @@ sub delete_pet {
 sub find_pets_by_status {
     my ($self, %args) = @_;
 
-    
+    # verify the required parameter 'status' is set
+    unless (exists $args{'status'}) {
+      croak("Missing the required parameter 'status' when calling find_pets_by_status");
+    }
 
     # parse inputs
     my $_resource_path = '/pet/findByStatus';
@@ -299,7 +228,7 @@ sub find_pets_by_status {
     my $form_params = {};
 
     # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json');
     if ($_header_accept) {
         $header_params->{'Accept'} = $_header_accept;
     }
@@ -309,12 +238,8 @@ sub find_pets_by_status {
     if ( exists $args{'status'}) {
         $query_params->{'status'} = $self->{api_client}->to_query_value($args{'status'});
     }
-    
-    
-    
-    my $_body_data;
-    
 
+    my $_body_data;
     # authentication setting, if any
     my $auth_settings = [qw(petstore_auth )];
 
@@ -327,7 +252,6 @@ sub find_pets_by_status {
     }
     my $_response_object = $self->{api_client}->deserialize('ARRAY[Pet]', $response);
     return $_response_object;
-    
 }
 
 #
@@ -335,13 +259,13 @@ sub find_pets_by_status {
 #
 # Finds Pets by tags
 # 
-# @param ARRAY[string] $tags Tags to filter by (optional)
+# @param ARRAY[string] $tags Tags to filter by (required)
 {
     my $params = {
     'tags' => {
         data_type => 'ARRAY[string]',
         description => 'Tags to filter by',
-        required => '0',
+        required => '1',
     },
     };
     __PACKAGE__->method_documentation->{ find_pets_by_tags } = { 
@@ -355,7 +279,10 @@ sub find_pets_by_status {
 sub find_pets_by_tags {
     my ($self, %args) = @_;
 
-    
+    # verify the required parameter 'tags' is set
+    unless (exists $args{'tags'}) {
+      croak("Missing the required parameter 'tags' when calling find_pets_by_tags");
+    }
 
     # parse inputs
     my $_resource_path = '/pet/findByTags';
@@ -367,7 +294,7 @@ sub find_pets_by_tags {
     my $form_params = {};
 
     # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json');
     if ($_header_accept) {
         $header_params->{'Accept'} = $_header_accept;
     }
@@ -377,12 +304,8 @@ sub find_pets_by_tags {
     if ( exists $args{'tags'}) {
         $query_params->{'tags'} = $self->{api_client}->to_query_value($args{'tags'});
     }
-    
-    
-    
-    my $_body_data;
-    
 
+    my $_body_data;
     # authentication setting, if any
     my $auth_settings = [qw(petstore_auth )];
 
@@ -395,7 +318,6 @@ sub find_pets_by_tags {
     }
     my $_response_object = $self->{api_client}->deserialize('ARRAY[Pet]', $response);
     return $_response_object;
-    
 }
 
 #
@@ -403,12 +325,12 @@ sub find_pets_by_tags {
 #
 # Find pet by ID
 # 
-# @param int $pet_id ID of pet that needs to be fetched (required)
+# @param int $pet_id ID of pet to return (required)
 {
     my $params = {
     'pet_id' => {
         data_type => 'int',
-        description => 'ID of pet that needs to be fetched',
+        description => 'ID of pet to return',
         required => '1',
     },
     };
@@ -423,12 +345,10 @@ sub find_pets_by_tags {
 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}';
@@ -440,26 +360,22 @@ sub get_pet_by_id {
     my $form_params = {};
 
     # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json');
     if ($_header_accept) {
         $header_params->{'Accept'} = $_header_accept;
     }
     $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
 
-    
-    
     # path params
     if ( exists $args{'pet_id'}) {
         my $_base_variable = "{" . "petId" . "}";
         my $_base_value = $self->{api_client}->to_path_value($args{'pet_id'});
         $_resource_path =~ s/$_base_variable/$_base_value/g;
     }
-    
-    my $_body_data;
-    
 
+    my $_body_data;
     # authentication setting, if any
-    my $auth_settings = [qw(api_key petstore_auth )];
+    my $auth_settings = [qw(api_key )];
 
     # make the API Call
     my $response = $self->{api_client}->call_api($_resource_path, $_method,
@@ -470,157 +386,6 @@ sub get_pet_by_id {
     }
     my $_response_object = $self->{api_client}->deserialize('Pet', $response);
     return $_response_object;
-    
-}
-
-#
-# get_pet_by_id_in_object
-#
-# Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
-# 
-# @param int $pet_id ID of pet that needs to be fetched (required)
-{
-    my $params = {
-    'pet_id' => {
-        data_type => 'int',
-        description => 'ID of pet that needs to be fetched',
-        required => '1',
-    },
-    };
-    __PACKAGE__->method_documentation->{ get_pet_by_id_in_object } = { 
-    	summary => 'Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;',
-        params => $params,
-        returns => 'InlineResponse200',
-        };
-}
-# @return InlineResponse200
-#
-sub get_pet_by_id_in_object {
-    my ($self, %args) = @_;
-
-    
-    # verify the required parameter 'pet_id' is set
-    unless (exists $args{'pet_id'}) {
-      croak("Missing the required parameter 'pet_id' when calling get_pet_by_id_in_object");
-    }
-    
-
-    # parse inputs
-    my $_resource_path = '/pet/{petId}?response=inline_arbitrary_object';
-    $_resource_path =~ s/{format}/json/; # default format to json
-
-    my $_method = 'GET';
-    my $query_params = {};
-    my $header_params = {};
-    my $form_params = {};
-
-    # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
-    if ($_header_accept) {
-        $header_params->{'Accept'} = $_header_accept;
-    }
-    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
-
-    
-    
-    # path params
-    if ( exists $args{'pet_id'}) {
-        my $_base_variable = "{" . "petId" . "}";
-        my $_base_value = $self->{api_client}->to_path_value($args{'pet_id'});
-        $_resource_path =~ s/$_base_variable/$_base_value/g;
-    }
-    
-    my $_body_data;
-    
-
-    # authentication setting, if any
-    my $auth_settings = [qw(api_key petstore_auth )];
-
-    # make the API Call
-    my $response = $self->{api_client}->call_api($_resource_path, $_method,
-                                           $query_params, $form_params,
-                                           $header_params, $_body_data, $auth_settings);
-    if (!$response) {
-        return;
-    }
-    my $_response_object = $self->{api_client}->deserialize('InlineResponse200', $response);
-    return $_response_object;
-    
-}
-
-#
-# pet_pet_idtesting_byte_arraytrue_get
-#
-# Fake endpoint to test byte array return by 'Find pet by ID'
-# 
-# @param int $pet_id ID of pet that needs to be fetched (required)
-{
-    my $params = {
-    'pet_id' => {
-        data_type => 'int',
-        description => 'ID of pet that needs to be fetched',
-        required => '1',
-    },
-    };
-    __PACKAGE__->method_documentation->{ pet_pet_idtesting_byte_arraytrue_get } = { 
-    	summary => 'Fake endpoint to test byte array return by &#39;Find pet by ID&#39;',
-        params => $params,
-        returns => 'string',
-        };
-}
-# @return string
-#
-sub pet_pet_idtesting_byte_arraytrue_get {
-    my ($self, %args) = @_;
-
-    
-    # verify the required parameter 'pet_id' is set
-    unless (exists $args{'pet_id'}) {
-      croak("Missing the required parameter 'pet_id' when calling pet_pet_idtesting_byte_arraytrue_get");
-    }
-    
-
-    # parse inputs
-    my $_resource_path = '/pet/{petId}?testing_byte_array=true';
-    $_resource_path =~ s/{format}/json/; # default format to json
-
-    my $_method = 'GET';
-    my $query_params = {};
-    my $header_params = {};
-    my $form_params = {};
-
-    # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
-    if ($_header_accept) {
-        $header_params->{'Accept'} = $_header_accept;
-    }
-    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
-
-    
-    
-    # path params
-    if ( exists $args{'pet_id'}) {
-        my $_base_variable = "{" . "petId" . "}";
-        my $_base_value = $self->{api_client}->to_path_value($args{'pet_id'});
-        $_resource_path =~ s/$_base_variable/$_base_value/g;
-    }
-    
-    my $_body_data;
-    
-
-    # authentication setting, if any
-    my $auth_settings = [qw(api_key petstore_auth )];
-
-    # make the API Call
-    my $response = $self->{api_client}->call_api($_resource_path, $_method,
-                                           $query_params, $form_params,
-                                           $header_params, $_body_data, $auth_settings);
-    if (!$response) {
-        return;
-    }
-    my $_response_object = $self->{api_client}->deserialize('string', $response);
-    return $_response_object;
-    
 }
 
 #
@@ -628,13 +393,13 @@ sub pet_pet_idtesting_byte_arraytrue_get {
 #
 # Update an existing pet
 # 
-# @param Pet $body Pet object that needs to be added to the store (optional)
+# @param Pet $body Pet object that needs to be added to the store (required)
 {
     my $params = {
     'body' => {
         data_type => 'Pet',
         description => 'Pet object that needs to be added to the store',
-        required => '0',
+        required => '1',
     },
     };
     __PACKAGE__->method_documentation->{ update_pet } = { 
@@ -648,7 +413,10 @@ sub pet_pet_idtesting_byte_arraytrue_get {
 sub update_pet {
     my ($self, %args) = @_;
 
-    
+    # verify the required parameter 'body' is set
+    unless (exists $args{'body'}) {
+      croak("Missing the required parameter 'body' when calling update_pet");
+    }
 
     # parse inputs
     my $_resource_path = '/pet';
@@ -660,16 +428,12 @@ sub update_pet {
     my $form_params = {};
 
     # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json');
     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'}) {
@@ -680,12 +444,10 @@ sub update_pet {
     my $auth_settings = [qw(petstore_auth )];
 
     # make the API Call
-    
     $self->{api_client}->call_api($_resource_path, $_method,
                                            $query_params, $form_params,
                                            $header_params, $_body_data, $auth_settings);
     return;
-    
 }
 
 #
@@ -693,13 +455,13 @@ sub update_pet {
 #
 # Updates a pet in the store with form data
 # 
-# @param string $pet_id ID of pet that needs to be updated (required)
+# @param int $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)
 {
     my $params = {
     'pet_id' => {
-        data_type => 'string',
+        data_type => 'int',
         description => 'ID of pet that needs to be updated',
         required => '1',
     },
@@ -725,12 +487,10 @@ sub update_pet {
 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}';
@@ -742,44 +502,38 @@ sub update_pet_with_form {
     my $form_params = {};
 
     # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json');
     if ($_header_accept) {
         $header_params->{'Accept'} = $_header_accept;
     }
     $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type('application/x-www-form-urlencoded');
 
-    
-    
     # 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->{'name'} = $self->{api_client}->to_form_value($args{'name'});
-        
-    }# form params
-    if ( exists $args{'status'} ) {
-        
-        $form_params->{'status'} = $self->{api_client}->to_form_value($args{'status'});
-        
+                $form_params->{'name'} = $self->{api_client}->to_form_value($args{'name'});
     }
-    my $_body_data;
     
-
+    # 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 = [qw(petstore_auth )];
 
     # make the API Call
-    
     $self->{api_client}->call_api($_resource_path, $_method,
                                            $query_params, $form_params,
                                            $header_params, $_body_data, $auth_settings);
     return;
-    
 }
 
 #
@@ -811,20 +565,18 @@ sub update_pet_with_form {
     __PACKAGE__->method_documentation->{ upload_file } = { 
     	summary => 'uploads an image',
         params => $params,
-        returns => undef,
+        returns => 'ApiResponse',
         };
 }
-# @return void
+# @return ApiResponse
 #
 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';
@@ -836,46 +588,43 @@ sub upload_file {
     my $form_params = {};
 
     # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    my $_header_accept = $self->{api_client}->select_header_accept('application/json');
     if ($_header_accept) {
         $header_params->{'Accept'} = $_header_accept;
     }
     $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type('multipart/form-data');
 
-    
-    
     # 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->{'additionalMetadata'} = $self->{api_client}->to_form_value($args{'additional_metadata'});
-        
-    }# form params
+                $form_params->{'additionalMetadata'} = $self->{api_client}->to_form_value($args{'additional_metadata'});
+    }
+    
+    # form params
     if ( exists $args{'file'} ) {
         $form_params->{'file'} = [] unless defined $form_params->{'file'};
         push @{$form_params->{'file'}}, $args{'file'};
-        
-        
-    }
-    my $_body_data;
+            }
     
-
+    my $_body_data;
     # authentication setting, if any
     my $auth_settings = [qw(petstore_auth )];
 
     # make the API Call
-    
-    $self->{api_client}->call_api($_resource_path, $_method,
+    my $response = $self->{api_client}->call_api($_resource_path, $_method,
                                            $query_params, $form_params,
                                            $header_params, $_body_data, $auth_settings);
-    return;
-    
+    if (!$response) {
+        return;
+    }
+    my $_response_object = $self->{api_client}->deserialize('ApiResponse', $response);
+    return $_response_object;
 }
 
-
 1;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm
index 4b1f63cbb2e..e72b12a22b8 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm
@@ -37,7 +37,7 @@ has version_info => ( is => 'ro',
                       default => sub { {
                           app_name => 'Swagger Petstore',
                           app_version => '1.0.0',
-                          generated_date => '2016-03-30T20:57:51.908+08:00',
+                          generated_date => '2016-04-13T22:41:41.133+08:00',
                           generator_class => 'class io.swagger.codegen.languages.PerlClientCodegen',
                       } },
                       documentation => 'Information about the application version and the codegen codebase version'
@@ -103,7 +103,7 @@ Automatically generated by the Perl Swagger Codegen project:
 
 =over 4 
 
-=item Build date: 2016-03-30T20:57:51.908+08:00
+=item Build date: 2016-04-13T22:41:41.133+08:00
 
 =item Build package: class io.swagger.codegen.languages.PerlClientCodegen
 
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm
index f9af88c0ac9..16a4f13cb1e 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm
@@ -76,12 +76,10 @@ sub new {
 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}';
@@ -93,102 +91,28 @@ sub delete_order {
     my $form_params = {};
 
     # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json');
     if ($_header_accept) {
         $header_params->{'Accept'} = $_header_accept;
     }
     $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
 
-    
-    
     # path params
     if ( exists $args{'order_id'}) {
         my $_base_variable = "{" . "orderId" . "}";
         my $_base_value = $self->{api_client}->to_path_value($args{'order_id'});
         $_resource_path =~ s/$_base_variable/$_base_value/g;
     }
-    
-    my $_body_data;
-    
 
+    my $_body_data;
     # authentication setting, if any
     my $auth_settings = [qw()];
 
     # make the API Call
-    
     $self->{api_client}->call_api($_resource_path, $_method,
                                            $query_params, $form_params,
                                            $header_params, $_body_data, $auth_settings);
     return;
-    
-}
-
-#
-# find_orders_by_status
-#
-# Finds orders by status
-# 
-# @param string $status Status value that needs to be considered for query (optional, default to placed)
-{
-    my $params = {
-    'status' => {
-        data_type => 'string',
-        description => 'Status value that needs to be considered for query',
-        required => '0',
-    },
-    };
-    __PACKAGE__->method_documentation->{ find_orders_by_status } = { 
-    	summary => 'Finds orders by status',
-        params => $params,
-        returns => 'ARRAY[Order]',
-        };
-}
-# @return ARRAY[Order]
-#
-sub find_orders_by_status {
-    my ($self, %args) = @_;
-
-    
-
-    # parse inputs
-    my $_resource_path = '/store/findByStatus';
-    $_resource_path =~ s/{format}/json/; # default format to json
-
-    my $_method = 'GET';
-    my $query_params = {};
-    my $header_params = {};
-    my $form_params = {};
-
-    # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
-    if ($_header_accept) {
-        $header_params->{'Accept'} = $_header_accept;
-    }
-    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
-
-    # query params
-    if ( exists $args{'status'}) {
-        $query_params->{'status'} = $self->{api_client}->to_query_value($args{'status'});
-    }
-    
-    
-    
-    my $_body_data;
-    
-
-    # authentication setting, if any
-    my $auth_settings = [qw(test_api_client_id test_api_client_secret )];
-
-    # make the API Call
-    my $response = $self->{api_client}->call_api($_resource_path, $_method,
-                                           $query_params, $form_params,
-                                           $header_params, $_body_data, $auth_settings);
-    if (!$response) {
-        return;
-    }
-    my $_response_object = $self->{api_client}->deserialize('ARRAY[Order]', $response);
-    return $_response_object;
-    
 }
 
 #
@@ -210,8 +134,6 @@ sub find_orders_by_status {
 sub get_inventory {
     my ($self, %args) = @_;
 
-    
-
     # parse inputs
     my $_resource_path = '/store/inventory';
     $_resource_path =~ s/{format}/json/; # default format to json
@@ -222,19 +144,13 @@ sub get_inventory {
     my $form_params = {};
 
     # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    my $_header_accept = $self->{api_client}->select_header_accept('application/json');
     if ($_header_accept) {
         $header_params->{'Accept'} = $_header_accept;
     }
     $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
 
-    
-    
-    
-    
     my $_body_data;
-    
-
     # authentication setting, if any
     my $auth_settings = [qw(api_key )];
 
@@ -247,66 +163,6 @@ sub get_inventory {
     }
     my $_response_object = $self->{api_client}->deserialize('HASH[string,int]', $response);
     return $_response_object;
-    
-}
-
-#
-# get_inventory_in_object
-#
-# Fake endpoint to test arbitrary object return by 'Get inventory'
-# 
-{
-    my $params = {
-    };
-    __PACKAGE__->method_documentation->{ get_inventory_in_object } = { 
-    	summary => 'Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;',
-        params => $params,
-        returns => 'object',
-        };
-}
-# @return object
-#
-sub get_inventory_in_object {
-    my ($self, %args) = @_;
-
-    
-
-    # parse inputs
-    my $_resource_path = '/store/inventory?response=arbitrary_object';
-    $_resource_path =~ s/{format}/json/; # default format to json
-
-    my $_method = 'GET';
-    my $query_params = {};
-    my $header_params = {};
-    my $form_params = {};
-
-    # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
-    if ($_header_accept) {
-        $header_params->{'Accept'} = $_header_accept;
-    }
-    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
-
-    
-    
-    
-    
-    my $_body_data;
-    
-
-    # authentication setting, if any
-    my $auth_settings = [qw(api_key )];
-
-    # make the API Call
-    my $response = $self->{api_client}->call_api($_resource_path, $_method,
-                                           $query_params, $form_params,
-                                           $header_params, $_body_data, $auth_settings);
-    if (!$response) {
-        return;
-    }
-    my $_response_object = $self->{api_client}->deserialize('object', $response);
-    return $_response_object;
-    
 }
 
 #
@@ -314,11 +170,11 @@ sub get_inventory_in_object {
 #
 # Find purchase order by ID
 # 
-# @param string $order_id ID of pet that needs to be fetched (required)
+# @param int $order_id ID of pet that needs to be fetched (required)
 {
     my $params = {
     'order_id' => {
-        data_type => 'string',
+        data_type => 'int',
         description => 'ID of pet that needs to be fetched',
         required => '1',
     },
@@ -334,12 +190,10 @@ sub get_inventory_in_object {
 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}';
@@ -351,26 +205,22 @@ sub get_order_by_id {
     my $form_params = {};
 
     # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json');
     if ($_header_accept) {
         $header_params->{'Accept'} = $_header_accept;
     }
     $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
 
-    
-    
     # path params
     if ( exists $args{'order_id'}) {
         my $_base_variable = "{" . "orderId" . "}";
         my $_base_value = $self->{api_client}->to_path_value($args{'order_id'});
         $_resource_path =~ s/$_base_variable/$_base_value/g;
     }
-    
-    my $_body_data;
-    
 
+    my $_body_data;
     # authentication setting, if any
-    my $auth_settings = [qw(test_api_key_header test_api_key_query )];
+    my $auth_settings = [qw()];
 
     # make the API Call
     my $response = $self->{api_client}->call_api($_resource_path, $_method,
@@ -381,7 +231,6 @@ sub get_order_by_id {
     }
     my $_response_object = $self->{api_client}->deserialize('Order', $response);
     return $_response_object;
-    
 }
 
 #
@@ -389,13 +238,13 @@ sub get_order_by_id {
 #
 # Place an order for a pet
 # 
-# @param Order $body order placed for purchasing the pet (optional)
+# @param Order $body order placed for purchasing the pet (required)
 {
     my $params = {
     'body' => {
         data_type => 'Order',
         description => 'order placed for purchasing the pet',
-        required => '0',
+        required => '1',
     },
     };
     __PACKAGE__->method_documentation->{ place_order } = { 
@@ -409,7 +258,10 @@ sub get_order_by_id {
 sub place_order {
     my ($self, %args) = @_;
 
-    
+    # verify the required parameter 'body' is set
+    unless (exists $args{'body'}) {
+      croak("Missing the required parameter 'body' when calling place_order");
+    }
 
     # parse inputs
     my $_resource_path = '/store/order';
@@ -421,16 +273,12 @@ sub place_order {
     my $form_params = {};
 
     # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json');
     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'}) {
@@ -438,7 +286,7 @@ sub place_order {
     }
 
     # authentication setting, if any
-    my $auth_settings = [qw(test_api_client_id test_api_client_secret )];
+    my $auth_settings = [qw()];
 
     # make the API Call
     my $response = $self->{api_client}->call_api($_resource_path, $_method,
@@ -449,8 +297,6 @@ sub place_order {
     }
     my $_response_object = $self->{api_client}->deserialize('Order', $response);
     return $_response_object;
-    
 }
 
-
 1;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm
index e86cc571a70..75f56f56293 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm
@@ -56,13 +56,13 @@ sub new {
 #
 # Create user
 # 
-# @param User $body Created user object (optional)
+# @param User $body Created user object (required)
 {
     my $params = {
     'body' => {
         data_type => 'User',
         description => 'Created user object',
-        required => '0',
+        required => '1',
     },
     };
     __PACKAGE__->method_documentation->{ create_user } = { 
@@ -76,7 +76,10 @@ sub new {
 sub create_user {
     my ($self, %args) = @_;
 
-    
+    # verify the required parameter 'body' is set
+    unless (exists $args{'body'}) {
+      croak("Missing the required parameter 'body' when calling create_user");
+    }
 
     # parse inputs
     my $_resource_path = '/user';
@@ -88,16 +91,12 @@ sub create_user {
     my $form_params = {};
 
     # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json');
     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'}) {
@@ -108,12 +107,10 @@ sub create_user {
     my $auth_settings = [qw()];
 
     # make the API Call
-    
     $self->{api_client}->call_api($_resource_path, $_method,
                                            $query_params, $form_params,
                                            $header_params, $_body_data, $auth_settings);
     return;
-    
 }
 
 #
@@ -121,13 +118,13 @@ sub create_user {
 #
 # Creates list of users with given input array
 # 
-# @param ARRAY[User] $body List of user object (optional)
+# @param ARRAY[User] $body List of user object (required)
 {
     my $params = {
     'body' => {
         data_type => 'ARRAY[User]',
         description => 'List of user object',
-        required => '0',
+        required => '1',
     },
     };
     __PACKAGE__->method_documentation->{ create_users_with_array_input } = { 
@@ -141,7 +138,10 @@ sub create_user {
 sub create_users_with_array_input {
     my ($self, %args) = @_;
 
-    
+    # verify the required parameter 'body' is set
+    unless (exists $args{'body'}) {
+      croak("Missing the required parameter 'body' when calling create_users_with_array_input");
+    }
 
     # parse inputs
     my $_resource_path = '/user/createWithArray';
@@ -153,16 +153,12 @@ sub create_users_with_array_input {
     my $form_params = {};
 
     # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json');
     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'}) {
@@ -173,12 +169,10 @@ sub create_users_with_array_input {
     my $auth_settings = [qw()];
 
     # make the API Call
-    
     $self->{api_client}->call_api($_resource_path, $_method,
                                            $query_params, $form_params,
                                            $header_params, $_body_data, $auth_settings);
     return;
-    
 }
 
 #
@@ -186,13 +180,13 @@ sub create_users_with_array_input {
 #
 # Creates list of users with given input array
 # 
-# @param ARRAY[User] $body List of user object (optional)
+# @param ARRAY[User] $body List of user object (required)
 {
     my $params = {
     'body' => {
         data_type => 'ARRAY[User]',
         description => 'List of user object',
-        required => '0',
+        required => '1',
     },
     };
     __PACKAGE__->method_documentation->{ create_users_with_list_input } = { 
@@ -206,7 +200,10 @@ sub create_users_with_array_input {
 sub create_users_with_list_input {
     my ($self, %args) = @_;
 
-    
+    # verify the required parameter 'body' is set
+    unless (exists $args{'body'}) {
+      croak("Missing the required parameter 'body' when calling create_users_with_list_input");
+    }
 
     # parse inputs
     my $_resource_path = '/user/createWithList';
@@ -218,16 +215,12 @@ sub create_users_with_list_input {
     my $form_params = {};
 
     # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json');
     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'}) {
@@ -238,12 +231,10 @@ sub create_users_with_list_input {
     my $auth_settings = [qw()];
 
     # make the API Call
-    
     $self->{api_client}->call_api($_resource_path, $_method,
                                            $query_params, $form_params,
                                            $header_params, $_body_data, $auth_settings);
     return;
-    
 }
 
 #
@@ -271,12 +262,10 @@ sub create_users_with_list_input {
 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}';
@@ -288,34 +277,28 @@ sub delete_user {
     my $form_params = {};
 
     # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json');
     if ($_header_accept) {
         $header_params->{'Accept'} = $_header_accept;
     }
     $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
 
-    
-    
     # path params
     if ( exists $args{'username'}) {
         my $_base_variable = "{" . "username" . "}";
         my $_base_value = $self->{api_client}->to_path_value($args{'username'});
         $_resource_path =~ s/$_base_variable/$_base_value/g;
     }
-    
-    my $_body_data;
-    
 
+    my $_body_data;
     # authentication setting, if any
-    my $auth_settings = [qw(test_http_basic )];
+    my $auth_settings = [qw()];
 
     # make the API Call
-    
     $self->{api_client}->call_api($_resource_path, $_method,
                                            $query_params, $form_params,
                                            $header_params, $_body_data, $auth_settings);
     return;
-    
 }
 
 #
@@ -323,12 +306,12 @@ sub delete_user {
 #
 # Get user by user name
 # 
-# @param string $username The name that needs to be fetched. Use user1 for testing. (required)
+# @param string $username The name that needs to be fetched. Use user1 for testing.  (required)
 {
     my $params = {
     'username' => {
         data_type => 'string',
-        description => 'The name that needs to be fetched. Use user1 for testing.',
+        description => 'The name that needs to be fetched. Use user1 for testing. ',
         required => '1',
     },
     };
@@ -343,12 +326,10 @@ sub delete_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}';
@@ -360,24 +341,20 @@ sub get_user_by_name {
     my $form_params = {};
 
     # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json');
     if ($_header_accept) {
         $header_params->{'Accept'} = $_header_accept;
     }
     $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
 
-    
-    
     # path params
     if ( exists $args{'username'}) {
         my $_base_variable = "{" . "username" . "}";
         my $_base_value = $self->{api_client}->to_path_value($args{'username'});
         $_resource_path =~ s/$_base_variable/$_base_value/g;
     }
-    
-    my $_body_data;
-    
 
+    my $_body_data;
     # authentication setting, if any
     my $auth_settings = [qw()];
 
@@ -390,7 +367,6 @@ sub get_user_by_name {
     }
     my $_response_object = $self->{api_client}->deserialize('User', $response);
     return $_response_object;
-    
 }
 
 #
@@ -398,19 +374,19 @@ sub get_user_by_name {
 #
 # 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)
+# @param string $username The user name for login (required)
+# @param string $password The password for login in clear text (required)
 {
     my $params = {
     'username' => {
         data_type => 'string',
         description => 'The user name for login',
-        required => '0',
+        required => '1',
     },
     'password' => {
         data_type => 'string',
         description => 'The password for login in clear text',
-        required => '0',
+        required => '1',
     },
     };
     __PACKAGE__->method_documentation->{ login_user } = { 
@@ -424,7 +400,15 @@ sub get_user_by_name {
 sub login_user {
     my ($self, %args) = @_;
 
-    
+    # verify the required parameter 'username' is set
+    unless (exists $args{'username'}) {
+      croak("Missing the required parameter 'username' when calling login_user");
+    }
+
+    # verify the required parameter 'password' is set
+    unless (exists $args{'password'}) {
+      croak("Missing the required parameter 'password' when calling login_user");
+    }
 
     # parse inputs
     my $_resource_path = '/user/login';
@@ -436,7 +420,7 @@ sub login_user {
     my $form_params = {};
 
     # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json');
     if ($_header_accept) {
         $header_params->{'Accept'} = $_header_accept;
     }
@@ -445,16 +429,14 @@ sub login_user {
     # query params
     if ( exists $args{'username'}) {
         $query_params->{'username'} = $self->{api_client}->to_query_value($args{'username'});
-    }# query params
+    }
+
+    # query params
     if ( exists $args{'password'}) {
         $query_params->{'password'} = $self->{api_client}->to_query_value($args{'password'});
     }
-    
-    
-    
-    my $_body_data;
-    
 
+    my $_body_data;
     # authentication setting, if any
     my $auth_settings = [qw()];
 
@@ -467,7 +449,6 @@ sub login_user {
     }
     my $_response_object = $self->{api_client}->deserialize('string', $response);
     return $_response_object;
-    
 }
 
 #
@@ -489,8 +470,6 @@ sub login_user {
 sub logout_user {
     my ($self, %args) = @_;
 
-    
-
     # parse inputs
     my $_resource_path = '/user/logout';
     $_resource_path =~ s/{format}/json/; # default format to json
@@ -501,29 +480,21 @@ sub logout_user {
     my $form_params = {};
 
     # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json');
     if ($_header_accept) {
         $header_params->{'Accept'} = $_header_accept;
     }
     $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
 
-    
-    
-    
-    
     my $_body_data;
-    
-
     # authentication setting, if any
     my $auth_settings = [qw()];
 
     # make the API Call
-    
     $self->{api_client}->call_api($_resource_path, $_method,
                                            $query_params, $form_params,
                                            $header_params, $_body_data, $auth_settings);
     return;
-    
 }
 
 #
@@ -532,7 +503,7 @@ sub logout_user {
 # Updated user
 # 
 # @param string $username name that need to be deleted (required)
-# @param User $body Updated user object (optional)
+# @param User $body Updated user object (required)
 {
     my $params = {
     'username' => {
@@ -543,7 +514,7 @@ sub logout_user {
     'body' => {
         data_type => 'User',
         description => 'Updated user object',
-        required => '0',
+        required => '1',
     },
     };
     __PACKAGE__->method_documentation->{ update_user } = { 
@@ -557,12 +528,15 @@ sub logout_user {
 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");
     }
-    
+
+    # verify the required parameter 'body' is set
+    unless (exists $args{'body'}) {
+      croak("Missing the required parameter 'body' when calling update_user");
+    }
 
     # parse inputs
     my $_resource_path = '/user/{username}';
@@ -574,21 +548,19 @@ sub update_user {
     my $form_params = {};
 
     # 'Accept' and 'Content-Type' header
-    my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml');
+    my $_header_accept = $self->{api_client}->select_header_accept('application/xml', 'application/json');
     if ($_header_accept) {
         $header_params->{'Accept'} = $_header_accept;
     }
     $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();
 
-    
-    
     # path params
     if ( exists $args{'username'}) {
         my $_base_variable = "{" . "username" . "}";
         my $_base_value = $self->{api_client}->to_path_value($args{'username'});
         $_resource_path =~ s/$_base_variable/$_base_value/g;
     }
-    
+
     my $_body_data;
     # body params
     if ( exists $args{'body'}) {
@@ -599,13 +571,10 @@ sub update_user {
     my $auth_settings = [qw()];
 
     # make the API Call
-    
     $self->{api_client}->call_api($_resource_path, $_method,
                                            $query_params, $form_params,
                                            $header_params, $_body_data, $auth_settings);
     return;
-    
 }
 
-
 1;
diff --git a/samples/client/petstore/perl/t/ApiResponseTest.t b/samples/client/petstore/perl/t/ApiResponseTest.t
new file mode 100644
index 00000000000..24ac730ecb9
--- /dev/null
+++ b/samples/client/petstore/perl/t/ApiResponseTest.t
@@ -0,0 +1,17 @@
+# NOTE: This class is auto generated by the Swagger Codegen
+# Please update the test case below to test the model.
+
+use Test::More tests => 2;
+use Test::Exception;
+
+use lib 'lib';
+use strict;
+use warnings;
+
+
+use_ok('WWW::SwaggerClient::Object::ApiResponse');
+
+my $instance = WWW::SwaggerClient::Object::ApiResponse->new();
+
+isa_ok($instance, 'WWW::SwaggerClient::Object::ApiResponse');
+
diff --git a/samples/client/petstore/perl/t/FormatTestTest.t b/samples/client/petstore/perl/t/FormatTestTest.t
new file mode 100644
index 00000000000..4d1521f906c
--- /dev/null
+++ b/samples/client/petstore/perl/t/FormatTestTest.t
@@ -0,0 +1,17 @@
+# NOTE: This class is auto generated by the Swagger Codegen
+# Please update the test case below to test the model.
+
+use Test::More tests => 2;
+use Test::Exception;
+
+use lib 'lib';
+use strict;
+use warnings;
+
+
+use_ok('WWW::SwaggerClient::Object::FormatTest');
+
+my $instance = WWW::SwaggerClient::Object::FormatTest->new();
+
+isa_ok($instance, 'WWW::SwaggerClient::Object::FormatTest');
+
diff --git a/samples/client/petstore/perl/t/PetApiTest.t b/samples/client/petstore/perl/t/PetApiTest.t
index 91f87e56f24..8d0a0c84a9c 100644
--- a/samples/client/petstore/perl/t/PetApiTest.t
+++ b/samples/client/petstore/perl/t/PetApiTest.t
@@ -37,14 +37,6 @@ isa_ok($api, 'WWW::SwaggerClient::PetApi');
     my $result = $api->add_pet(body => $body);
 }
 
-#
-# add_pet_using_byte_array test
-#
-{
-    my $body = undef; # replace NULL with a proper value
-    my $result = $api->add_pet_using_byte_array(body => $body);
-}
-
 #
 # delete_pet test
 #
@@ -78,22 +70,6 @@ isa_ok($api, 'WWW::SwaggerClient::PetApi');
     my $result = $api->get_pet_by_id(pet_id => $pet_id);
 }
 
-#
-# get_pet_by_id_in_object test
-#
-{
-    my $pet_id = undef; # replace NULL with a proper value
-    my $result = $api->get_pet_by_id_in_object(pet_id => $pet_id);
-}
-
-#
-# pet_pet_idtesting_byte_arraytrue_get test
-#
-{
-    my $pet_id = undef; # replace NULL with a proper value
-    my $result = $api->pet_pet_idtesting_byte_arraytrue_get(pet_id => $pet_id);
-}
-
 #
 # update_pet test
 #
diff --git a/samples/client/petstore/perl/t/StoreApiTest.t b/samples/client/petstore/perl/t/StoreApiTest.t
index a9bc3b3a4f3..3bb0ed753d3 100644
--- a/samples/client/petstore/perl/t/StoreApiTest.t
+++ b/samples/client/petstore/perl/t/StoreApiTest.t
@@ -37,14 +37,6 @@ isa_ok($api, 'WWW::SwaggerClient::StoreApi');
     my $result = $api->delete_order(order_id => $order_id);
 }
 
-#
-# find_orders_by_status test
-#
-{
-    my $status = undef; # replace NULL with a proper value
-    my $result = $api->find_orders_by_status(status => $status);
-}
-
 #
 # get_inventory test
 #
@@ -52,13 +44,6 @@ isa_ok($api, 'WWW::SwaggerClient::StoreApi');
     my $result = $api->get_inventory();
 }
 
-#
-# get_inventory_in_object test
-#
-{
-    my $result = $api->get_inventory_in_object();
-}
-
 #
 # get_order_by_id test
 #
diff --git a/samples/client/petstore/perl/tests/01_pet_api.t b/samples/client/petstore/perl/tests/01_pet_api.t
index c7bcdf98a0a..e63a645e38a 100644
--- a/samples/client/petstore/perl/tests/01_pet_api.t
+++ b/samples/client/petstore/perl/tests/01_pet_api.t
@@ -76,7 +76,7 @@ my $get_pet_after_update = $api->get_pet_by_id(pet_id => $pet_id);
 is $get_pet_after_update->{status}, 'sold', 'get the updated status after update_pet_with_form';
 
 my $upload_pet = $api->upload_file(pet_id => $pet_id, additional_metadata => 'testabc', file => 'test.pl');
-is $upload_pet, undef, 'get the null response from upload_pet';
+isa_ok($upload_pet, 'WWW::SwaggerClient::Object::ApiResponse');
 
 my $delete_pet = $api->delete_pet(pet_id => $pet_id);
 is $delete_pet, undef, 'get the null response from delete_pet';
diff --git a/samples/client/petstore/perl/tests/04_role.t b/samples/client/petstore/perl/tests/04_role.t
index 8836c35546c..7570dfa703a 100644
--- a/samples/client/petstore/perl/tests/04_role.t
+++ b/samples/client/petstore/perl/tests/04_role.t
@@ -50,10 +50,10 @@ is $get_pet->tags->[0]->id, '11', 'stored and retrieved: got the proper tag id';
 
 # API method docs 
 is_deeply(	[sort keys %{$api->pet_api->method_documentation}], 
-			[ 'add_pet', 'add_pet_using_byte_array', 'delete_pet', 'find_pets_by_status', 'find_pets_by_tags', 'get_pet_by_id', 'get_pet_by_id_in_object', 'pet_pet_idtesting_byte_arraytrue_get', 'update_pet', 'update_pet_with_form', 'upload_file'], 
+			[ 'add_pet', 'delete_pet', 'find_pets_by_status', 'find_pets_by_tags', 'get_pet_by_id', 'update_pet', 'update_pet_with_form', 'upload_file'], 
 			"Pet API method_documentation has the correct keys");
 is $api->pet_api->method_documentation->{get_pet_by_id}->{params}->{pet_id}->{description}, 
-	'ID of pet that needs to be fetched', 'get_pet_by_id parameter pet_id description is correct';
+	'ID of pet to return', 'get_pet_by_id parameter pet_id description is correct';
 is $api->pet_api->method_documentation->{get_pet_by_id}->{params}->{pet_id}->{required},
 	1, 'get_pet_by_id parameter pet_id is required';
 is $api->pet_api->method_documentation->{get_pet_by_id}->{params}->{pet_id}->{data_type},
diff --git a/samples/client/petstore/php/SwaggerClient-php/README.md b/samples/client/petstore/php/SwaggerClient-php/README.md
index 37f92af6e6f..d7a43368cac 100644
--- a/samples/client/petstore/php/SwaggerClient-php/README.md
+++ b/samples/client/petstore/php/SwaggerClient-php/README.md
@@ -1,11 +1,11 @@
 # SwaggerClient-php
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 This PHP package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build date: 2016-04-09T18:00:55.578+08:00
+- Build date: 2016-04-12T20:01:35.068+08:00
 - Build package: class io.swagger.codegen.languages.PhpClientCodegen
 
 ## Requirements
@@ -80,20 +80,15 @@ All URIs are relative to *http://petstore.swagger.io/v2*
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
 *PetApi* | [**addPet**](docs/PetApi.md#addpet) | **POST** /pet | Add a new pet to the store
-*PetApi* | [**addPetUsingByteArray**](docs/PetApi.md#addpetusingbytearray) | **POST** /pet?testing_byte_array&#x3D;true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletepet) | **DELETE** /pet/{petId} | Deletes a pet
 *PetApi* | [**findPetsByStatus**](docs/PetApi.md#findpetsbystatus) | **GET** /pet/findByStatus | Finds Pets by status
 *PetApi* | [**findPetsByTags**](docs/PetApi.md#findpetsbytags) | **GET** /pet/findByTags | Finds Pets by tags
 *PetApi* | [**getPetById**](docs/PetApi.md#getpetbyid) | **GET** /pet/{petId} | Find pet by ID
-*PetApi* | [**getPetByIdInObject**](docs/PetApi.md#getpetbyidinobject) | **GET** /pet/{petId}?response&#x3D;inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
-*PetApi* | [**petPetIdtestingByteArraytrueGet**](docs/PetApi.md#petpetidtestingbytearraytrueget) | **GET** /pet/{petId}?testing_byte_array&#x3D;true | Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
 *PetApi* | [**updatePet**](docs/PetApi.md#updatepet) | **PUT** /pet | Update an existing pet
 *PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatepetwithform) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *PetApi* | [**uploadFile**](docs/PetApi.md#uploadfile) | **POST** /pet/{petId}/uploadImage | uploads an image
 *StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteorder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
-*StoreApi* | [**findOrdersByStatus**](docs/StoreApi.md#findordersbystatus) | **GET** /store/findByStatus | Finds orders by status
 *StoreApi* | [**getInventory**](docs/StoreApi.md#getinventory) | **GET** /store/inventory | Returns pet inventories by status
-*StoreApi* | [**getInventoryInObject**](docs/StoreApi.md#getinventoryinobject) | **GET** /store/inventory?response&#x3D;arbitrary_object | Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
 *StoreApi* | [**getOrderById**](docs/StoreApi.md#getorderbyid) | **GET** /store/order/{orderId} | Find purchase order by ID
 *StoreApi* | [**placeOrder**](docs/StoreApi.md#placeorder) | **POST** /store/order | Place an order for a pet
 *UserApi* | [**createUser**](docs/UserApi.md#createuser) | **POST** /user | Create user
@@ -109,10 +104,11 @@ Class | Method | HTTP request | Description
 ## Documentation For Models
 
  - [Animal](docs/Animal.md)
+ - [ApiResponse](docs/ApiResponse.md)
  - [Cat](docs/Cat.md)
  - [Category](docs/Category.md)
  - [Dog](docs/Dog.md)
- - [InlineResponse200](docs/InlineResponse200.md)
+ - [FormatTest](docs/FormatTest.md)
  - [Model200Response](docs/Model200Response.md)
  - [ModelReturn](docs/ModelReturn.md)
  - [Name](docs/Name.md)
@@ -126,45 +122,17 @@ Class | Method | HTTP request | Description
 ## Documentation For Authorization
 
 
-## test_api_key_header
-
-- **Type**: API key 
-- **API key parameter name**: test_api_key_header
-- **Location**: HTTP header
-
 ## api_key
 
 - **Type**: API key 
 - **API key parameter name**: api_key
 - **Location**: HTTP header
 
-## test_http_basic
-
-- **Type**: HTTP basic authentication
-
-## test_api_client_secret
-
-- **Type**: API key 
-- **API key parameter name**: x-test_api_client_secret
-- **Location**: HTTP header
-
-## test_api_client_id
-
-- **Type**: API key 
-- **API key parameter name**: x-test_api_client_id
-- **Location**: HTTP header
-
-## test_api_key_query
-
-- **Type**: API key 
-- **API key parameter name**: test_api_key_query
-- **Location**: URL query string
-
 ## petstore_auth
 
 - **Type**: OAuth
 - **Flow**: implicit
-- **Authorizatoin URL**: http://petstore.swagger.io/api/oauth/dialog
+- **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
 - **Scopes**: 
  - **write:pets**: modify pets in your account
  - **read:pets**: read your pets
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/ApiResponse.md b/samples/client/petstore/php/SwaggerClient-php/docs/ApiResponse.md
new file mode 100644
index 00000000000..9d351183422
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/ApiResponse.md
@@ -0,0 +1,12 @@
+# ApiResponse
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**code** | **int** |  | [optional] 
+**type** | **string** |  | [optional] 
+**message** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/FormatTest.md b/samples/client/petstore/php/SwaggerClient-php/docs/FormatTest.md
new file mode 100644
index 00000000000..e0598317f5e
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/FormatTest.md
@@ -0,0 +1,21 @@
+# FormatTest
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**integer** | **int** |  | [optional] 
+**int32** | **int** |  | [optional] 
+**int64** | **int** |  | [optional] 
+**number** | **float** |  | 
+**float** | **float** |  | [optional] 
+**double** | **double** |  | [optional] 
+**string** | **string** |  | [optional] 
+**byte** | **string** |  | [optional] 
+**binary** | **string** |  | [optional] 
+**date** | [**\DateTime**](Date.md) |  | [optional] 
+**date_time** | [**\DateTime**](\DateTime.md) |  | [optional] 
+**password** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/Name.md b/samples/client/petstore/php/SwaggerClient-php/docs/Name.md
index 26473221c32..905680a7d30 100644
--- a/samples/client/petstore/php/SwaggerClient-php/docs/Name.md
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/Name.md
@@ -3,7 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**name** | **int** |  | [optional] 
+**name** | **int** |  | 
 **snake_case** | **int** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/Order.md b/samples/client/petstore/php/SwaggerClient-php/docs/Order.md
index 8932478b022..ddae5cc2b57 100644
--- a/samples/client/petstore/php/SwaggerClient-php/docs/Order.md
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/Order.md
@@ -8,7 +8,7 @@ Name | Type | Description | Notes
 **quantity** | **int** |  | [optional] 
 **ship_date** | [**\DateTime**](\DateTime.md) |  | [optional] 
 **status** | **string** | Order Status | [optional] 
-**complete** | **bool** |  | [optional] 
+**complete** | **bool** |  | [optional] [default to false]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/PetApi.md b/samples/client/petstore/php/SwaggerClient-php/docs/PetApi.md
index 9164cd27876..ad4d3c804ef 100644
--- a/samples/client/petstore/php/SwaggerClient-php/docs/PetApi.md
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/PetApi.md
@@ -57,7 +57,7 @@ void (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
  - **Accept**: application/json, application/xml
@@ -104,7 +104,7 @@ void (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
  - **Accept**: application/json, application/xml
@@ -153,7 +153,7 @@ void (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -201,7 +201,7 @@ Name | Type | Description  | Notes
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -249,7 +249,7 @@ Name | Type | Description  | Notes
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -301,7 +301,7 @@ Name | Type | Description  | Notes
 
 [api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -353,7 +353,7 @@ Name | Type | Description  | Notes
 
 [api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -405,7 +405,7 @@ Name | Type | Description  | Notes
 
 [api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -452,7 +452,7 @@ void (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
  - **Accept**: application/json, application/xml
@@ -503,7 +503,7 @@ void (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: application/json, application/xml
@@ -554,7 +554,7 @@ void (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: multipart/form-data
  - **Accept**: application/json, application/xml
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/StoreApi.md b/samples/client/petstore/php/SwaggerClient-php/docs/StoreApi.md
index c60ac603299..0ba6fa092de 100644
--- a/samples/client/petstore/php/SwaggerClient-php/docs/StoreApi.md
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/StoreApi.md
@@ -49,7 +49,7 @@ void (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -103,7 +103,7 @@ Name | Type | Description  | Notes
 
 [test_api_client_id](../README.md#test_api_client_id), [test_api_client_secret](../README.md#test_api_client_secret)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -149,7 +149,7 @@ This endpoint does not need any parameter.
 
 [api_key](../README.md#api_key)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -195,7 +195,7 @@ This endpoint does not need any parameter.
 
 [api_key](../README.md#api_key)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -249,7 +249,7 @@ Name | Type | Description  | Notes
 
 [test_api_key_header](../README.md#test_api_key_header), [test_api_key_query](../README.md#test_api_key_query)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -303,7 +303,7 @@ Name | Type | Description  | Notes
 
 [test_api_client_id](../README.md#test_api_client_id), [test_api_client_secret](../README.md#test_api_client_secret)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/UserApi.md b/samples/client/petstore/php/SwaggerClient-php/docs/UserApi.md
index e6a19891ba5..7f048a429e3 100644
--- a/samples/client/petstore/php/SwaggerClient-php/docs/UserApi.md
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/UserApi.md
@@ -41,7 +41,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**\Swagger\Client\Model\User**](\Swagger\Client\Model\User.md)| Created user object | [optional] 
+ **body** | [**\Swagger\Client\Model\User**](\Swagger\Client\Model\User.md)| Created user object | 
 
 ### Return type
 
@@ -51,10 +51,10 @@ void (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
@@ -85,7 +85,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**\Swagger\Client\Model\User[]**](User.md)| List of user object | [optional] 
+ **body** | [**\Swagger\Client\Model\User[]**](User.md)| List of user object | 
 
 ### Return type
 
@@ -95,10 +95,10 @@ void (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
@@ -129,7 +129,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**\Swagger\Client\Model\User[]**](User.md)| List of user object | [optional] 
+ **body** | [**\Swagger\Client\Model\User[]**](User.md)| List of user object | 
 
 ### Return type
 
@@ -139,10 +139,10 @@ void (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
@@ -158,10 +158,6 @@ This can only be done by the logged in user.
 <?php
 require_once(__DIR__ . '/vendor/autoload.php');
 
-// Configure HTTP basic authorization: test_http_basic
-Swagger\Client\Configuration::getDefaultConfiguration()->setUsername('YOUR_USERNAME');
-Swagger\Client\Configuration::getDefaultConfiguration()->setPassword('YOUR_PASSWORD');
-
 $api_instance = new Swagger\Client\Api\UserApi();
 $username = "username_example"; // string | The name that needs to be deleted
 
@@ -185,12 +181,12 @@ void (empty response body)
 
 ### Authorization
 
-[test_http_basic](../README.md#test_http_basic)
+No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
@@ -232,10 +228,10 @@ Name | Type | Description  | Notes
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
@@ -268,8 +264,8 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **username** | **string**| The user name for login | [optional] 
- **password** | **string**| The password for login in clear text | [optional] 
+ **username** | **string**| The user name for login | 
+ **password** | **string**| The password for login in clear text | 
 
 ### Return type
 
@@ -279,10 +275,10 @@ Name | Type | Description  | Notes
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
@@ -319,10 +315,10 @@ void (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
@@ -355,7 +351,7 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **username** | **string**| name that need to be deleted | 
- **body** | [**\Swagger\Client\Model\User**](\Swagger\Client\Model\User.md)| Updated user object | [optional] 
+ **body** | [**\Swagger\Client\Model\User**](\Swagger\Client\Model\User.md)| Updated user object | 
 
 ### Return type
 
@@ -365,10 +361,10 @@ void (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php
index 4661a5b3bd8..1154b72929c 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php
@@ -95,11 +95,11 @@ class PetApi
      *
      * Add a new pet to the store
      *
-     * @param \Swagger\Client\Model\Pet $body Pet object that needs to be added to the store (optional)
+     * @param \Swagger\Client\Model\Pet $body Pet object that needs to be added to the store (required)
      * @return void
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
-    public function addPet($body = null)
+    public function addPet($body)
     {
         list($response) = $this->addPetWithHttpInfo ($body);
         return $response; 
@@ -111,13 +111,17 @@ class PetApi
      *
      * Add a new pet to the store
      *
-     * @param \Swagger\Client\Model\Pet $body Pet object that needs to be added to the store (optional)
+     * @param \Swagger\Client\Model\Pet $body Pet object that needs to be added to the store (required)
      * @return Array of null, HTTP status code, HTTP response headers (array of strings)
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
-    public function addPetWithHttpInfo($body = null)
+    public function addPetWithHttpInfo($body)
     {
         
+        // verify the required parameter 'body' is set
+        if ($body === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $body when calling addPet');
+        }
   
         // parse inputs
         $resourcePath = "/pet";
@@ -125,88 +129,7 @@ class PetApi
         $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'));
-  
-        
-        
-        
-        // default format to json
-        $resourcePath = str_replace("{format}", "json", $resourcePath);
-
-        
-        // body params
-        $_tempBody = null;
-        if (isset($body)) {
-            $_tempBody = $body;
-        }
-  
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-        } elseif (count($formParams) > 0) {
-            $httpBody = $formParams; // for HTTP post (form)
-        }
-        
-        // this endpoint requires OAuth (access token)
-        if (strlen($this->apiClient->getConfig()->getAccessToken()) !== 0) {
-            $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAccessToken();
-        }
-        // make the API Call
-        try {
-            list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
-                $resourcePath, 'POST',
-                $queryParams, $httpBody,
-                $headerParams
-            );
-
-            return array(null, $statusCode, $httpHeader);
-        } catch (ApiException $e) {
-            switch ($e->getCode()) { 
-            }
-  
-            throw $e;
-        }
-    }
-    /**
-     * addPetUsingByteArray
-     *
-     * Fake endpoint to test byte array in body parameter for adding a new pet to the store
-     *
-     * @param string $body Pet object in the form of byte array (optional)
-     * @return void
-     * @throws \Swagger\Client\ApiException on non-2xx response
-     */
-    public function addPetUsingByteArray($body = null)
-    {
-        list($response) = $this->addPetUsingByteArrayWithHttpInfo ($body);
-        return $response; 
-    }
-
-
-    /**
-     * addPetUsingByteArrayWithHttpInfo
-     *
-     * Fake endpoint to test byte array in body parameter for adding a new pet to the store
-     *
-     * @param string $body Pet object in the form of byte array (optional)
-     * @return Array of null, HTTP status code, HTTP response headers (array of strings)
-     * @throws \Swagger\Client\ApiException on non-2xx response
-     */
-    public function addPetUsingByteArrayWithHttpInfo($body = null)
-    {
-        
-  
-        // parse inputs
-        $resourcePath = "/pet?testing_byte_array&#x3D;true";
-        $httpBody = '';
-        $queryParams = array();
-        $headerParams = array();
-        $formParams = array();
-        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/xml', 'application/json'));
         if (!is_null($_header_accept)) {
             $headerParams['Accept'] = $_header_accept;
         }
@@ -293,7 +216,7 @@ class PetApi
         $queryParams = array();
         $headerParams = array();
         $formParams = array();
-        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/xml', 'application/json'));
         if (!is_null($_header_accept)) {
             $headerParams['Accept'] = $_header_accept;
         }
@@ -350,11 +273,11 @@ class PetApi
      *
      * Finds Pets by status
      *
-     * @param string[] $status Status values that need to be considered for query (optional, default to available)
+     * @param string[] $status Status values that need to be considered for filter (required)
      * @return \Swagger\Client\Model\Pet[]
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
-    public function findPetsByStatus($status = null)
+    public function findPetsByStatus($status)
     {
         list($response) = $this->findPetsByStatusWithHttpInfo ($status);
         return $response; 
@@ -366,13 +289,17 @@ class PetApi
      *
      * Finds Pets by status
      *
-     * @param string[] $status Status values that need to be considered for query (optional, default to available)
+     * @param string[] $status Status values that need to be considered for filter (required)
      * @return Array of \Swagger\Client\Model\Pet[], HTTP status code, HTTP response headers (array of strings)
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
-    public function findPetsByStatusWithHttpInfo($status = null)
+    public function findPetsByStatusWithHttpInfo($status)
     {
         
+        // verify the required parameter 'status' is set
+        if ($status === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $status when calling findPetsByStatus');
+        }
   
         // parse inputs
         $resourcePath = "/pet/findByStatus";
@@ -380,7 +307,7 @@ class PetApi
         $queryParams = array();
         $headerParams = array();
         $formParams = array();
-        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/xml', 'application/json'));
         if (!is_null($_header_accept)) {
             $headerParams['Accept'] = $_header_accept;
         }
@@ -388,7 +315,7 @@ class PetApi
   
         // query params
         if (is_array($status)) {
-            $status = $this->apiClient->getSerializer()->serializeCollection($status, 'multi', true);
+            $status = $this->apiClient->getSerializer()->serializeCollection($status, 'csv', true);
         }
         if ($status !== null) {
             $queryParams['status'] = $this->apiClient->getSerializer()->toQueryValue($status);
@@ -440,11 +367,11 @@ class PetApi
      *
      * Finds Pets by tags
      *
-     * @param string[] $tags Tags to filter by (optional)
+     * @param string[] $tags Tags to filter by (required)
      * @return \Swagger\Client\Model\Pet[]
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
-    public function findPetsByTags($tags = null)
+    public function findPetsByTags($tags)
     {
         list($response) = $this->findPetsByTagsWithHttpInfo ($tags);
         return $response; 
@@ -456,13 +383,17 @@ class PetApi
      *
      * Finds Pets by tags
      *
-     * @param string[] $tags Tags to filter by (optional)
+     * @param string[] $tags Tags to filter by (required)
      * @return Array of \Swagger\Client\Model\Pet[], HTTP status code, HTTP response headers (array of strings)
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
-    public function findPetsByTagsWithHttpInfo($tags = null)
+    public function findPetsByTagsWithHttpInfo($tags)
     {
         
+        // verify the required parameter 'tags' is set
+        if ($tags === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $tags when calling findPetsByTags');
+        }
   
         // parse inputs
         $resourcePath = "/pet/findByTags";
@@ -470,7 +401,7 @@ class PetApi
         $queryParams = array();
         $headerParams = array();
         $formParams = array();
-        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/xml', 'application/json'));
         if (!is_null($_header_accept)) {
             $headerParams['Accept'] = $_header_accept;
         }
@@ -478,7 +409,7 @@ class PetApi
   
         // query params
         if (is_array($tags)) {
-            $tags = $this->apiClient->getSerializer()->serializeCollection($tags, 'multi', true);
+            $tags = $this->apiClient->getSerializer()->serializeCollection($tags, 'csv', true);
         }
         if ($tags !== null) {
             $queryParams['tags'] = $this->apiClient->getSerializer()->toQueryValue($tags);
@@ -530,7 +461,7 @@ class PetApi
      *
      * Find pet by ID
      *
-     * @param int $pet_id ID of pet that needs to be fetched (required)
+     * @param int $pet_id ID of pet to return (required)
      * @return \Swagger\Client\Model\Pet
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
@@ -546,7 +477,7 @@ class PetApi
      *
      * Find pet by ID
      *
-     * @param int $pet_id ID of pet that needs to be fetched (required)
+     * @param int $pet_id ID of pet to return (required)
      * @return Array of \Swagger\Client\Model\Pet, HTTP status code, HTTP response headers (array of strings)
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
@@ -564,7 +495,7 @@ class PetApi
         $queryParams = array();
         $headerParams = array();
         $formParams = array();
-        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/xml', 'application/json'));
         if (!is_null($_header_accept)) {
             $headerParams['Accept'] = $_header_accept;
         }
@@ -599,11 +530,6 @@ class PetApi
             $headerParams['api_key'] = $apiKey;
         }
         
-
-        // this endpoint requires OAuth (access token)
-        if (strlen($this->apiClient->getConfig()->getAccessToken()) !== 0) {
-            $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAccessToken();
-        }
         // make the API Call
         try {
             list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
@@ -627,220 +553,16 @@ class PetApi
             throw $e;
         }
     }
-    /**
-     * getPetByIdInObject
-     *
-     * Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
-     *
-     * @param int $pet_id ID of pet that needs to be fetched (required)
-     * @return \Swagger\Client\Model\InlineResponse200
-     * @throws \Swagger\Client\ApiException on non-2xx response
-     */
-    public function getPetByIdInObject($pet_id)
-    {
-        list($response) = $this->getPetByIdInObjectWithHttpInfo ($pet_id);
-        return $response; 
-    }
-
-
-    /**
-     * getPetByIdInObjectWithHttpInfo
-     *
-     * Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
-     *
-     * @param int $pet_id ID of pet that needs to be fetched (required)
-     * @return Array of \Swagger\Client\Model\InlineResponse200, HTTP status code, HTTP response headers (array of strings)
-     * @throws \Swagger\Client\ApiException on non-2xx response
-     */
-    public function getPetByIdInObjectWithHttpInfo($pet_id)
-    {
-        
-        // verify the required parameter 'pet_id' is set
-        if ($pet_id === null) {
-            throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling getPetByIdInObject');
-        }
-  
-        // parse inputs
-        $resourcePath = "/pet/{petId}?response&#x3D;inline_arbitrary_object";
-        $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->getSerializer()->toPathValue($pet_id),
-                $resourcePath
-            );
-        }
-        // default format to json
-        $resourcePath = str_replace("{format}", "json", $resourcePath);
-
-        
-        
-  
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-        } elseif (count($formParams) > 0) {
-            $httpBody = $formParams; // for HTTP post (form)
-        }
-        
-        // this endpoint requires API key authentication
-        $apiKey = $this->apiClient->getApiKeyWithPrefix('api_key');
-        if (strlen($apiKey) !== 0) {
-            $headerParams['api_key'] = $apiKey;
-        }
-        
-
-        // this endpoint requires OAuth (access token)
-        if (strlen($this->apiClient->getConfig()->getAccessToken()) !== 0) {
-            $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAccessToken();
-        }
-        // make the API Call
-        try {
-            list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
-                $resourcePath, 'GET',
-                $queryParams, $httpBody,
-                $headerParams, '\Swagger\Client\Model\InlineResponse200'
-            );
-            if (!$response) {
-                return array(null, $statusCode, $httpHeader);
-            }
-
-            return array($this->apiClient->getSerializer()->deserialize($response, '\Swagger\Client\Model\InlineResponse200', $httpHeader), $statusCode, $httpHeader);
-                    } catch (ApiException $e) {
-            switch ($e->getCode()) { 
-            case 200:
-                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\InlineResponse200', $e->getResponseHeaders());
-                $e->setResponseObject($data);
-                break;
-            }
-  
-            throw $e;
-        }
-    }
-    /**
-     * petPetIdtestingByteArraytrueGet
-     *
-     * Fake endpoint to test byte array return by 'Find pet by ID'
-     *
-     * @param int $pet_id ID of pet that needs to be fetched (required)
-     * @return string
-     * @throws \Swagger\Client\ApiException on non-2xx response
-     */
-    public function petPetIdtestingByteArraytrueGet($pet_id)
-    {
-        list($response) = $this->petPetIdtestingByteArraytrueGetWithHttpInfo ($pet_id);
-        return $response; 
-    }
-
-
-    /**
-     * petPetIdtestingByteArraytrueGetWithHttpInfo
-     *
-     * Fake endpoint to test byte array return by 'Find pet by ID'
-     *
-     * @param int $pet_id ID of pet that needs to be fetched (required)
-     * @return Array of string, HTTP status code, HTTP response headers (array of strings)
-     * @throws \Swagger\Client\ApiException on non-2xx response
-     */
-    public function petPetIdtestingByteArraytrueGetWithHttpInfo($pet_id)
-    {
-        
-        // verify the required parameter 'pet_id' is set
-        if ($pet_id === null) {
-            throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling petPetIdtestingByteArraytrueGet');
-        }
-  
-        // parse inputs
-        $resourcePath = "/pet/{petId}?testing_byte_array&#x3D;true";
-        $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->getSerializer()->toPathValue($pet_id),
-                $resourcePath
-            );
-        }
-        // default format to json
-        $resourcePath = str_replace("{format}", "json", $resourcePath);
-
-        
-        
-  
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-        } elseif (count($formParams) > 0) {
-            $httpBody = $formParams; // for HTTP post (form)
-        }
-        
-        // this endpoint requires API key authentication
-        $apiKey = $this->apiClient->getApiKeyWithPrefix('api_key');
-        if (strlen($apiKey) !== 0) {
-            $headerParams['api_key'] = $apiKey;
-        }
-        
-
-        // this endpoint requires OAuth (access token)
-        if (strlen($this->apiClient->getConfig()->getAccessToken()) !== 0) {
-            $headerParams['Authorization'] = 'Bearer ' . $this->apiClient->getConfig()->getAccessToken();
-        }
-        // make the API Call
-        try {
-            list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
-                $resourcePath, 'GET',
-                $queryParams, $httpBody,
-                $headerParams, 'string'
-            );
-            if (!$response) {
-                return array(null, $statusCode, $httpHeader);
-            }
-
-            return array($this->apiClient->getSerializer()->deserialize($response, 'string', $httpHeader), $statusCode, $httpHeader);
-                    } catch (ApiException $e) {
-            switch ($e->getCode()) { 
-            case 200:
-                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), 'string', $e->getResponseHeaders());
-                $e->setResponseObject($data);
-                break;
-            }
-  
-            throw $e;
-        }
-    }
     /**
      * updatePet
      *
      * Update an existing pet
      *
-     * @param \Swagger\Client\Model\Pet $body Pet object that needs to be added to the store (optional)
+     * @param \Swagger\Client\Model\Pet $body Pet object that needs to be added to the store (required)
      * @return void
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
-    public function updatePet($body = null)
+    public function updatePet($body)
     {
         list($response) = $this->updatePetWithHttpInfo ($body);
         return $response; 
@@ -852,13 +574,17 @@ class PetApi
      *
      * Update an existing pet
      *
-     * @param \Swagger\Client\Model\Pet $body Pet object that needs to be added to the store (optional)
+     * @param \Swagger\Client\Model\Pet $body Pet object that needs to be added to the store (required)
      * @return Array of null, HTTP status code, HTTP response headers (array of strings)
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
-    public function updatePetWithHttpInfo($body = null)
+    public function updatePetWithHttpInfo($body)
     {
         
+        // verify the required parameter 'body' is set
+        if ($body === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $body when calling updatePet');
+        }
   
         // parse inputs
         $resourcePath = "/pet";
@@ -866,7 +592,7 @@ class PetApi
         $queryParams = array();
         $headerParams = array();
         $formParams = array();
-        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/xml', 'application/json'));
         if (!is_null($_header_accept)) {
             $headerParams['Accept'] = $_header_accept;
         }
@@ -917,7 +643,7 @@ class PetApi
      *
      * Updates a pet in the store with form data
      *
-     * @param string $pet_id ID of pet that needs to be updated (required)
+     * @param int $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
@@ -935,7 +661,7 @@ class PetApi
      *
      * Updates a pet in the store with form data
      *
-     * @param string $pet_id ID of pet that needs to be updated (required)
+     * @param int $pet_id ID of pet that needs to be updated (required)
      * @param string $name Updated name of the pet (optional)
      * @param string $status Updated status of the pet (optional)
      * @return Array of null, HTTP status code, HTTP response headers (array of strings)
@@ -955,7 +681,7 @@ class PetApi
         $queryParams = array();
         $headerParams = array();
         $formParams = array();
-        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/xml', 'application/json'));
         if (!is_null($_header_accept)) {
             $headerParams['Accept'] = $_header_accept;
         }
@@ -1018,7 +744,7 @@ class PetApi
      * @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
+     * @return \Swagger\Client\Model\ApiResponse
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
     public function uploadFile($pet_id, $additional_metadata = null, $file = null)
@@ -1036,7 +762,7 @@ class PetApi
      * @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 Array of null, HTTP status code, HTTP response headers (array of strings)
+     * @return Array of \Swagger\Client\Model\ApiResponse, HTTP status code, HTTP response headers (array of strings)
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
     public function uploadFileWithHttpInfo($pet_id, $additional_metadata = null, $file = null)
@@ -1053,7 +779,7 @@ class PetApi
         $queryParams = array();
         $headerParams = array();
         $formParams = array();
-        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json'));
         if (!is_null($_header_accept)) {
             $headerParams['Accept'] = $_header_accept;
         }
@@ -1103,12 +829,19 @@ class PetApi
             list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
                 $resourcePath, 'POST',
                 $queryParams, $httpBody,
-                $headerParams
+                $headerParams, '\Swagger\Client\Model\ApiResponse'
             );
+            if (!$response) {
+                return array(null, $statusCode, $httpHeader);
+            }
 
-            return array(null, $statusCode, $httpHeader);
-        } catch (ApiException $e) {
+            return array($this->apiClient->getSerializer()->deserialize($response, '\Swagger\Client\Model\ApiResponse', $httpHeader), $statusCode, $httpHeader);
+                    } catch (ApiException $e) {
             switch ($e->getCode()) { 
+            case 200:
+                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\ApiResponse', $e->getResponseHeaders());
+                $e->setResponseObject($data);
+                break;
             }
   
             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
index 387cd476c55..e5bf83b4463 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php
@@ -129,7 +129,7 @@ class StoreApi
         $queryParams = array();
         $headerParams = array();
         $formParams = array();
-        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/xml', 'application/json'));
         if (!is_null($_header_accept)) {
             $headerParams['Accept'] = $_header_accept;
         }
@@ -173,102 +173,6 @@ class StoreApi
             throw $e;
         }
     }
-    /**
-     * findOrdersByStatus
-     *
-     * Finds orders by status
-     *
-     * @param string $status Status value that needs to be considered for query (optional, default to placed)
-     * @return \Swagger\Client\Model\Order[]
-     * @throws \Swagger\Client\ApiException on non-2xx response
-     */
-    public function findOrdersByStatus($status = null)
-    {
-        list($response) = $this->findOrdersByStatusWithHttpInfo ($status);
-        return $response; 
-    }
-
-
-    /**
-     * findOrdersByStatusWithHttpInfo
-     *
-     * Finds orders by status
-     *
-     * @param string $status Status value that needs to be considered for query (optional, default to placed)
-     * @return Array of \Swagger\Client\Model\Order[], HTTP status code, HTTP response headers (array of strings)
-     * @throws \Swagger\Client\ApiException on non-2xx response
-     */
-    public function findOrdersByStatusWithHttpInfo($status = null)
-    {
-        
-  
-        // parse inputs
-        $resourcePath = "/store/findByStatus";
-        $httpBody = '';
-        $queryParams = array();
-        $headerParams = array();
-        $formParams = array();
-        $_header_accept = $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->getSerializer()->toQueryValue($status);
-        }
-        
-        
-        // default format to json
-        $resourcePath = str_replace("{format}", "json", $resourcePath);
-
-        
-        
-  
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-        } elseif (count($formParams) > 0) {
-            $httpBody = $formParams; // for HTTP post (form)
-        }
-        
-        // this endpoint requires API key authentication
-        $apiKey = $this->apiClient->getApiKeyWithPrefix('x-test_api_client_id');
-        if (strlen($apiKey) !== 0) {
-            $headerParams['x-test_api_client_id'] = $apiKey;
-        }
-        
-
-        // this endpoint requires API key authentication
-        $apiKey = $this->apiClient->getApiKeyWithPrefix('x-test_api_client_secret');
-        if (strlen($apiKey) !== 0) {
-            $headerParams['x-test_api_client_secret'] = $apiKey;
-        }
-        
-        // make the API Call
-        try {
-            list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
-                $resourcePath, 'GET',
-                $queryParams, $httpBody,
-                $headerParams, '\Swagger\Client\Model\Order[]'
-            );
-            if (!$response) {
-                return array(null, $statusCode, $httpHeader);
-            }
-
-            return array($this->apiClient->getSerializer()->deserialize($response, '\Swagger\Client\Model\Order[]', $httpHeader), $statusCode, $httpHeader);
-                    } catch (ApiException $e) {
-            switch ($e->getCode()) { 
-            case 200:
-                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), '\Swagger\Client\Model\Order[]', $e->getResponseHeaders());
-                $e->setResponseObject($data);
-                break;
-            }
-  
-            throw $e;
-        }
-    }
     /**
      * getInventory
      *
@@ -302,7 +206,7 @@ class StoreApi
         $queryParams = array();
         $headerParams = array();
         $formParams = array();
-        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json'));
         if (!is_null($_header_accept)) {
             $headerParams['Accept'] = $_header_accept;
         }
@@ -353,96 +257,12 @@ class StoreApi
             throw $e;
         }
     }
-    /**
-     * getInventoryInObject
-     *
-     * Fake endpoint to test arbitrary object return by 'Get inventory'
-     *
-     * @return object
-     * @throws \Swagger\Client\ApiException on non-2xx response
-     */
-    public function getInventoryInObject()
-    {
-        list($response) = $this->getInventoryInObjectWithHttpInfo ();
-        return $response; 
-    }
-
-
-    /**
-     * getInventoryInObjectWithHttpInfo
-     *
-     * Fake endpoint to test arbitrary object return by 'Get inventory'
-     *
-     * @return Array of object, HTTP status code, HTTP response headers (array of strings)
-     * @throws \Swagger\Client\ApiException on non-2xx response
-     */
-    public function getInventoryInObjectWithHttpInfo()
-    {
-        
-  
-        // parse inputs
-        $resourcePath = "/store/inventory?response&#x3D;arbitrary_object";
-        $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());
-  
-        
-        
-        
-        // default format to json
-        $resourcePath = str_replace("{format}", "json", $resourcePath);
-
-        
-        
-  
-        // for model (json/xml)
-        if (isset($_tempBody)) {
-            $httpBody = $_tempBody; // $_tempBody is the method argument, if present
-        } elseif (count($formParams) > 0) {
-            $httpBody = $formParams; // for HTTP post (form)
-        }
-        
-        // this endpoint requires API key authentication
-        $apiKey = $this->apiClient->getApiKeyWithPrefix('api_key');
-        if (strlen($apiKey) !== 0) {
-            $headerParams['api_key'] = $apiKey;
-        }
-        
-        // make the API Call
-        try {
-            list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
-                $resourcePath, 'GET',
-                $queryParams, $httpBody,
-                $headerParams, 'object'
-            );
-            if (!$response) {
-                return array(null, $statusCode, $httpHeader);
-            }
-
-            return array($this->apiClient->getSerializer()->deserialize($response, 'object', $httpHeader), $statusCode, $httpHeader);
-                    } catch (ApiException $e) {
-            switch ($e->getCode()) { 
-            case 200:
-                $data = $this->apiClient->getSerializer()->deserialize($e->getResponseBody(), 'object', $e->getResponseHeaders());
-                $e->setResponseObject($data);
-                break;
-            }
-  
-            throw $e;
-        }
-    }
     /**
      * getOrderById
      *
      * Find purchase order by ID
      *
-     * @param string $order_id ID of pet that needs to be fetched (required)
+     * @param int $order_id ID of pet that needs to be fetched (required)
      * @return \Swagger\Client\Model\Order
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
@@ -458,7 +278,7 @@ class StoreApi
      *
      * Find purchase order by ID
      *
-     * @param string $order_id ID of pet that needs to be fetched (required)
+     * @param int $order_id ID of pet that needs to be fetched (required)
      * @return Array of \Swagger\Client\Model\Order, HTTP status code, HTTP response headers (array of strings)
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
@@ -476,7 +296,7 @@ class StoreApi
         $queryParams = array();
         $headerParams = array();
         $formParams = array();
-        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/xml', 'application/json'));
         if (!is_null($_header_accept)) {
             $headerParams['Accept'] = $_header_accept;
         }
@@ -504,21 +324,7 @@ class StoreApi
         } elseif (count($formParams) > 0) {
             $httpBody = $formParams; // for HTTP post (form)
         }
-        
-        // this endpoint requires API key authentication
-        $apiKey = $this->apiClient->getApiKeyWithPrefix('test_api_key_header');
-        if (strlen($apiKey) !== 0) {
-            $headerParams['test_api_key_header'] = $apiKey;
-        }
-        
-
-        // this endpoint requires API key authentication
-        $apiKey = $this->apiClient->getApiKeyWithPrefix('test_api_key_query');
-        if (strlen($apiKey) !== 0) {
-            $queryParams['test_api_key_query'] = $apiKey;
-        }
-        
-        // make the API Call
+                // make the API Call
         try {
             list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
                 $resourcePath, 'GET',
@@ -546,11 +352,11 @@ class StoreApi
      *
      * Place an order for a pet
      *
-     * @param \Swagger\Client\Model\Order $body order placed for purchasing the pet (optional)
+     * @param \Swagger\Client\Model\Order $body order placed for purchasing the pet (required)
      * @return \Swagger\Client\Model\Order
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
-    public function placeOrder($body = null)
+    public function placeOrder($body)
     {
         list($response) = $this->placeOrderWithHttpInfo ($body);
         return $response; 
@@ -562,13 +368,17 @@ class StoreApi
      *
      * Place an order for a pet
      *
-     * @param \Swagger\Client\Model\Order $body order placed for purchasing the pet (optional)
+     * @param \Swagger\Client\Model\Order $body order placed for purchasing the pet (required)
      * @return Array of \Swagger\Client\Model\Order, HTTP status code, HTTP response headers (array of strings)
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
-    public function placeOrderWithHttpInfo($body = null)
+    public function placeOrderWithHttpInfo($body)
     {
         
+        // verify the required parameter 'body' is set
+        if ($body === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $body when calling placeOrder');
+        }
   
         // parse inputs
         $resourcePath = "/store/order";
@@ -576,7 +386,7 @@ class StoreApi
         $queryParams = array();
         $headerParams = array();
         $formParams = array();
-        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/xml', 'application/json'));
         if (!is_null($_header_accept)) {
             $headerParams['Accept'] = $_header_accept;
         }
@@ -601,21 +411,7 @@ class StoreApi
         } elseif (count($formParams) > 0) {
             $httpBody = $formParams; // for HTTP post (form)
         }
-        
-        // this endpoint requires API key authentication
-        $apiKey = $this->apiClient->getApiKeyWithPrefix('x-test_api_client_id');
-        if (strlen($apiKey) !== 0) {
-            $headerParams['x-test_api_client_id'] = $apiKey;
-        }
-        
-
-        // this endpoint requires API key authentication
-        $apiKey = $this->apiClient->getApiKeyWithPrefix('x-test_api_client_secret');
-        if (strlen($apiKey) !== 0) {
-            $headerParams['x-test_api_client_secret'] = $apiKey;
-        }
-        
-        // make the API Call
+                // make the API Call
         try {
             list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
                 $resourcePath, 'POST',
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Api/UserApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/Api/UserApi.php
index 23f682e4943..4882ccd9764 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/UserApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/UserApi.php
@@ -95,11 +95,11 @@ class UserApi
      *
      * Create user
      *
-     * @param \Swagger\Client\Model\User $body Created user object (optional)
+     * @param \Swagger\Client\Model\User $body Created user object (required)
      * @return void
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
-    public function createUser($body = null)
+    public function createUser($body)
     {
         list($response) = $this->createUserWithHttpInfo ($body);
         return $response; 
@@ -111,13 +111,17 @@ class UserApi
      *
      * Create user
      *
-     * @param \Swagger\Client\Model\User $body Created user object (optional)
+     * @param \Swagger\Client\Model\User $body Created user object (required)
      * @return Array of null, HTTP status code, HTTP response headers (array of strings)
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
-    public function createUserWithHttpInfo($body = null)
+    public function createUserWithHttpInfo($body)
     {
         
+        // verify the required parameter 'body' is set
+        if ($body === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $body when calling createUser');
+        }
   
         // parse inputs
         $resourcePath = "/user";
@@ -125,7 +129,7 @@ class UserApi
         $queryParams = array();
         $headerParams = array();
         $formParams = array();
-        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/xml', 'application/json'));
         if (!is_null($_header_accept)) {
             $headerParams['Accept'] = $_header_accept;
         }
@@ -171,11 +175,11 @@ class UserApi
      *
      * Creates list of users with given input array
      *
-     * @param \Swagger\Client\Model\User[] $body List of user object (optional)
+     * @param \Swagger\Client\Model\User[] $body List of user object (required)
      * @return void
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
-    public function createUsersWithArrayInput($body = null)
+    public function createUsersWithArrayInput($body)
     {
         list($response) = $this->createUsersWithArrayInputWithHttpInfo ($body);
         return $response; 
@@ -187,13 +191,17 @@ class UserApi
      *
      * Creates list of users with given input array
      *
-     * @param \Swagger\Client\Model\User[] $body List of user object (optional)
+     * @param \Swagger\Client\Model\User[] $body List of user object (required)
      * @return Array of null, HTTP status code, HTTP response headers (array of strings)
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
-    public function createUsersWithArrayInputWithHttpInfo($body = null)
+    public function createUsersWithArrayInputWithHttpInfo($body)
     {
         
+        // verify the required parameter 'body' is set
+        if ($body === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $body when calling createUsersWithArrayInput');
+        }
   
         // parse inputs
         $resourcePath = "/user/createWithArray";
@@ -201,7 +209,7 @@ class UserApi
         $queryParams = array();
         $headerParams = array();
         $formParams = array();
-        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/xml', 'application/json'));
         if (!is_null($_header_accept)) {
             $headerParams['Accept'] = $_header_accept;
         }
@@ -247,11 +255,11 @@ class UserApi
      *
      * Creates list of users with given input array
      *
-     * @param \Swagger\Client\Model\User[] $body List of user object (optional)
+     * @param \Swagger\Client\Model\User[] $body List of user object (required)
      * @return void
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
-    public function createUsersWithListInput($body = null)
+    public function createUsersWithListInput($body)
     {
         list($response) = $this->createUsersWithListInputWithHttpInfo ($body);
         return $response; 
@@ -263,13 +271,17 @@ class UserApi
      *
      * Creates list of users with given input array
      *
-     * @param \Swagger\Client\Model\User[] $body List of user object (optional)
+     * @param \Swagger\Client\Model\User[] $body List of user object (required)
      * @return Array of null, HTTP status code, HTTP response headers (array of strings)
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
-    public function createUsersWithListInputWithHttpInfo($body = null)
+    public function createUsersWithListInputWithHttpInfo($body)
     {
         
+        // verify the required parameter 'body' is set
+        if ($body === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $body when calling createUsersWithListInput');
+        }
   
         // parse inputs
         $resourcePath = "/user/createWithList";
@@ -277,7 +289,7 @@ class UserApi
         $queryParams = array();
         $headerParams = array();
         $formParams = array();
-        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/xml', 'application/json'));
         if (!is_null($_header_accept)) {
             $headerParams['Accept'] = $_header_accept;
         }
@@ -357,7 +369,7 @@ class UserApi
         $queryParams = array();
         $headerParams = array();
         $formParams = array();
-        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/xml', 'application/json'));
         if (!is_null($_header_accept)) {
             $headerParams['Accept'] = $_header_accept;
         }
@@ -385,12 +397,7 @@ class UserApi
         } elseif (count($formParams) > 0) {
             $httpBody = $formParams; // for HTTP post (form)
         }
-        
-        // this endpoint requires HTTP basic authentication
-        if (strlen($this->apiClient->getConfig()->getUsername()) !== 0 or strlen($this->apiClient->getConfig()->getPassword()) !== 0) {
-            $headerParams['Authorization'] = 'Basic ' . base64_encode($this->apiClient->getConfig()->getUsername() . ":" . $this->apiClient->getConfig()->getPassword());
-        }
-        // make the API Call
+                // make the API Call
         try {
             list($response, $statusCode, $httpHeader) = $this->apiClient->callApi(
                 $resourcePath, 'DELETE',
@@ -445,7 +452,7 @@ class UserApi
         $queryParams = array();
         $headerParams = array();
         $formParams = array();
-        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/xml', 'application/json'));
         if (!is_null($_header_accept)) {
             $headerParams['Accept'] = $_header_accept;
         }
@@ -501,12 +508,12 @@ class UserApi
      *
      * 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)
+     * @param string $username The user name for login (required)
+     * @param string $password The password for login in clear text (required)
      * @return string
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
-    public function loginUser($username = null, $password = null)
+    public function loginUser($username, $password)
     {
         list($response) = $this->loginUserWithHttpInfo ($username, $password);
         return $response; 
@@ -518,14 +525,22 @@ class UserApi
      *
      * 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)
+     * @param string $username The user name for login (required)
+     * @param string $password The password for login in clear text (required)
      * @return Array of string, HTTP status code, HTTP response headers (array of strings)
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
-    public function loginUserWithHttpInfo($username = null, $password = null)
+    public function loginUserWithHttpInfo($username, $password)
     {
         
+        // verify the required parameter 'username' is set
+        if ($username === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $username when calling loginUser');
+        }
+        // verify the required parameter 'password' is set
+        if ($password === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $password when calling loginUser');
+        }
   
         // parse inputs
         $resourcePath = "/user/login";
@@ -533,7 +548,7 @@ class UserApi
         $queryParams = array();
         $headerParams = array();
         $formParams = array();
-        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/xml', 'application/json'));
         if (!is_null($_header_accept)) {
             $headerParams['Accept'] = $_header_accept;
         }
@@ -616,7 +631,7 @@ class UserApi
         $queryParams = array();
         $headerParams = array();
         $formParams = array();
-        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/xml', 'application/json'));
         if (!is_null($_header_accept)) {
             $headerParams['Accept'] = $_header_accept;
         }
@@ -659,11 +674,11 @@ class UserApi
      * Updated user
      *
      * @param string $username name that need to be deleted (required)
-     * @param \Swagger\Client\Model\User $body Updated user object (optional)
+     * @param \Swagger\Client\Model\User $body Updated user object (required)
      * @return void
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
-    public function updateUser($username, $body = null)
+    public function updateUser($username, $body)
     {
         list($response) = $this->updateUserWithHttpInfo ($username, $body);
         return $response; 
@@ -676,17 +691,21 @@ class UserApi
      * Updated user
      *
      * @param string $username name that need to be deleted (required)
-     * @param \Swagger\Client\Model\User $body Updated user object (optional)
+     * @param \Swagger\Client\Model\User $body Updated user object (required)
      * @return Array of null, HTTP status code, HTTP response headers (array of strings)
      * @throws \Swagger\Client\ApiException on non-2xx response
      */
-    public function updateUserWithHttpInfo($username, $body = null)
+    public function updateUserWithHttpInfo($username, $body)
     {
         
         // verify the required parameter 'username' is set
         if ($username === null) {
             throw new \InvalidArgumentException('Missing the required parameter $username when calling updateUser');
         }
+        // verify the required parameter 'body' is set
+        if ($body === null) {
+            throw new \InvalidArgumentException('Missing the required parameter $body when calling updateUser');
+        }
   
         // parse inputs
         $resourcePath = "/user/{username}";
@@ -694,7 +713,7 @@ class UserApi
         $queryParams = array();
         $headerParams = array();
         $formParams = array();
-        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/json', 'application/xml'));
+        $_header_accept = $this->apiClient->selectHeaderAccept(array('application/xml', 'application/json'));
         if (!is_null($_header_accept)) {
             $headerParams['Accept'] = $_header_accept;
         }
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Animal.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Animal.php
index c267c81b18e..3f01e789547 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Animal.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Animal.php
@@ -46,6 +46,12 @@ use \ArrayAccess;
  */
 class Animal implements ArrayAccess
 {
+    /**
+      * The original name of the model.
+      * @var string
+      */
+    static $swaggerModelName = 'Animal';
+
     /**
       * Array of property to type mappings. Used for (de)serialization 
       * @var string[]
@@ -107,6 +113,10 @@ class Animal implements ArrayAccess
     public function __construct(array $data = null)
     {
         
+        // Initialize discriminator property with the model name.
+        $discrimintor = array_search('className', self::$attributeMap);
+        $this->{$discrimintor} = static::$swaggerModelName;
+
         if ($data != null) {
             $this->class_name = $data["class_name"];
         }
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ApiResponse.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ApiResponse.php
new file mode 100644
index 00000000000..4f467a5aab5
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ApiResponse.php
@@ -0,0 +1,254 @@
+<?php
+/**
+ * ApiResponse
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+namespace Swagger\Client\Model;
+
+use \ArrayAccess;
+/**
+ * ApiResponse 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 ApiResponse implements ArrayAccess
+{
+    /**
+      * The original name of the model.
+      * @var string
+      */
+    static $swaggerModelName = 'ApiResponse';
+
+    /**
+      * Array of property to type mappings. Used for (de)serialization 
+      * @var string[]
+      */
+    static $swaggerTypes = array(
+        'code' => 'int',
+        'type' => 'string',
+        'message' => 'string'
+    );
+  
+    static function swaggerTypes() {
+        return self::$swaggerTypes;
+    }
+
+    /** 
+      * Array of attributes where the key is the local name, and the value is the original name
+      * @var string[] 
+      */
+    static $attributeMap = array(
+        'code' => 'code',
+        'type' => 'type',
+        'message' => 'message'
+    );
+  
+    static function attributeMap() {
+        return self::$attributeMap;
+    }
+
+    /**
+      * Array of attributes to setter functions (for deserialization of responses)
+      * @var string[]
+      */
+    static $setters = array(
+        'code' => 'setCode',
+        'type' => 'setType',
+        'message' => 'setMessage'
+    );
+  
+    static function setters() {
+        return self::$setters;
+    }
+
+    /**
+      * Array of attributes to getter functions (for serialization of requests)
+      * @var string[]
+      */
+    static $getters = array(
+        'code' => 'getCode',
+        'type' => 'getType',
+        'message' => 'getMessage'
+    );
+  
+    static function getters() {
+        return self::$getters;
+    }
+
+    /**
+      * $code 
+      * @var int
+      */
+    protected $code;
+    /**
+      * $type 
+      * @var string
+      */
+    protected $type;
+    /**
+      * $message 
+      * @var string
+      */
+    protected $message;
+
+    /**
+     * Constructor
+     * @param mixed[] $data Associated array of property value initalizing the model
+     */
+    public function __construct(array $data = null)
+    {
+        
+        
+        if ($data != null) {
+            $this->code = $data["code"];
+            $this->type = $data["type"];
+            $this->message = $data["message"];
+        }
+    }
+    /**
+     * Gets code
+     * @return int
+     */
+    public function getCode()
+    {
+        return $this->code;
+    }
+  
+    /**
+     * Sets code
+     * @param int $code 
+     * @return $this
+     */
+    public function setCode($code)
+    {
+        
+        $this->code = $code;
+        return $this;
+    }
+    /**
+     * Gets type
+     * @return string
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+  
+    /**
+     * Sets type
+     * @param string $type 
+     * @return $this
+     */
+    public function setType($type)
+    {
+        
+        $this->type = $type;
+        return $this;
+    }
+    /**
+     * Gets message
+     * @return string
+     */
+    public function getMessage()
+    {
+        return $this->message;
+    }
+  
+    /**
+     * Sets message
+     * @param string $message 
+     * @return $this
+     */
+    public function setMessage($message)
+    {
+        
+        $this->message = $message;
+        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')) { // use JSON pretty print
+            return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this), JSON_PRETTY_PRINT);
+        }
+
+        return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this));
+    }
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Cat.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Cat.php
index 79acd0d1f22..e0eaf7a106d 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Cat.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Cat.php
@@ -46,6 +46,12 @@ use \ArrayAccess;
  */
 class Cat extends Animal implements ArrayAccess
 {
+    /**
+      * The original name of the model.
+      * @var string
+      */
+    static $swaggerModelName = 'Cat';
+
     /**
       * Array of property to type mappings. Used for (de)serialization 
       * @var string[]
@@ -107,6 +113,7 @@ class Cat extends Animal implements ArrayAccess
     public function __construct(array $data = null)
     {
         parent::__construct($data);
+        
         if ($data != null) {
             $this->declawed = $data["declawed"];
         }
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php
index 0f359589d0e..fb6eed3af29 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php
@@ -46,6 +46,12 @@ use \ArrayAccess;
  */
 class Category implements ArrayAccess
 {
+    /**
+      * The original name of the model.
+      * @var string
+      */
+    static $swaggerModelName = 'Category';
+
     /**
       * Array of property to type mappings. Used for (de)serialization 
       * @var string[]
@@ -116,6 +122,7 @@ class Category implements ArrayAccess
     public function __construct(array $data = null)
     {
         
+        
         if ($data != null) {
             $this->id = $data["id"];
             $this->name = $data["name"];
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Dog.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Dog.php
index d12bde293fd..6fd43d3a944 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Dog.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Dog.php
@@ -46,6 +46,12 @@ use \ArrayAccess;
  */
 class Dog extends Animal implements ArrayAccess
 {
+    /**
+      * The original name of the model.
+      * @var string
+      */
+    static $swaggerModelName = 'Dog';
+
     /**
       * Array of property to type mappings. Used for (de)serialization 
       * @var string[]
@@ -107,6 +113,7 @@ class Dog extends Animal implements ArrayAccess
     public function __construct(array $data = null)
     {
         parent::__construct($data);
+        
         if ($data != null) {
             $this->breed = $data["breed"];
         }
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/FormatTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/FormatTest.php
new file mode 100644
index 00000000000..7bfe30c0ef7
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/FormatTest.php
@@ -0,0 +1,524 @@
+<?php
+/**
+ * FormatTest
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+namespace Swagger\Client\Model;
+
+use \ArrayAccess;
+/**
+ * FormatTest 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 FormatTest implements ArrayAccess
+{
+    /**
+      * The original name of the model.
+      * @var string
+      */
+    static $swaggerModelName = 'format_test';
+
+    /**
+      * Array of property to type mappings. Used for (de)serialization 
+      * @var string[]
+      */
+    static $swaggerTypes = array(
+        'integer' => 'int',
+        'int32' => 'int',
+        'int64' => 'int',
+        'number' => 'float',
+        'float' => 'float',
+        'double' => 'double',
+        'string' => 'string',
+        'byte' => 'string',
+        'binary' => 'string',
+        'date' => '\DateTime',
+        'date_time' => '\DateTime',
+        'password' => 'string'
+    );
+  
+    static function swaggerTypes() {
+        return self::$swaggerTypes;
+    }
+
+    /** 
+      * Array of attributes where the key is the local name, and the value is the original name
+      * @var string[] 
+      */
+    static $attributeMap = array(
+        'integer' => 'integer',
+        'int32' => 'int32',
+        'int64' => 'int64',
+        'number' => 'number',
+        'float' => 'float',
+        'double' => 'double',
+        'string' => 'string',
+        'byte' => 'byte',
+        'binary' => 'binary',
+        'date' => 'date',
+        'date_time' => 'dateTime',
+        'password' => 'password'
+    );
+  
+    static function attributeMap() {
+        return self::$attributeMap;
+    }
+
+    /**
+      * Array of attributes to setter functions (for deserialization of responses)
+      * @var string[]
+      */
+    static $setters = array(
+        'integer' => 'setInteger',
+        'int32' => 'setInt32',
+        'int64' => 'setInt64',
+        'number' => 'setNumber',
+        'float' => 'setFloat',
+        'double' => 'setDouble',
+        'string' => 'setString',
+        'byte' => 'setByte',
+        'binary' => 'setBinary',
+        'date' => 'setDate',
+        'date_time' => 'setDateTime',
+        'password' => 'setPassword'
+    );
+  
+    static function setters() {
+        return self::$setters;
+    }
+
+    /**
+      * Array of attributes to getter functions (for serialization of requests)
+      * @var string[]
+      */
+    static $getters = array(
+        'integer' => 'getInteger',
+        'int32' => 'getInt32',
+        'int64' => 'getInt64',
+        'number' => 'getNumber',
+        'float' => 'getFloat',
+        'double' => 'getDouble',
+        'string' => 'getString',
+        'byte' => 'getByte',
+        'binary' => 'getBinary',
+        'date' => 'getDate',
+        'date_time' => 'getDateTime',
+        'password' => 'getPassword'
+    );
+  
+    static function getters() {
+        return self::$getters;
+    }
+
+    /**
+      * $integer 
+      * @var int
+      */
+    protected $integer;
+    /**
+      * $int32 
+      * @var int
+      */
+    protected $int32;
+    /**
+      * $int64 
+      * @var int
+      */
+    protected $int64;
+    /**
+      * $number 
+      * @var float
+      */
+    protected $number;
+    /**
+      * $float 
+      * @var float
+      */
+    protected $float;
+    /**
+      * $double 
+      * @var double
+      */
+    protected $double;
+    /**
+      * $string 
+      * @var string
+      */
+    protected $string;
+    /**
+      * $byte 
+      * @var string
+      */
+    protected $byte;
+    /**
+      * $binary 
+      * @var string
+      */
+    protected $binary;
+    /**
+      * $date 
+      * @var \DateTime
+      */
+    protected $date;
+    /**
+      * $date_time 
+      * @var \DateTime
+      */
+    protected $date_time;
+    /**
+      * $password 
+      * @var string
+      */
+    protected $password;
+
+    /**
+     * Constructor
+     * @param mixed[] $data Associated array of property value initalizing the model
+     */
+    public function __construct(array $data = null)
+    {
+        
+        
+        if ($data != null) {
+            $this->integer = $data["integer"];
+            $this->int32 = $data["int32"];
+            $this->int64 = $data["int64"];
+            $this->number = $data["number"];
+            $this->float = $data["float"];
+            $this->double = $data["double"];
+            $this->string = $data["string"];
+            $this->byte = $data["byte"];
+            $this->binary = $data["binary"];
+            $this->date = $data["date"];
+            $this->date_time = $data["date_time"];
+            $this->password = $data["password"];
+        }
+    }
+    /**
+     * Gets integer
+     * @return int
+     */
+    public function getInteger()
+    {
+        return $this->integer;
+    }
+  
+    /**
+     * Sets integer
+     * @param int $integer 
+     * @return $this
+     */
+    public function setInteger($integer)
+    {
+        
+        $this->integer = $integer;
+        return $this;
+    }
+    /**
+     * Gets int32
+     * @return int
+     */
+    public function getInt32()
+    {
+        return $this->int32;
+    }
+  
+    /**
+     * Sets int32
+     * @param int $int32 
+     * @return $this
+     */
+    public function setInt32($int32)
+    {
+        
+        $this->int32 = $int32;
+        return $this;
+    }
+    /**
+     * Gets int64
+     * @return int
+     */
+    public function getInt64()
+    {
+        return $this->int64;
+    }
+  
+    /**
+     * Sets int64
+     * @param int $int64 
+     * @return $this
+     */
+    public function setInt64($int64)
+    {
+        
+        $this->int64 = $int64;
+        return $this;
+    }
+    /**
+     * Gets number
+     * @return float
+     */
+    public function getNumber()
+    {
+        return $this->number;
+    }
+  
+    /**
+     * Sets number
+     * @param float $number 
+     * @return $this
+     */
+    public function setNumber($number)
+    {
+        
+        $this->number = $number;
+        return $this;
+    }
+    /**
+     * Gets float
+     * @return float
+     */
+    public function getFloat()
+    {
+        return $this->float;
+    }
+  
+    /**
+     * Sets float
+     * @param float $float 
+     * @return $this
+     */
+    public function setFloat($float)
+    {
+        
+        $this->float = $float;
+        return $this;
+    }
+    /**
+     * Gets double
+     * @return double
+     */
+    public function getDouble()
+    {
+        return $this->double;
+    }
+  
+    /**
+     * Sets double
+     * @param double $double 
+     * @return $this
+     */
+    public function setDouble($double)
+    {
+        
+        $this->double = $double;
+        return $this;
+    }
+    /**
+     * Gets string
+     * @return string
+     */
+    public function getString()
+    {
+        return $this->string;
+    }
+  
+    /**
+     * Sets string
+     * @param string $string 
+     * @return $this
+     */
+    public function setString($string)
+    {
+        
+        $this->string = $string;
+        return $this;
+    }
+    /**
+     * Gets byte
+     * @return string
+     */
+    public function getByte()
+    {
+        return $this->byte;
+    }
+  
+    /**
+     * Sets byte
+     * @param string $byte 
+     * @return $this
+     */
+    public function setByte($byte)
+    {
+        
+        $this->byte = $byte;
+        return $this;
+    }
+    /**
+     * Gets binary
+     * @return string
+     */
+    public function getBinary()
+    {
+        return $this->binary;
+    }
+  
+    /**
+     * Sets binary
+     * @param string $binary 
+     * @return $this
+     */
+    public function setBinary($binary)
+    {
+        
+        $this->binary = $binary;
+        return $this;
+    }
+    /**
+     * Gets date
+     * @return \DateTime
+     */
+    public function getDate()
+    {
+        return $this->date;
+    }
+  
+    /**
+     * Sets date
+     * @param \DateTime $date 
+     * @return $this
+     */
+    public function setDate($date)
+    {
+        
+        $this->date = $date;
+        return $this;
+    }
+    /**
+     * Gets date_time
+     * @return \DateTime
+     */
+    public function getDateTime()
+    {
+        return $this->date_time;
+    }
+  
+    /**
+     * Sets date_time
+     * @param \DateTime $date_time 
+     * @return $this
+     */
+    public function setDateTime($date_time)
+    {
+        
+        $this->date_time = $date_time;
+        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;
+    }
+    /**
+     * 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')) { // use JSON pretty print
+            return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this), JSON_PRETTY_PRINT);
+        }
+
+        return json_encode(\Swagger\Client\ObjectSerializer::sanitizeForSerialization($this));
+    }
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/InlineResponse200.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/InlineResponse200.php
index c3bb9d03315..3bd2106ba0e 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/InlineResponse200.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/InlineResponse200.php
@@ -46,6 +46,12 @@ use \ArrayAccess;
  */
 class InlineResponse200 implements ArrayAccess
 {
+    /**
+      * The original name of the model.
+      * @var string
+      */
+    static $swaggerModelName = 'inline_response_200';
+
     /**
       * Array of property to type mappings. Used for (de)serialization 
       * @var string[]
@@ -152,6 +158,7 @@ class InlineResponse200 implements ArrayAccess
     public function __construct(array $data = null)
     {
         
+        
         if ($data != null) {
             $this->tags = $data["tags"];
             $this->id = $data["id"];
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Model200Response.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Model200Response.php
index a2b4d7691ed..8d62f9531ec 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Model200Response.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Model200Response.php
@@ -46,6 +46,12 @@ use \ArrayAccess;
  */
 class Model200Response implements ArrayAccess
 {
+    /**
+      * The original name of the model.
+      * @var string
+      */
+    static $swaggerModelName = '200_response';
+
     /**
       * Array of property to type mappings. Used for (de)serialization 
       * @var string[]
@@ -107,6 +113,7 @@ class Model200Response implements ArrayAccess
     public function __construct(array $data = null)
     {
         
+        
         if ($data != null) {
             $this->name = $data["name"];
         }
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelReturn.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelReturn.php
index d92e61cdcd6..d4660e118fd 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelReturn.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelReturn.php
@@ -46,6 +46,12 @@ use \ArrayAccess;
  */
 class ModelReturn implements ArrayAccess
 {
+    /**
+      * The original name of the model.
+      * @var string
+      */
+    static $swaggerModelName = 'Return';
+
     /**
       * Array of property to type mappings. Used for (de)serialization 
       * @var string[]
@@ -107,6 +113,7 @@ class ModelReturn implements ArrayAccess
     public function __construct(array $data = null)
     {
         
+        
         if ($data != null) {
             $this->return = $data["return"];
         }
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Name.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Name.php
index dbe1349ab88..c44cda7b709 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Name.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Name.php
@@ -46,6 +46,12 @@ use \ArrayAccess;
  */
 class Name implements ArrayAccess
 {
+    /**
+      * The original name of the model.
+      * @var string
+      */
+    static $swaggerModelName = 'Name';
+
     /**
       * Array of property to type mappings. Used for (de)serialization 
       * @var string[]
@@ -116,6 +122,7 @@ class Name implements ArrayAccess
     public function __construct(array $data = null)
     {
         
+        
         if ($data != null) {
             $this->name = $data["name"];
             $this->snake_case = $data["snake_case"];
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php
index ae29bd61271..7ee5c124d2c 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php
@@ -46,6 +46,12 @@ use \ArrayAccess;
  */
 class Order implements ArrayAccess
 {
+    /**
+      * The original name of the model.
+      * @var string
+      */
+    static $swaggerModelName = 'Order';
+
     /**
       * Array of property to type mappings. Used for (de)serialization 
       * @var string[]
@@ -143,7 +149,7 @@ class Order implements ArrayAccess
       * $complete 
       * @var bool
       */
-    protected $complete;
+    protected $complete = false;
 
     /**
      * Constructor
@@ -152,6 +158,7 @@ class Order implements ArrayAccess
     public function __construct(array $data = null)
     {
         
+        
         if ($data != null) {
             $this->id = $data["id"];
             $this->pet_id = $data["pet_id"];
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php
index 7a790869349..3a9e46cd3fb 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php
@@ -46,6 +46,12 @@ use \ArrayAccess;
  */
 class Pet implements ArrayAccess
 {
+    /**
+      * The original name of the model.
+      * @var string
+      */
+    static $swaggerModelName = 'Pet';
+
     /**
       * Array of property to type mappings. Used for (de)serialization 
       * @var string[]
@@ -152,6 +158,7 @@ class Pet implements ArrayAccess
     public function __construct(array $data = null)
     {
         
+        
         if ($data != null) {
             $this->id = $data["id"];
             $this->category = $data["category"];
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/SpecialModelName.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/SpecialModelName.php
index 25248d949cf..fb748811cf2 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/SpecialModelName.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/SpecialModelName.php
@@ -46,6 +46,12 @@ use \ArrayAccess;
  */
 class SpecialModelName implements ArrayAccess
 {
+    /**
+      * The original name of the model.
+      * @var string
+      */
+    static $swaggerModelName = '$special[model.name]';
+
     /**
       * Array of property to type mappings. Used for (de)serialization 
       * @var string[]
@@ -107,6 +113,7 @@ class SpecialModelName implements ArrayAccess
     public function __construct(array $data = null)
     {
         
+        
         if ($data != null) {
             $this->special_property_name = $data["special_property_name"];
         }
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Tag.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Tag.php
index 8396a774e80..4bb56401c48 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Tag.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Tag.php
@@ -46,6 +46,12 @@ use \ArrayAccess;
  */
 class Tag implements ArrayAccess
 {
+    /**
+      * The original name of the model.
+      * @var string
+      */
+    static $swaggerModelName = 'Tag';
+
     /**
       * Array of property to type mappings. Used for (de)serialization 
       * @var string[]
@@ -116,6 +122,7 @@ class Tag implements ArrayAccess
     public function __construct(array $data = null)
     {
         
+        
         if ($data != null) {
             $this->id = $data["id"];
             $this->name = $data["name"];
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/User.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/User.php
index 6e5c7de36f3..da9cc20ff4c 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/User.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/User.php
@@ -46,6 +46,12 @@ use \ArrayAccess;
  */
 class User implements ArrayAccess
 {
+    /**
+      * The original name of the model.
+      * @var string
+      */
+    static $swaggerModelName = 'User';
+
     /**
       * Array of property to type mappings. Used for (de)serialization 
       * @var string[]
@@ -170,6 +176,7 @@ class User implements ArrayAccess
     public function __construct(array $data = null)
     {
         
+        
         if ($data != null) {
             $this->id = $data["id"];
             $this->username = $data["username"];
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Tests/ApiResponseTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/ApiResponseTest.php
new file mode 100644
index 00000000000..5cc18107499
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/ApiResponseTest.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * ApiResponseTest
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  Swagger\Client
+ * @author   http://github.com/swagger-api/swagger-codegen
+ * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link     https://github.com/swagger-api/swagger-codegen
+ */
+/**
+ *  Copyright 2016 SmartBear Software
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Please update the test case below to test the model.
+ */
+
+namespace Swagger\Client\Model;
+
+/**
+ * ApiResponseTest 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 ApiResponseTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running each test case
+     */
+    public static function setUpBeforeClass() {
+
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public static function tearDownAfterClass() {
+
+    }
+
+    /**
+     * Test ApiResponse
+     */
+    public function testApiResponse() {
+
+    }
+
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Tests/PetApiTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/PetApiTest.php
index f70ddf00107..af6b1018332 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Tests/PetApiTest.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/PetApiTest.php
@@ -72,15 +72,6 @@ class PetApiTest extends \PHPUnit_Framework_TestCase
      */
     public function test_addPet() {
 
-    }
-    /**
-     * Test case for addPetUsingByteArray
-     *
-     * Fake endpoint to test byte array in body parameter for adding a new pet to the store
-     *
-     */
-    public function test_addPetUsingByteArray() {
-
     }
     /**
      * Test case for deletePet
@@ -117,24 +108,6 @@ class PetApiTest extends \PHPUnit_Framework_TestCase
      */
     public function test_getPetById() {
 
-    }
-    /**
-     * Test case for getPetByIdInObject
-     *
-     * Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
-     *
-     */
-    public function test_getPetByIdInObject() {
-
-    }
-    /**
-     * Test case for petPetIdtestingByteArraytrueGet
-     *
-     * Fake endpoint to test byte array return by 'Find pet by ID'
-     *
-     */
-    public function test_petPetIdtestingByteArraytrueGet() {
-
     }
     /**
      * Test case for updatePet
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Tests/StoreApiTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/StoreApiTest.php
index 2eaf5f5dd11..25fa53169f2 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Tests/StoreApiTest.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Tests/StoreApiTest.php
@@ -72,15 +72,6 @@ class StoreApiTest extends \PHPUnit_Framework_TestCase
      */
     public function test_deleteOrder() {
 
-    }
-    /**
-     * Test case for findOrdersByStatus
-     *
-     * Finds orders by status
-     *
-     */
-    public function test_findOrdersByStatus() {
-
     }
     /**
      * Test case for getInventory
@@ -90,15 +81,6 @@ class StoreApiTest extends \PHPUnit_Framework_TestCase
      */
     public function test_getInventory() {
 
-    }
-    /**
-     * Test case for getInventoryInObject
-     *
-     * Fake endpoint to test arbitrary object return by 'Get inventory'
-     *
-     */
-    public function test_getInventoryInObject() {
-
     }
     /**
      * Test case for getOrderById
diff --git a/samples/client/petstore/php/SwaggerClient-php/tests/PetApiTest.php b/samples/client/petstore/php/SwaggerClient-php/tests/PetApiTest.php
index 3af1064f711..ea6c307decd 100644
--- a/samples/client/petstore/php/SwaggerClient-php/tests/PetApiTest.php
+++ b/samples/client/petstore/php/SwaggerClient-php/tests/PetApiTest.php
@@ -111,6 +111,10 @@ class PetApiTest extends \PHPUnit_Framework_TestCase
         $this->assertSame($response->getTags()[0]->getName(), 'test php tag');
     }
 
+    /* 
+     * comment out as we've removed invalid endpoints from the spec, we'll introduce something
+     * similar in the future when we've time to update the petstore server
+     *
     // test getPetById with a Pet object (id 10005)
     public function testGetPetByIdInObject()
     {
@@ -133,6 +137,7 @@ class PetApiTest extends \PHPUnit_Framework_TestCase
         $this->assertSame($response->getTags()[0]->getId(), $pet_id);
         $this->assertSame($response->getTags()[0]->getName(), 'test php tag');
     }
+     */
   
     // test getPetByIdWithHttpInfo with a Pet object (id 10005)
     public function testGetPetByIdWithHttpInfo()
@@ -274,7 +279,11 @@ class PetApiTest extends \PHPUnit_Framework_TestCase
         $this->assertSame($response->getId(), $new_pet_id);
         $this->assertSame($response->getName(), 'PHP Unit Test 2');
     }
-  
+
+    /*
+     * comment out as we've removed invalid endpoints from the spec, we'll introduce something
+     * similar in the future when we've time to update the petstore server
+     *
     // test addPetUsingByteArray and verify by the "id" and "name" of the response
     public function testAddPetUsingByteArray()
     {
@@ -310,8 +319,7 @@ class PetApiTest extends \PHPUnit_Framework_TestCase
         $this->assertSame($response->getId(), $new_pet_id);
         $this->assertSame($response->getName(), 'PHP Unit Test 3');
     }
-
-
+     */
   
     // test upload file
     public function testUploadFile()
@@ -322,9 +330,10 @@ class PetApiTest extends \PHPUnit_Framework_TestCase
         $pet_api = new Swagger\Client\Api\PetApi($api_client);
         // upload file
         $pet_id = 10001;
-        $add_response = $pet_api->uploadFile($pet_id, "test meta", "./composer.json");
-        // return nothing (void)
-        $this->assertSame($add_response, NULL);
+        $response = $pet_api->uploadFile($pet_id, "test meta", "./composer.json");
+        // return ApiResponse 
+        $this->assertInstanceOf('Swagger\Client\Model\ApiResponse', $response);
+
     }
   
     // test get inventory
@@ -341,7 +350,11 @@ class PetApiTest extends \PHPUnit_Framework_TestCase
         $this->assertInternalType("int", $get_response['sold']);
         $this->assertInternalType("int", $get_response['pending']);
     }
-  
+
+    /*
+     * comment out as we've removed invalid endpoints from the spec, we'll introduce something
+     * similar in the future when we've time to update the petstore server
+     *
     // test byte array response
     public function testGetPetByIdWithByteArray()
     {
@@ -365,6 +378,7 @@ class PetApiTest extends \PHPUnit_Framework_TestCase
         $this->assertSame($json['tags'][0]['id'], $pet_id);
         $this->assertSame($json['tags'][0]['name'], 'test php tag');
     }
+     */
 
     // test empty object serialization
     public function testEmptyPetSerialization()
@@ -402,6 +416,13 @@ class PetApiTest extends \PHPUnit_Framework_TestCase
         $this->assertSame('Dog', $new_dog->getClassName());
     }
 
+    // test if discriminator is initialized automatically
+    public function testDiscriminatorInitialization()
+    {
+        $new_dog = new Swagger\Client\Model\Dog();
+        $this->assertSame('Dog', $new_dog->getClassName());
+    }
+
 }
 
 ?>
diff --git a/samples/client/petstore/php/SwaggerClient-php/tests/StoreApiTest.php b/samples/client/petstore/php/SwaggerClient-php/tests/StoreApiTest.php
index b54416f28a9..378fa5e7e19 100644
--- a/samples/client/petstore/php/SwaggerClient-php/tests/StoreApiTest.php
+++ b/samples/client/petstore/php/SwaggerClient-php/tests/StoreApiTest.php
@@ -47,6 +47,10 @@ class StoreApiTest extends \PHPUnit_Framework_TestCase
         $this->assertInternalType("int", $get_response['available']);
     }
 
+    /*
+     * comment out as we've removed invalid endpoints from the spec, we'll introduce something
+     * similar in the future when we've time to update the petstore server
+     *
     // test get inventory
     public function testGetInventoryInObject()
     {
@@ -60,6 +64,7 @@ class StoreApiTest extends \PHPUnit_Framework_TestCase
         $this->assertInternalType("array", $get_response);
         $this->assertInternalType("int", $get_response['available']);
     }
+     */
 
 }
 
diff --git a/samples/client/petstore/python/README.md b/samples/client/petstore/python/README.md
index 9e99ae27370..85da3806f31 100644
--- a/samples/client/petstore/python/README.md
+++ b/samples/client/petstore/python/README.md
@@ -1,11 +1,11 @@
 # swagger_client
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
-- API verion: 1.0.0
-- Package version: 
-- Build date: 2016-03-30T17:18:44.943+08:00
+- API version: 1.0.0
+- Package version: 1.0.0
+- Build date: 2016-04-14T17:57:34.564+08:00
 - Build package: class io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -20,9 +20,9 @@ If the python package is hosted on Github, you can install directly from Github
 ```sh
 pip install git+https://github.com/YOUR_GIT_USR_ID/YOUR_GIT_REPO_ID.git
 ```
-(you may need to run the command with root permission: `sudo pip install git+https://github.com/YOUR_GIT_USR_ID/YOUR_GIT_REPO_ID.git`)
+(you may need to run `pip` with root permission: `sudo pip install git+https://github.com/YOUR_GIT_USR_ID/YOUR_GIT_REPO_ID.git`)
 
-Import the pacakge:
+Then import the package:
 ```python
 import swagger_client 
 ```
@@ -36,19 +36,11 @@ python setup.py install --user
 ```
 (or `sudo python setup.py install` to install the package for all users)
 
-Import the pacakge:
+Then import the package:
 ```python
 import swagger_client
 ```
 
-### Manual Installation
-
-Download the latest release to the project folder (e.g. ./path/to/swagger_client) and import the package:
-
-```python
-import path.to.swagger_client
-```
-
 ## Getting Started
 
 Please follow the [installation procedure](#installation--usage) and then run the following:
@@ -63,11 +55,11 @@ from pprint import pprint
 swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
 # create an instance of the API class
 api_instance = swagger_client.PetApi
-body = swagger_client.Pet() # Pet | Pet object that needs to be added to the store (optional)
+body = swagger_client.Pet() # Pet | Pet object that needs to be added to the store
 
 try:
     # Add a new pet to the store
-    api_instance.add_pet(body=body);
+    api_instance.add_pet(body)
 except ApiException as e:
     print "Exception when calling PetApi->add_pet: %s\n" % e
 
@@ -80,20 +72,15 @@ All URIs are relative to *http://petstore.swagger.io/v2*
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
 *PetApi* | [**add_pet**](docs/PetApi.md#add_pet) | **POST** /pet | Add a new pet to the store
-*PetApi* | [**add_pet_using_byte_array**](docs/PetApi.md#add_pet_using_byte_array) | **POST** /pet?testing_byte_array=true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
 *PetApi* | [**delete_pet**](docs/PetApi.md#delete_pet) | **DELETE** /pet/{petId} | Deletes a pet
 *PetApi* | [**find_pets_by_status**](docs/PetApi.md#find_pets_by_status) | **GET** /pet/findByStatus | Finds Pets by status
 *PetApi* | [**find_pets_by_tags**](docs/PetApi.md#find_pets_by_tags) | **GET** /pet/findByTags | Finds Pets by tags
 *PetApi* | [**get_pet_by_id**](docs/PetApi.md#get_pet_by_id) | **GET** /pet/{petId} | Find pet by ID
-*PetApi* | [**get_pet_by_id_in_object**](docs/PetApi.md#get_pet_by_id_in_object) | **GET** /pet/{petId}?response=inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
-*PetApi* | [**pet_pet_idtesting_byte_arraytrue_get**](docs/PetApi.md#pet_pet_idtesting_byte_arraytrue_get) | **GET** /pet/{petId}?testing_byte_array=true | Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
 *PetApi* | [**update_pet**](docs/PetApi.md#update_pet) | **PUT** /pet | Update an existing pet
 *PetApi* | [**update_pet_with_form**](docs/PetApi.md#update_pet_with_form) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *PetApi* | [**upload_file**](docs/PetApi.md#upload_file) | **POST** /pet/{petId}/uploadImage | uploads an image
 *StoreApi* | [**delete_order**](docs/StoreApi.md#delete_order) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
-*StoreApi* | [**find_orders_by_status**](docs/StoreApi.md#find_orders_by_status) | **GET** /store/findByStatus | Finds orders by status
 *StoreApi* | [**get_inventory**](docs/StoreApi.md#get_inventory) | **GET** /store/inventory | Returns pet inventories by status
-*StoreApi* | [**get_inventory_in_object**](docs/StoreApi.md#get_inventory_in_object) | **GET** /store/inventory?response=arbitrary_object | Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
 *StoreApi* | [**get_order_by_id**](docs/StoreApi.md#get_order_by_id) | **GET** /store/order/{orderId} | Find purchase order by ID
 *StoreApi* | [**place_order**](docs/StoreApi.md#place_order) | **POST** /store/order | Place an order for a pet
 *UserApi* | [**create_user**](docs/UserApi.md#create_user) | **POST** /user | Create user
@@ -109,10 +96,11 @@ Class | Method | HTTP request | Description
 ## Documentation For Models
 
  - [Animal](docs/Animal.md)
+ - [ApiResponse](docs/ApiResponse.md)
  - [Cat](docs/Cat.md)
  - [Category](docs/Category.md)
  - [Dog](docs/Dog.md)
- - [InlineResponse200](docs/InlineResponse200.md)
+ - [FormatTest](docs/FormatTest.md)
  - [Model200Response](docs/Model200Response.md)
  - [ModelReturn](docs/ModelReturn.md)
  - [Name](docs/Name.md)
@@ -126,45 +114,17 @@ Class | Method | HTTP request | Description
 ## Documentation For Authorization
 
 
-## test_api_key_header
-
-- **Type**: API key
-- **API key parameter name**: test_api_key_header
-- **Location**: HTTP header
-
 ## api_key
 
 - **Type**: API key
 - **API key parameter name**: api_key
 - **Location**: HTTP header
 
-## test_http_basic
-
-- **Type**: HTTP basic authentication
-
-## test_api_client_secret
-
-- **Type**: API key
-- **API key parameter name**: x-test_api_client_secret
-- **Location**: HTTP header
-
-## test_api_client_id
-
-- **Type**: API key
-- **API key parameter name**: x-test_api_client_id
-- **Location**: HTTP header
-
-## test_api_key_query
-
-- **Type**: API key
-- **API key parameter name**: test_api_key_query
-- **Location**: URL query string
-
 ## petstore_auth
 
 - **Type**: OAuth
 - **Flow**: implicit
-- **Authorizatoin URL**: http://petstore.swagger.io/api/oauth/dialog
+- **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
 - **Scopes**: 
  - **write:pets**: modify pets in your account
  - **read:pets**: read your pets
diff --git a/samples/client/petstore/python/docs/ApiResponse.md b/samples/client/petstore/python/docs/ApiResponse.md
new file mode 100644
index 00000000000..8fc302305ab
--- /dev/null
+++ b/samples/client/petstore/python/docs/ApiResponse.md
@@ -0,0 +1,12 @@
+# ApiResponse
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**code** | **int** |  | [optional] 
+**type** | **str** |  | [optional] 
+**message** | **str** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/python/docs/FormatTest.md b/samples/client/petstore/python/docs/FormatTest.md
new file mode 100644
index 00000000000..4182a447086
--- /dev/null
+++ b/samples/client/petstore/python/docs/FormatTest.md
@@ -0,0 +1,21 @@
+# FormatTest
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**integer** | **int** |  | [optional] 
+**int32** | **int** |  | [optional] 
+**int64** | **int** |  | [optional] 
+**number** | **float** |  | 
+**float** | **float** |  | [optional] 
+**double** | **float** |  | [optional] 
+**string** | **str** |  | [optional] 
+**byte** | **str** |  | [optional] 
+**binary** | **str** |  | [optional] 
+**date** | **date** |  | [optional] 
+**date_time** | **datetime** |  | [optional] 
+**password** | **str** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/python/docs/Name.md b/samples/client/petstore/python/docs/Name.md
index 26473221c32..905680a7d30 100644
--- a/samples/client/petstore/python/docs/Name.md
+++ b/samples/client/petstore/python/docs/Name.md
@@ -3,7 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**name** | **int** |  | [optional] 
+**name** | **int** |  | 
 **snake_case** | **int** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/client/petstore/python/docs/Order.md b/samples/client/petstore/python/docs/Order.md
index 4499eaa976d..b5f7b22d34c 100644
--- a/samples/client/petstore/python/docs/Order.md
+++ b/samples/client/petstore/python/docs/Order.md
@@ -8,7 +8,7 @@ Name | Type | Description | Notes
 **quantity** | **int** |  | [optional] 
 **ship_date** | **datetime** |  | [optional] 
 **status** | **str** | Order Status | [optional] 
-**complete** | **bool** |  | [optional] 
+**complete** | **bool** |  | [optional] [default to False]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/python/docs/PetApi.md b/samples/client/petstore/python/docs/PetApi.md
index 3349a3cb7d4..82a47548fb8 100644
--- a/samples/client/petstore/python/docs/PetApi.md
+++ b/samples/client/petstore/python/docs/PetApi.md
@@ -1,17 +1,17 @@
-# swagger_client\PetApi
+# swagger_client.PetApi
 
 All URIs are relative to *http://petstore.swagger.io/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**add_pet**](PetApi.md#add_pet) | **POST** /pet | Add a new pet to the store
-[**add_pet_using_byte_array**](PetApi.md#add_pet_using_byte_array) | **POST** /pet?testing_byte_array=true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
+[**add_pet_using_byte_array**](PetApi.md#add_pet_using_byte_array) | **POST** /pet?testing_byte_array&#x3D;true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
 [**delete_pet**](PetApi.md#delete_pet) | **DELETE** /pet/{petId} | Deletes a pet
 [**find_pets_by_status**](PetApi.md#find_pets_by_status) | **GET** /pet/findByStatus | Finds Pets by status
 [**find_pets_by_tags**](PetApi.md#find_pets_by_tags) | **GET** /pet/findByTags | Finds Pets by tags
 [**get_pet_by_id**](PetApi.md#get_pet_by_id) | **GET** /pet/{petId} | Find pet by ID
-[**get_pet_by_id_in_object**](PetApi.md#get_pet_by_id_in_object) | **GET** /pet/{petId}?response=inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
-[**pet_pet_idtesting_byte_arraytrue_get**](PetApi.md#pet_pet_idtesting_byte_arraytrue_get) | **GET** /pet/{petId}?testing_byte_array=true | Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+[**get_pet_by_id_in_object**](PetApi.md#get_pet_by_id_in_object) | **GET** /pet/{petId}?response&#x3D;inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+[**pet_pet_idtesting_byte_arraytrue_get**](PetApi.md#pet_pet_idtesting_byte_arraytrue_get) | **GET** /pet/{petId}?testing_byte_array&#x3D;true | Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
 [**update_pet**](PetApi.md#update_pet) | **PUT** /pet | Update an existing pet
 [**update_pet_with_form**](PetApi.md#update_pet_with_form) | **POST** /pet/{petId} | Updates a pet in the store with form data
 [**upload_file**](PetApi.md#upload_file) | **POST** /pet/{petId}/uploadImage | uploads an image
@@ -26,11 +26,10 @@ Add a new pet to the store
 
 ### Example 
 ```python
+import time
 import swagger_client
 from swagger_client.rest import ApiException
 from pprint import pprint
-import time
-
 
 # Configure OAuth2 access token for authorization: petstore_auth
 swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
@@ -41,7 +40,7 @@ body = swagger_client.Pet() # Pet | Pet object that needs to be added to the sto
 
 try: 
     # Add a new pet to the store
-    api_instance.add_pet(body=body);
+    api_instance.add_pet(body=body)
 except ApiException as e:
     print "Exception when calling PetApi->add_pet: %s\n" % e
 ```
@@ -60,7 +59,7 @@ void (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
  - **Accept**: application/json, application/xml
@@ -76,11 +75,10 @@ Fake endpoint to test byte array in body parameter for adding a new pet to the s
 
 ### Example 
 ```python
+import time
 import swagger_client
 from swagger_client.rest import ApiException
 from pprint import pprint
-import time
-
 
 # Configure OAuth2 access token for authorization: petstore_auth
 swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
@@ -91,7 +89,7 @@ body = 'B' # str | Pet object in the form of byte array (optional)
 
 try: 
     # Fake endpoint to test byte array in body parameter for adding a new pet to the store
-    api_instance.add_pet_using_byte_array(body=body);
+    api_instance.add_pet_using_byte_array(body=body)
 except ApiException as e:
     print "Exception when calling PetApi->add_pet_using_byte_array: %s\n" % e
 ```
@@ -110,7 +108,7 @@ void (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
  - **Accept**: application/json, application/xml
@@ -126,11 +124,10 @@ Deletes a pet
 
 ### Example 
 ```python
+import time
 import swagger_client
 from swagger_client.rest import ApiException
 from pprint import pprint
-import time
-
 
 # Configure OAuth2 access token for authorization: petstore_auth
 swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
@@ -142,7 +139,7 @@ api_key = 'api_key_example' # str |  (optional)
 
 try: 
     # Deletes a pet
-    api_instance.delete_pet(pet_id, api_key=api_key);
+    api_instance.delete_pet(pet_id, api_key=api_key)
 except ApiException as e:
     print "Exception when calling PetApi->delete_pet: %s\n" % e
 ```
@@ -162,7 +159,7 @@ void (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -178,11 +175,10 @@ Multiple status values can be provided with comma separated strings
 
 ### Example 
 ```python
+import time
 import swagger_client
 from swagger_client.rest import ApiException
 from pprint import pprint
-import time
-
 
 # Configure OAuth2 access token for authorization: petstore_auth
 swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
@@ -193,7 +189,7 @@ status = ['available'] # list[str] | Status values that need to be considered fo
 
 try: 
     # Finds Pets by status
-    api_response = api_instance.find_pets_by_status(status=status);
+    api_response = api_instance.find_pets_by_status(status=status)
     pprint(api_response)
 except ApiException as e:
     print "Exception when calling PetApi->find_pets_by_status: %s\n" % e
@@ -213,7 +209,7 @@ Name | Type | Description  | Notes
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -229,11 +225,10 @@ Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3
 
 ### Example 
 ```python
+import time
 import swagger_client
 from swagger_client.rest import ApiException
 from pprint import pprint
-import time
-
 
 # Configure OAuth2 access token for authorization: petstore_auth
 swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
@@ -244,7 +239,7 @@ tags = ['tags_example'] # list[str] | Tags to filter by (optional)
 
 try: 
     # Finds Pets by tags
-    api_response = api_instance.find_pets_by_tags(tags=tags);
+    api_response = api_instance.find_pets_by_tags(tags=tags)
     pprint(api_response)
 except ApiException as e:
     print "Exception when calling PetApi->find_pets_by_tags: %s\n" % e
@@ -264,7 +259,7 @@ Name | Type | Description  | Notes
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -280,14 +275,13 @@ Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error cond
 
 ### Example 
 ```python
+import time
 import swagger_client
 from swagger_client.rest import ApiException
 from pprint import pprint
-import time
-
 
 # Configure API key authorization: api_key
-swagger_client.configuration.api_key['api_key'] = 'YOUR_API_KEY';
+swagger_client.configuration.api_key['api_key'] = 'YOUR_API_KEY'
 # Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
 # swagger_client.configuration.api_key_prefix['api_key'] = 'BEARER'
 # Configure OAuth2 access token for authorization: petstore_auth
@@ -299,7 +293,7 @@ pet_id = 789 # int | ID of pet that needs to be fetched
 
 try: 
     # Find pet by ID
-    api_response = api_instance.get_pet_by_id(pet_id);
+    api_response = api_instance.get_pet_by_id(pet_id)
     pprint(api_response)
 except ApiException as e:
     print "Exception when calling PetApi->get_pet_by_id: %s\n" % e
@@ -319,7 +313,7 @@ Name | Type | Description  | Notes
 
 [api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -335,14 +329,13 @@ Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error cond
 
 ### Example 
 ```python
+import time
 import swagger_client
 from swagger_client.rest import ApiException
 from pprint import pprint
-import time
-
 
 # Configure API key authorization: api_key
-swagger_client.configuration.api_key['api_key'] = 'YOUR_API_KEY';
+swagger_client.configuration.api_key['api_key'] = 'YOUR_API_KEY'
 # Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
 # swagger_client.configuration.api_key_prefix['api_key'] = 'BEARER'
 # Configure OAuth2 access token for authorization: petstore_auth
@@ -354,7 +347,7 @@ pet_id = 789 # int | ID of pet that needs to be fetched
 
 try: 
     # Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
-    api_response = api_instance.get_pet_by_id_in_object(pet_id);
+    api_response = api_instance.get_pet_by_id_in_object(pet_id)
     pprint(api_response)
 except ApiException as e:
     print "Exception when calling PetApi->get_pet_by_id_in_object: %s\n" % e
@@ -374,7 +367,7 @@ Name | Type | Description  | Notes
 
 [api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -390,14 +383,13 @@ Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error cond
 
 ### Example 
 ```python
+import time
 import swagger_client
 from swagger_client.rest import ApiException
 from pprint import pprint
-import time
-
 
 # Configure API key authorization: api_key
-swagger_client.configuration.api_key['api_key'] = 'YOUR_API_KEY';
+swagger_client.configuration.api_key['api_key'] = 'YOUR_API_KEY'
 # Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
 # swagger_client.configuration.api_key_prefix['api_key'] = 'BEARER'
 # Configure OAuth2 access token for authorization: petstore_auth
@@ -409,7 +401,7 @@ pet_id = 789 # int | ID of pet that needs to be fetched
 
 try: 
     # Fake endpoint to test byte array return by 'Find pet by ID'
-    api_response = api_instance.pet_pet_idtesting_byte_arraytrue_get(pet_id);
+    api_response = api_instance.pet_pet_idtesting_byte_arraytrue_get(pet_id)
     pprint(api_response)
 except ApiException as e:
     print "Exception when calling PetApi->pet_pet_idtesting_byte_arraytrue_get: %s\n" % e
@@ -429,7 +421,7 @@ Name | Type | Description  | Notes
 
 [api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -445,11 +437,10 @@ Update an existing pet
 
 ### Example 
 ```python
+import time
 import swagger_client
 from swagger_client.rest import ApiException
 from pprint import pprint
-import time
-
 
 # Configure OAuth2 access token for authorization: petstore_auth
 swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
@@ -460,7 +451,7 @@ body = swagger_client.Pet() # Pet | Pet object that needs to be added to the sto
 
 try: 
     # Update an existing pet
-    api_instance.update_pet(body=body);
+    api_instance.update_pet(body=body)
 except ApiException as e:
     print "Exception when calling PetApi->update_pet: %s\n" % e
 ```
@@ -479,7 +470,7 @@ void (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
  - **Accept**: application/json, application/xml
@@ -495,11 +486,10 @@ Updates a pet in the store with form data
 
 ### Example 
 ```python
+import time
 import swagger_client
 from swagger_client.rest import ApiException
 from pprint import pprint
-import time
-
 
 # Configure OAuth2 access token for authorization: petstore_auth
 swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
@@ -512,7 +502,7 @@ status = 'status_example' # str | Updated status of the pet (optional)
 
 try: 
     # Updates a pet in the store with form data
-    api_instance.update_pet_with_form(pet_id, name=name, status=status);
+    api_instance.update_pet_with_form(pet_id, name=name, status=status)
 except ApiException as e:
     print "Exception when calling PetApi->update_pet_with_form: %s\n" % e
 ```
@@ -533,7 +523,7 @@ void (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: application/json, application/xml
@@ -549,11 +539,10 @@ uploads an image
 
 ### Example 
 ```python
+import time
 import swagger_client
 from swagger_client.rest import ApiException
 from pprint import pprint
-import time
-
 
 # Configure OAuth2 access token for authorization: petstore_auth
 swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
@@ -566,7 +555,7 @@ file = '/path/to/file.txt' # file | file to upload (optional)
 
 try: 
     # uploads an image
-    api_instance.upload_file(pet_id, additional_metadata=additional_metadata, file=file);
+    api_instance.upload_file(pet_id, additional_metadata=additional_metadata, file=file)
 except ApiException as e:
     print "Exception when calling PetApi->upload_file: %s\n" % e
 ```
@@ -587,7 +576,7 @@ void (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: multipart/form-data
  - **Accept**: application/json, application/xml
diff --git a/samples/client/petstore/python/docs/StoreApi.md b/samples/client/petstore/python/docs/StoreApi.md
index bbffc6e384b..89c5ff60eb9 100644
--- a/samples/client/petstore/python/docs/StoreApi.md
+++ b/samples/client/petstore/python/docs/StoreApi.md
@@ -1,4 +1,4 @@
-# swagger_client\StoreApi
+# swagger_client.StoreApi
 
 All URIs are relative to *http://petstore.swagger.io/v2*
 
@@ -7,7 +7,7 @@ Method | HTTP request | Description
 [**delete_order**](StoreApi.md#delete_order) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
 [**find_orders_by_status**](StoreApi.md#find_orders_by_status) | **GET** /store/findByStatus | Finds orders by status
 [**get_inventory**](StoreApi.md#get_inventory) | **GET** /store/inventory | Returns pet inventories by status
-[**get_inventory_in_object**](StoreApi.md#get_inventory_in_object) | **GET** /store/inventory?response=arbitrary_object | Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+[**get_inventory_in_object**](StoreApi.md#get_inventory_in_object) | **GET** /store/inventory?response&#x3D;arbitrary_object | Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
 [**get_order_by_id**](StoreApi.md#get_order_by_id) | **GET** /store/order/{orderId} | Find purchase order by ID
 [**place_order**](StoreApi.md#place_order) | **POST** /store/order | Place an order for a pet
 
@@ -21,11 +21,10 @@ For valid response try integer IDs with value < 1000. Anything above 1000 or non
 
 ### Example 
 ```python
+import time
 import swagger_client
 from swagger_client.rest import ApiException
 from pprint import pprint
-import time
-
 
 # create an instance of the API class
 api_instance = swagger_client.StoreApi()
@@ -33,7 +32,7 @@ order_id = 'order_id_example' # str | ID of the order that needs to be deleted
 
 try: 
     # Delete purchase order by ID
-    api_instance.delete_order(order_id);
+    api_instance.delete_order(order_id)
 except ApiException as e:
     print "Exception when calling StoreApi->delete_order: %s\n" % e
 ```
@@ -52,7 +51,7 @@ void (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -68,18 +67,17 @@ A single status value can be provided as a string
 
 ### Example 
 ```python
+import time
 import swagger_client
 from swagger_client.rest import ApiException
 from pprint import pprint
-import time
-
 
 # Configure API key authorization: test_api_client_id
-swagger_client.configuration.api_key['x-test_api_client_id'] = 'YOUR_API_KEY';
+swagger_client.configuration.api_key['x-test_api_client_id'] = 'YOUR_API_KEY'
 # Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
 # swagger_client.configuration.api_key_prefix['x-test_api_client_id'] = 'BEARER'
 # Configure API key authorization: test_api_client_secret
-swagger_client.configuration.api_key['x-test_api_client_secret'] = 'YOUR_API_KEY';
+swagger_client.configuration.api_key['x-test_api_client_secret'] = 'YOUR_API_KEY'
 # Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
 # swagger_client.configuration.api_key_prefix['x-test_api_client_secret'] = 'BEARER'
 
@@ -89,7 +87,7 @@ status = 'placed' # str | Status value that needs to be considered for query (op
 
 try: 
     # Finds orders by status
-    api_response = api_instance.find_orders_by_status(status=status);
+    api_response = api_instance.find_orders_by_status(status=status)
     pprint(api_response)
 except ApiException as e:
     print "Exception when calling StoreApi->find_orders_by_status: %s\n" % e
@@ -109,7 +107,7 @@ Name | Type | Description  | Notes
 
 [test_api_client_id](../README.md#test_api_client_id), [test_api_client_secret](../README.md#test_api_client_secret)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -125,14 +123,13 @@ Returns a map of status codes to quantities
 
 ### Example 
 ```python
+import time
 import swagger_client
 from swagger_client.rest import ApiException
 from pprint import pprint
-import time
-
 
 # Configure API key authorization: api_key
-swagger_client.configuration.api_key['api_key'] = 'YOUR_API_KEY';
+swagger_client.configuration.api_key['api_key'] = 'YOUR_API_KEY'
 # Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
 # swagger_client.configuration.api_key_prefix['api_key'] = 'BEARER'
 
@@ -141,7 +138,7 @@ api_instance = swagger_client.StoreApi()
 
 try: 
     # Returns pet inventories by status
-    api_response = api_instance.get_inventory();
+    api_response = api_instance.get_inventory()
     pprint(api_response)
 except ApiException as e:
     print "Exception when calling StoreApi->get_inventory: %s\n" % e
@@ -158,7 +155,7 @@ This endpoint does not need any parameter.
 
 [api_key](../README.md#api_key)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -174,14 +171,13 @@ Returns an arbitrary object which is actually a map of status codes to quantitie
 
 ### Example 
 ```python
+import time
 import swagger_client
 from swagger_client.rest import ApiException
 from pprint import pprint
-import time
-
 
 # Configure API key authorization: api_key
-swagger_client.configuration.api_key['api_key'] = 'YOUR_API_KEY';
+swagger_client.configuration.api_key['api_key'] = 'YOUR_API_KEY'
 # Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
 # swagger_client.configuration.api_key_prefix['api_key'] = 'BEARER'
 
@@ -190,7 +186,7 @@ api_instance = swagger_client.StoreApi()
 
 try: 
     # Fake endpoint to test arbitrary object return by 'Get inventory'
-    api_response = api_instance.get_inventory_in_object();
+    api_response = api_instance.get_inventory_in_object()
     pprint(api_response)
 except ApiException as e:
     print "Exception when calling StoreApi->get_inventory_in_object: %s\n" % e
@@ -207,7 +203,7 @@ This endpoint does not need any parameter.
 
 [api_key](../README.md#api_key)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -223,18 +219,17 @@ For valid response try integer IDs with value <= 5 or > 10. Other values will ge
 
 ### Example 
 ```python
+import time
 import swagger_client
 from swagger_client.rest import ApiException
 from pprint import pprint
-import time
-
 
 # Configure API key authorization: test_api_key_header
-swagger_client.configuration.api_key['test_api_key_header'] = 'YOUR_API_KEY';
+swagger_client.configuration.api_key['test_api_key_header'] = 'YOUR_API_KEY'
 # Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
 # swagger_client.configuration.api_key_prefix['test_api_key_header'] = 'BEARER'
 # Configure API key authorization: test_api_key_query
-swagger_client.configuration.api_key['test_api_key_query'] = 'YOUR_API_KEY';
+swagger_client.configuration.api_key['test_api_key_query'] = 'YOUR_API_KEY'
 # Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
 # swagger_client.configuration.api_key_prefix['test_api_key_query'] = 'BEARER'
 
@@ -244,7 +239,7 @@ order_id = 'order_id_example' # str | ID of pet that needs to be fetched
 
 try: 
     # Find purchase order by ID
-    api_response = api_instance.get_order_by_id(order_id);
+    api_response = api_instance.get_order_by_id(order_id)
     pprint(api_response)
 except ApiException as e:
     print "Exception when calling StoreApi->get_order_by_id: %s\n" % e
@@ -264,7 +259,7 @@ Name | Type | Description  | Notes
 
 [test_api_key_header](../README.md#test_api_key_header), [test_api_key_query](../README.md#test_api_key_query)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -280,18 +275,17 @@ Place an order for a pet
 
 ### Example 
 ```python
+import time
 import swagger_client
 from swagger_client.rest import ApiException
 from pprint import pprint
-import time
-
 
 # Configure API key authorization: test_api_client_id
-swagger_client.configuration.api_key['x-test_api_client_id'] = 'YOUR_API_KEY';
+swagger_client.configuration.api_key['x-test_api_client_id'] = 'YOUR_API_KEY'
 # Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
 # swagger_client.configuration.api_key_prefix['x-test_api_client_id'] = 'BEARER'
 # Configure API key authorization: test_api_client_secret
-swagger_client.configuration.api_key['x-test_api_client_secret'] = 'YOUR_API_KEY';
+swagger_client.configuration.api_key['x-test_api_client_secret'] = 'YOUR_API_KEY'
 # Uncomment below to setup prefix (e.g. BEARER) for API key, if needed
 # swagger_client.configuration.api_key_prefix['x-test_api_client_secret'] = 'BEARER'
 
@@ -301,7 +295,7 @@ body = swagger_client.Order() # Order | order placed for purchasing the pet (opt
 
 try: 
     # Place an order for a pet
-    api_response = api_instance.place_order(body=body);
+    api_response = api_instance.place_order(body=body)
     pprint(api_response)
 except ApiException as e:
     print "Exception when calling StoreApi->place_order: %s\n" % e
@@ -321,7 +315,7 @@ Name | Type | Description  | Notes
 
 [test_api_client_id](../README.md#test_api_client_id), [test_api_client_secret](../README.md#test_api_client_secret)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
diff --git a/samples/client/petstore/python/docs/UserApi.md b/samples/client/petstore/python/docs/UserApi.md
index 8145147a6ff..1975c1fe7f3 100644
--- a/samples/client/petstore/python/docs/UserApi.md
+++ b/samples/client/petstore/python/docs/UserApi.md
@@ -1,4 +1,4 @@
-# swagger_client\UserApi
+# swagger_client.UserApi
 
 All URIs are relative to *http://petstore.swagger.io/v2*
 
@@ -15,7 +15,7 @@ Method | HTTP request | Description
 
 
 # **create_user**
-> create_user(body=body)
+> create_user(body)
 
 Create user
 
@@ -23,19 +23,18 @@ This can only be done by the logged in user.
 
 ### Example 
 ```python
+import time
 import swagger_client
 from swagger_client.rest import ApiException
 from pprint import pprint
-import time
-
 
 # create an instance of the API class
 api_instance = swagger_client.UserApi()
-body = swagger_client.User() # User | Created user object (optional)
+body = swagger_client.User() # User | Created user object
 
 try: 
     # Create user
-    api_instance.create_user(body=body);
+    api_instance.create_user(body)
 except ApiException as e:
     print "Exception when calling UserApi->create_user: %s\n" % e
 ```
@@ -44,7 +43,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**User**](User.md)| Created user object | [optional] 
+ **body** | [**User**](User.md)| Created user object | 
 
 ### Return type
 
@@ -54,15 +53,15 @@ void (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **create_users_with_array_input**
-> create_users_with_array_input(body=body)
+> create_users_with_array_input(body)
 
 Creates list of users with given input array
 
@@ -70,19 +69,18 @@ Creates list of users with given input array
 
 ### Example 
 ```python
+import time
 import swagger_client
 from swagger_client.rest import ApiException
 from pprint import pprint
-import time
-
 
 # create an instance of the API class
 api_instance = swagger_client.UserApi()
-body = [swagger_client.User()] # list[User] | List of user object (optional)
+body = [swagger_client.User()] # list[User] | List of user object
 
 try: 
     # Creates list of users with given input array
-    api_instance.create_users_with_array_input(body=body);
+    api_instance.create_users_with_array_input(body)
 except ApiException as e:
     print "Exception when calling UserApi->create_users_with_array_input: %s\n" % e
 ```
@@ -91,7 +89,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**list[User]**](User.md)| List of user object | [optional] 
+ **body** | [**list[User]**](User.md)| List of user object | 
 
 ### Return type
 
@@ -101,15 +99,15 @@ void (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **create_users_with_list_input**
-> create_users_with_list_input(body=body)
+> create_users_with_list_input(body)
 
 Creates list of users with given input array
 
@@ -117,19 +115,18 @@ Creates list of users with given input array
 
 ### Example 
 ```python
+import time
 import swagger_client
 from swagger_client.rest import ApiException
 from pprint import pprint
-import time
-
 
 # create an instance of the API class
 api_instance = swagger_client.UserApi()
-body = [swagger_client.User()] # list[User] | List of user object (optional)
+body = [swagger_client.User()] # list[User] | List of user object
 
 try: 
     # Creates list of users with given input array
-    api_instance.create_users_with_list_input(body=body);
+    api_instance.create_users_with_list_input(body)
 except ApiException as e:
     print "Exception when calling UserApi->create_users_with_list_input: %s\n" % e
 ```
@@ -138,7 +135,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**list[User]**](User.md)| List of user object | [optional] 
+ **body** | [**list[User]**](User.md)| List of user object | 
 
 ### Return type
 
@@ -148,10 +145,10 @@ void (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
@@ -164,15 +161,10 @@ This can only be done by the logged in user.
 
 ### Example 
 ```python
+import time
 import swagger_client
 from swagger_client.rest import ApiException
 from pprint import pprint
-import time
-
-
-# Configure HTTP basic authorization: test_http_basic
-swagger_client.configuration.username = 'YOUR_USERNAME'
-swagger_client.configuration.password = 'YOUR_PASSWORD'
 
 # create an instance of the API class
 api_instance = swagger_client.UserApi()
@@ -180,7 +172,7 @@ username = 'username_example' # str | The name that needs to be deleted
 
 try: 
     # Delete user
-    api_instance.delete_user(username);
+    api_instance.delete_user(username)
 except ApiException as e:
     print "Exception when calling UserApi->delete_user: %s\n" % e
 ```
@@ -197,12 +189,12 @@ void (empty response body)
 
 ### Authorization
 
-[test_http_basic](../README.md#test_http_basic)
+No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
@@ -215,19 +207,18 @@ Get user by user name
 
 ### Example 
 ```python
+import time
 import swagger_client
 from swagger_client.rest import ApiException
 from pprint import pprint
-import time
-
 
 # create an instance of the API class
 api_instance = swagger_client.UserApi()
-username = 'username_example' # str | The name that needs to be fetched. Use user1 for testing.
+username = 'username_example' # str | The name that needs to be fetched. Use user1 for testing. 
 
 try: 
     # Get user by user name
-    api_response = api_instance.get_user_by_name(username);
+    api_response = api_instance.get_user_by_name(username)
     pprint(api_response)
 except ApiException as e:
     print "Exception when calling UserApi->get_user_by_name: %s\n" % e
@@ -237,7 +228,7 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **username** | **str**| The name that needs to be fetched. Use user1 for testing. | 
+ **username** | **str**| The name that needs to be fetched. Use user1 for testing.  | 
 
 ### Return type
 
@@ -247,15 +238,15 @@ Name | Type | Description  | Notes
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **login_user**
-> str login_user(username=username, password=password)
+> str login_user(username, password)
 
 Logs user into the system
 
@@ -263,20 +254,19 @@ Logs user into the system
 
 ### Example 
 ```python
+import time
 import swagger_client
 from swagger_client.rest import ApiException
 from pprint import pprint
-import time
-
 
 # create an instance of the API class
 api_instance = swagger_client.UserApi()
-username = 'username_example' # str | The user name for login (optional)
-password = 'password_example' # str | The password for login in clear text (optional)
+username = 'username_example' # str | The user name for login
+password = 'password_example' # str | The password for login in clear text
 
 try: 
     # Logs user into the system
-    api_response = api_instance.login_user(username=username, password=password);
+    api_response = api_instance.login_user(username, password)
     pprint(api_response)
 except ApiException as e:
     print "Exception when calling UserApi->login_user: %s\n" % e
@@ -286,8 +276,8 @@ except ApiException as e:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **username** | **str**| The user name for login | [optional] 
- **password** | **str**| The password for login in clear text | [optional] 
+ **username** | **str**| The user name for login | 
+ **password** | **str**| The password for login in clear text | 
 
 ### Return type
 
@@ -297,10 +287,10 @@ Name | Type | Description  | Notes
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
@@ -313,18 +303,17 @@ Logs out current logged in user session
 
 ### Example 
 ```python
+import time
 import swagger_client
 from swagger_client.rest import ApiException
 from pprint import pprint
-import time
-
 
 # create an instance of the API class
 api_instance = swagger_client.UserApi()
 
 try: 
     # Logs out current logged in user session
-    api_instance.logout_user();
+    api_instance.logout_user()
 except ApiException as e:
     print "Exception when calling UserApi->logout_user: %s\n" % e
 ```
@@ -340,15 +329,15 @@ void (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **update_user**
-> update_user(username, body=body)
+> update_user(username, body)
 
 Updated user
 
@@ -356,20 +345,19 @@ This can only be done by the logged in user.
 
 ### Example 
 ```python
+import time
 import swagger_client
 from swagger_client.rest import ApiException
 from pprint import pprint
-import time
-
 
 # create an instance of the API class
 api_instance = swagger_client.UserApi()
 username = 'username_example' # str | name that need to be deleted
-body = swagger_client.User() # User | Updated user object (optional)
+body = swagger_client.User() # User | Updated user object
 
 try: 
     # Updated user
-    api_instance.update_user(username, body=body);
+    api_instance.update_user(username, body)
 except ApiException as e:
     print "Exception when calling UserApi->update_user: %s\n" % e
 ```
@@ -379,7 +367,7 @@ except ApiException as e:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **username** | **str**| name that need to be deleted | 
- **body** | [**User**](User.md)| Updated user object | [optional] 
+ **body** | [**User**](User.md)| Updated user object | 
 
 ### Return type
 
@@ -389,10 +377,10 @@ void (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/python/petstore b/samples/client/petstore/python/petstore
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/samples/client/petstore/python/setup.py b/samples/client/petstore/python/setup.py
index 8564466b0dd..ef25bcba63b 100644
--- a/samples/client/petstore/python/setup.py
+++ b/samples/client/petstore/python/setup.py
@@ -28,7 +28,7 @@ setup(
     packages=find_packages(),
     include_package_data=True,
     long_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
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
     """
 )
 
diff --git a/samples/client/petstore/python/swagger_client.egg-info/PKG-INFO b/samples/client/petstore/python/swagger_client.egg-info/PKG-INFO
index d4fe6f978b3..a4852b36ea4 100644
--- a/samples/client/petstore/python/swagger_client.egg-info/PKG-INFO
+++ b/samples/client/petstore/python/swagger_client.egg-info/PKG-INFO
@@ -6,7 +6,7 @@ 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
+Description:     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
             
 Keywords: Swagger,Swagger Petstore
 Platform: UNKNOWN
diff --git a/samples/client/petstore/python/swagger_client/__init__.py b/samples/client/petstore/python/swagger_client/__init__.py
index dbdd791ada2..2169ecd37e7 100644
--- a/samples/client/petstore/python/swagger_client/__init__.py
+++ b/samples/client/petstore/python/swagger_client/__init__.py
@@ -2,10 +2,11 @@ from __future__ import absolute_import
 
 # import models into sdk package
 from .models.animal import Animal
+from .models.api_response import ApiResponse
 from .models.cat import Cat
 from .models.category import Category
 from .models.dog import Dog
-from .models.inline_response_200 import InlineResponse200
+from .models.format_test import FormatTest
 from .models.model_200_response import Model200Response
 from .models.model_return import ModelReturn
 from .models.name import Name
diff --git a/samples/client/petstore/python/swagger_client/apis/pet_api.py b/samples/client/petstore/python/swagger_client/apis/pet_api.py
index 8b081e077dc..cab854e3019 100644
--- a/samples/client/petstore/python/swagger_client/apis/pet_api.py
+++ b/samples/client/petstore/python/swagger_client/apis/pet_api.py
@@ -45,7 +45,7 @@ class PetApi(object):
                 config.api_client = ApiClient()
             self.api_client = config.api_client
 
-    def add_pet(self, **kwargs):
+    def add_pet(self, body, **kwargs):
         """
         Add a new pet to the store
         
@@ -56,11 +56,11 @@ class PetApi(object):
         >>> def callback_function(response):
         >>>     pprint(response)
         >>>
-        >>> thread = api.add_pet(callback=callback_function)
+        >>> thread = api.add_pet(body, 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
+        :param Pet body: Pet object that needs to be added to the store (required)
         :return: None
                  If the method is called asynchronously,
                  returns the request thread.
@@ -79,6 +79,9 @@ class PetApi(object):
             params[key] = val
         del params['kwargs']
 
+        # verify the required parameter 'body' is set
+        if ('body' not in params) or (params['body'] is None):
+            raise ValueError("Missing the required parameter `body` when calling `add_pet`")
 
         resource_path = '/pet'.replace('{format}', 'json')
         path_params = {}
@@ -96,81 +99,7 @@ class PetApi(object):
 
         # 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, 'POST',
-                                            path_params,
-                                            query_params,
-                                            header_params,
-                                            body=body_params,
-                                            post_params=form_params,
-                                            files=local_var_files,
-                                            response_type=None,
-                                            auth_settings=auth_settings,
-                                            callback=params.get('callback'))
-        return response
-
-    def add_pet_using_byte_array(self, **kwargs):
-        """
-        Fake endpoint to test byte array in body parameter for adding a new pet to the store
-        
-
-        This method makes a synchronous HTTP request by default. To make an
-        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_using_byte_array(callback=callback_function)
-
-        :param callback function: The callback function
-            for asynchronous request. (optional)
-        :param str body: Pet object in the form of byte array
-        :return: None
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['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_using_byte_array" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-
-        resource_path = '/pet?testing_byte_array=true'.replace('{format}', 'json')
-        path_params = {}
-
-        query_params = {}
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        if 'body' in params:
-            body_params = params['body']
-
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
+            select_header_accept(['application/xml', 'application/json'])
         if not header_params['Accept']:
             del header_params['Accept']
 
@@ -250,7 +179,7 @@ class PetApi(object):
 
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
+            select_header_accept(['application/xml', 'application/json'])
         if not header_params['Accept']:
             del header_params['Accept']
 
@@ -273,7 +202,7 @@ class PetApi(object):
                                             callback=params.get('callback'))
         return response
 
-    def find_pets_by_status(self, **kwargs):
+    def find_pets_by_status(self, status, **kwargs):
         """
         Finds Pets by status
         Multiple status values can be provided with comma separated strings
@@ -284,11 +213,11 @@ class PetApi(object):
         >>> def callback_function(response):
         >>>     pprint(response)
         >>>
-        >>> thread = api.find_pets_by_status(callback=callback_function)
+        >>> thread = api.find_pets_by_status(status, callback=callback_function)
 
         :param callback function: The callback function
             for asynchronous request. (optional)
-        :param list[str] status: Status values that need to be considered for query
+        :param list[str] status: Status values that need to be considered for filter (required)
         :return: list[Pet]
                  If the method is called asynchronously,
                  returns the request thread.
@@ -307,6 +236,9 @@ class PetApi(object):
             params[key] = val
         del params['kwargs']
 
+        # verify the required parameter 'status' is set
+        if ('status' not in params) or (params['status'] is None):
+            raise ValueError("Missing the required parameter `status` when calling `find_pets_by_status`")
 
         resource_path = '/pet/findByStatus'.replace('{format}', 'json')
         path_params = {}
@@ -324,7 +256,7 @@ class PetApi(object):
 
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
+            select_header_accept(['application/xml', 'application/json'])
         if not header_params['Accept']:
             del header_params['Accept']
 
@@ -347,10 +279,10 @@ class PetApi(object):
                                             callback=params.get('callback'))
         return response
 
-    def find_pets_by_tags(self, **kwargs):
+    def find_pets_by_tags(self, tags, **kwargs):
         """
         Finds Pets by tags
-        Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+        Multiple tags can be provided with comma separated 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
@@ -358,11 +290,11 @@ class PetApi(object):
         >>> def callback_function(response):
         >>>     pprint(response)
         >>>
-        >>> thread = api.find_pets_by_tags(callback=callback_function)
+        >>> thread = api.find_pets_by_tags(tags, callback=callback_function)
 
         :param callback function: The callback function
             for asynchronous request. (optional)
-        :param list[str] tags: Tags to filter by
+        :param list[str] tags: Tags to filter by (required)
         :return: list[Pet]
                  If the method is called asynchronously,
                  returns the request thread.
@@ -381,6 +313,9 @@ class PetApi(object):
             params[key] = val
         del params['kwargs']
 
+        # verify the required parameter 'tags' is set
+        if ('tags' not in params) or (params['tags'] is None):
+            raise ValueError("Missing the required parameter `tags` when calling `find_pets_by_tags`")
 
         resource_path = '/pet/findByTags'.replace('{format}', 'json')
         path_params = {}
@@ -398,7 +333,7 @@ class PetApi(object):
 
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
+            select_header_accept(['application/xml', 'application/json'])
         if not header_params['Accept']:
             del header_params['Accept']
 
@@ -424,7 +359,7 @@ class PetApi(object):
     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
+        Returns a single pet
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please define a `callback` function
@@ -436,7 +371,7 @@ class PetApi(object):
 
         :param callback function: The callback function
             for asynchronous request. (optional)
-        :param int pet_id: ID of pet that needs to be fetched (required)
+        :param int pet_id: ID of pet to return (required)
         :return: Pet
                  If the method is called asynchronously,
                  returns the request thread.
@@ -475,7 +410,7 @@ class PetApi(object):
 
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
+            select_header_accept(['application/xml', 'application/json'])
         if not header_params['Accept']:
             del header_params['Accept']
 
@@ -484,7 +419,7 @@ class PetApi(object):
             select_header_content_type([])
 
         # Authentication setting
-        auth_settings = ['api_key', 'petstore_auth']
+        auth_settings = ['api_key']
 
         response = self.api_client.call_api(resource_path, 'GET',
                                             path_params,
@@ -498,161 +433,7 @@ class PetApi(object):
                                             callback=params.get('callback'))
         return response
 
-    def get_pet_by_id_in_object(self, pet_id, **kwargs):
-        """
-        Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
-        Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
-
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please define a `callback` function
-        to be invoked when receiving the response.
-        >>> def callback_function(response):
-        >>>     pprint(response)
-        >>>
-        >>> thread = api.get_pet_by_id_in_object(pet_id, callback=callback_function)
-
-        :param callback function: The callback function
-            for asynchronous request. (optional)
-        :param int pet_id: ID of pet that needs to be fetched (required)
-        :return: InlineResponse200
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['pet_id']
-        all_params.append('callback')
-
-        params = locals()
-        for key, val in iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method get_pet_by_id_in_object" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        # verify the required parameter 'pet_id' is set
-        if ('pet_id' not in params) or (params['pet_id'] is None):
-            raise ValueError("Missing the required parameter `pet_id` when calling `get_pet_by_id_in_object`")
-
-        resource_path = '/pet/{petId}?response=inline_arbitrary_object'.replace('{format}', 'json')
-        path_params = {}
-        if 'pet_id' in params:
-            path_params['petId'] = params['pet_id']
-
-        query_params = {}
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
-        if not header_params['Accept']:
-            del header_params['Accept']
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.\
-            select_header_content_type([])
-
-        # Authentication setting
-        auth_settings = ['api_key', 'petstore_auth']
-
-        response = self.api_client.call_api(resource_path, 'GET',
-                                            path_params,
-                                            query_params,
-                                            header_params,
-                                            body=body_params,
-                                            post_params=form_params,
-                                            files=local_var_files,
-                                            response_type='InlineResponse200',
-                                            auth_settings=auth_settings,
-                                            callback=params.get('callback'))
-        return response
-
-    def pet_pet_idtesting_byte_arraytrue_get(self, pet_id, **kwargs):
-        """
-        Fake endpoint to test byte array return by 'Find pet by ID'
-        Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
-
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please define a `callback` function
-        to be invoked when receiving the response.
-        >>> def callback_function(response):
-        >>>     pprint(response)
-        >>>
-        >>> thread = api.pet_pet_idtesting_byte_arraytrue_get(pet_id, callback=callback_function)
-
-        :param callback function: The callback function
-            for asynchronous request. (optional)
-        :param int pet_id: ID of pet that needs to be fetched (required)
-        :return: str
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['pet_id']
-        all_params.append('callback')
-
-        params = locals()
-        for key, val in iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method pet_pet_idtesting_byte_arraytrue_get" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-        # verify the required parameter 'pet_id' is set
-        if ('pet_id' not in params) or (params['pet_id'] is None):
-            raise ValueError("Missing the required parameter `pet_id` when calling `pet_pet_idtesting_byte_arraytrue_get`")
-
-        resource_path = '/pet/{petId}?testing_byte_array=true'.replace('{format}', 'json')
-        path_params = {}
-        if 'pet_id' in params:
-            path_params['petId'] = params['pet_id']
-
-        query_params = {}
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
-        if not header_params['Accept']:
-            del header_params['Accept']
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.\
-            select_header_content_type([])
-
-        # Authentication setting
-        auth_settings = ['api_key', 'petstore_auth']
-
-        response = self.api_client.call_api(resource_path, 'GET',
-                                            path_params,
-                                            query_params,
-                                            header_params,
-                                            body=body_params,
-                                            post_params=form_params,
-                                            files=local_var_files,
-                                            response_type='str',
-                                            auth_settings=auth_settings,
-                                            callback=params.get('callback'))
-        return response
-
-    def update_pet(self, **kwargs):
+    def update_pet(self, body, **kwargs):
         """
         Update an existing pet
         
@@ -663,11 +444,11 @@ class PetApi(object):
         >>> def callback_function(response):
         >>>     pprint(response)
         >>>
-        >>> thread = api.update_pet(callback=callback_function)
+        >>> thread = api.update_pet(body, 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
+        :param Pet body: Pet object that needs to be added to the store (required)
         :return: None
                  If the method is called asynchronously,
                  returns the request thread.
@@ -686,6 +467,9 @@ class PetApi(object):
             params[key] = val
         del params['kwargs']
 
+        # verify the required parameter 'body' is set
+        if ('body' not in params) or (params['body'] is None):
+            raise ValueError("Missing the required parameter `body` when calling `update_pet`")
 
         resource_path = '/pet'.replace('{format}', 'json')
         path_params = {}
@@ -703,7 +487,7 @@ class PetApi(object):
 
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
+            select_header_accept(['application/xml', 'application/json'])
         if not header_params['Accept']:
             del header_params['Accept']
 
@@ -741,7 +525,7 @@ class PetApi(object):
 
         :param callback function: The callback function
             for asynchronous request. (optional)
-        :param str pet_id: ID of pet that needs to be updated (required)
+        :param int 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
@@ -786,7 +570,7 @@ class PetApi(object):
 
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
+            select_header_accept(['application/xml', 'application/json'])
         if not header_params['Accept']:
             del header_params['Accept']
 
@@ -827,7 +611,7 @@ class PetApi(object):
         :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
+        :return: ApiResponse
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -869,7 +653,7 @@ class PetApi(object):
 
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
+            select_header_accept(['application/json'])
         if not header_params['Accept']:
             del header_params['Accept']
 
@@ -887,7 +671,7 @@ class PetApi(object):
                                             body=body_params,
                                             post_params=form_params,
                                             files=local_var_files,
-                                            response_type=None,
+                                            response_type='ApiResponse',
                                             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
index 85bb90ed40c..9391a6a6096 100644
--- a/samples/client/petstore/python/swagger_client/apis/store_api.py
+++ b/samples/client/petstore/python/swagger_client/apis/store_api.py
@@ -99,7 +99,7 @@ class StoreApi(object):
 
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
+            select_header_accept(['application/xml', 'application/json'])
         if not header_params['Accept']:
             del header_params['Accept']
 
@@ -122,80 +122,6 @@ class StoreApi(object):
                                             callback=params.get('callback'))
         return response
 
-    def find_orders_by_status(self, **kwargs):
-        """
-        Finds orders by status
-        A single status value can be provided as a string
-
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please define a `callback` function
-        to be invoked when receiving the response.
-        >>> def callback_function(response):
-        >>>     pprint(response)
-        >>>
-        >>> thread = api.find_orders_by_status(callback=callback_function)
-
-        :param callback function: The callback function
-            for asynchronous request. (optional)
-        :param str status: Status value that needs to be considered for query
-        :return: list[Order]
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['status']
-        all_params.append('callback')
-
-        params = locals()
-        for key, val in iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method find_orders_by_status" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-
-        resource_path = '/store/findByStatus'.replace('{format}', 'json')
-        path_params = {}
-
-        query_params = {}
-        if 'status' in params:
-            query_params['status'] = params['status']
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
-        if not header_params['Accept']:
-            del header_params['Accept']
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.\
-            select_header_content_type([])
-
-        # Authentication setting
-        auth_settings = ['test_api_client_id', 'test_api_client_secret']
-
-        response = self.api_client.call_api(resource_path, 'GET',
-                                            path_params,
-                                            query_params,
-                                            header_params,
-                                            body=body_params,
-                                            post_params=form_params,
-                                            files=local_var_files,
-                                            response_type='list[Order]',
-                                            auth_settings=auth_settings,
-                                            callback=params.get('callback'))
-        return response
-
     def get_inventory(self, **kwargs):
         """
         Returns pet inventories by status
@@ -244,7 +170,7 @@ class StoreApi(object):
 
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
+            select_header_accept(['application/json'])
         if not header_params['Accept']:
             del header_params['Accept']
 
@@ -267,77 +193,6 @@ class StoreApi(object):
                                             callback=params.get('callback'))
         return response
 
-    def get_inventory_in_object(self, **kwargs):
-        """
-        Fake endpoint to test arbitrary object return by 'Get inventory'
-        Returns an arbitrary object which is actually a map of status codes to quantities
-
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please define a `callback` function
-        to be invoked when receiving the response.
-        >>> def callback_function(response):
-        >>>     pprint(response)
-        >>>
-        >>> thread = api.get_inventory_in_object(callback=callback_function)
-
-        :param callback function: The callback function
-            for asynchronous request. (optional)
-        :return: object
-                 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_in_object" % key
-                )
-            params[key] = val
-        del params['kwargs']
-
-
-        resource_path = '/store/inventory?response=arbitrary_object'.replace('{format}', 'json')
-        path_params = {}
-
-        query_params = {}
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
-        if not header_params['Accept']:
-            del header_params['Accept']
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.\
-            select_header_content_type([])
-
-        # Authentication setting
-        auth_settings = ['api_key']
-
-        response = self.api_client.call_api(resource_path, 'GET',
-                                            path_params,
-                                            query_params,
-                                            header_params,
-                                            body=body_params,
-                                            post_params=form_params,
-                                            files=local_var_files,
-                                            response_type='object',
-                                            auth_settings=auth_settings,
-                                            callback=params.get('callback'))
-        return response
-
     def get_order_by_id(self, order_id, **kwargs):
         """
         Find purchase order by ID
@@ -353,7 +208,7 @@ class StoreApi(object):
 
         :param callback function: The callback function
             for asynchronous request. (optional)
-        :param str order_id: ID of pet that needs to be fetched (required)
+        :param int order_id: ID of pet that needs to be fetched (required)
         :return: Order
                  If the method is called asynchronously,
                  returns the request thread.
@@ -392,7 +247,7 @@ class StoreApi(object):
 
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
+            select_header_accept(['application/xml', 'application/json'])
         if not header_params['Accept']:
             del header_params['Accept']
 
@@ -401,7 +256,7 @@ class StoreApi(object):
             select_header_content_type([])
 
         # Authentication setting
-        auth_settings = ['test_api_key_header', 'test_api_key_query']
+        auth_settings = []
 
         response = self.api_client.call_api(resource_path, 'GET',
                                             path_params,
@@ -415,7 +270,7 @@ class StoreApi(object):
                                             callback=params.get('callback'))
         return response
 
-    def place_order(self, **kwargs):
+    def place_order(self, body, **kwargs):
         """
         Place an order for a pet
         
@@ -426,11 +281,11 @@ class StoreApi(object):
         >>> def callback_function(response):
         >>>     pprint(response)
         >>>
-        >>> thread = api.place_order(callback=callback_function)
+        >>> thread = api.place_order(body, callback=callback_function)
 
         :param callback function: The callback function
             for asynchronous request. (optional)
-        :param Order body: order placed for purchasing the pet
+        :param Order body: order placed for purchasing the pet (required)
         :return: Order
                  If the method is called asynchronously,
                  returns the request thread.
@@ -449,6 +304,9 @@ class StoreApi(object):
             params[key] = val
         del params['kwargs']
 
+        # verify the required parameter 'body' is set
+        if ('body' not in params) or (params['body'] is None):
+            raise ValueError("Missing the required parameter `body` when calling `place_order`")
 
         resource_path = '/store/order'.replace('{format}', 'json')
         path_params = {}
@@ -466,7 +324,7 @@ class StoreApi(object):
 
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
+            select_header_accept(['application/xml', 'application/json'])
         if not header_params['Accept']:
             del header_params['Accept']
 
@@ -475,7 +333,7 @@ class StoreApi(object):
             select_header_content_type([])
 
         # Authentication setting
-        auth_settings = ['test_api_client_id', 'test_api_client_secret']
+        auth_settings = []
 
         response = self.api_client.call_api(resource_path, 'POST',
                                             path_params,
diff --git a/samples/client/petstore/python/swagger_client/apis/user_api.py b/samples/client/petstore/python/swagger_client/apis/user_api.py
index 07d976b0bf5..733a950f393 100644
--- a/samples/client/petstore/python/swagger_client/apis/user_api.py
+++ b/samples/client/petstore/python/swagger_client/apis/user_api.py
@@ -45,7 +45,7 @@ class UserApi(object):
                 config.api_client = ApiClient()
             self.api_client = config.api_client
 
-    def create_user(self, **kwargs):
+    def create_user(self, body, **kwargs):
         """
         Create user
         This can only be done by the logged in user.
@@ -56,11 +56,11 @@ class UserApi(object):
         >>> def callback_function(response):
         >>>     pprint(response)
         >>>
-        >>> thread = api.create_user(callback=callback_function)
+        >>> thread = api.create_user(body, callback=callback_function)
 
         :param callback function: The callback function
             for asynchronous request. (optional)
-        :param User body: Created user object
+        :param User body: Created user object (required)
         :return: None
                  If the method is called asynchronously,
                  returns the request thread.
@@ -79,6 +79,9 @@ class UserApi(object):
             params[key] = val
         del params['kwargs']
 
+        # verify the required parameter 'body' is set
+        if ('body' not in params) or (params['body'] is None):
+            raise ValueError("Missing the required parameter `body` when calling `create_user`")
 
         resource_path = '/user'.replace('{format}', 'json')
         path_params = {}
@@ -96,7 +99,7 @@ class UserApi(object):
 
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
+            select_header_accept(['application/xml', 'application/json'])
         if not header_params['Accept']:
             del header_params['Accept']
 
@@ -119,7 +122,7 @@ class UserApi(object):
                                             callback=params.get('callback'))
         return response
 
-    def create_users_with_array_input(self, **kwargs):
+    def create_users_with_array_input(self, body, **kwargs):
         """
         Creates list of users with given input array
         
@@ -130,11 +133,11 @@ class UserApi(object):
         >>> def callback_function(response):
         >>>     pprint(response)
         >>>
-        >>> thread = api.create_users_with_array_input(callback=callback_function)
+        >>> thread = api.create_users_with_array_input(body, callback=callback_function)
 
         :param callback function: The callback function
             for asynchronous request. (optional)
-        :param list[User] body: List of user object
+        :param list[User] body: List of user object (required)
         :return: None
                  If the method is called asynchronously,
                  returns the request thread.
@@ -153,6 +156,9 @@ class UserApi(object):
             params[key] = val
         del params['kwargs']
 
+        # verify the required parameter 'body' is set
+        if ('body' not in params) or (params['body'] is None):
+            raise ValueError("Missing the required parameter `body` when calling `create_users_with_array_input`")
 
         resource_path = '/user/createWithArray'.replace('{format}', 'json')
         path_params = {}
@@ -170,7 +176,7 @@ class UserApi(object):
 
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
+            select_header_accept(['application/xml', 'application/json'])
         if not header_params['Accept']:
             del header_params['Accept']
 
@@ -193,7 +199,7 @@ class UserApi(object):
                                             callback=params.get('callback'))
         return response
 
-    def create_users_with_list_input(self, **kwargs):
+    def create_users_with_list_input(self, body, **kwargs):
         """
         Creates list of users with given input array
         
@@ -204,11 +210,11 @@ class UserApi(object):
         >>> def callback_function(response):
         >>>     pprint(response)
         >>>
-        >>> thread = api.create_users_with_list_input(callback=callback_function)
+        >>> thread = api.create_users_with_list_input(body, callback=callback_function)
 
         :param callback function: The callback function
             for asynchronous request. (optional)
-        :param list[User] body: List of user object
+        :param list[User] body: List of user object (required)
         :return: None
                  If the method is called asynchronously,
                  returns the request thread.
@@ -227,6 +233,9 @@ class UserApi(object):
             params[key] = val
         del params['kwargs']
 
+        # verify the required parameter 'body' is set
+        if ('body' not in params) or (params['body'] is None):
+            raise ValueError("Missing the required parameter `body` when calling `create_users_with_list_input`")
 
         resource_path = '/user/createWithList'.replace('{format}', 'json')
         path_params = {}
@@ -244,7 +253,7 @@ class UserApi(object):
 
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
+            select_header_accept(['application/xml', 'application/json'])
         if not header_params['Accept']:
             del header_params['Accept']
 
@@ -321,7 +330,7 @@ class UserApi(object):
 
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
+            select_header_accept(['application/xml', 'application/json'])
         if not header_params['Accept']:
             del header_params['Accept']
 
@@ -330,7 +339,7 @@ class UserApi(object):
             select_header_content_type([])
 
         # Authentication setting
-        auth_settings = ['test_http_basic']
+        auth_settings = []
 
         response = self.api_client.call_api(resource_path, 'DELETE',
                                             path_params,
@@ -359,7 +368,7 @@ class UserApi(object):
 
         :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)
+        :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.
@@ -398,7 +407,7 @@ class UserApi(object):
 
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
+            select_header_accept(['application/xml', 'application/json'])
         if not header_params['Accept']:
             del header_params['Accept']
 
@@ -421,7 +430,7 @@ class UserApi(object):
                                             callback=params.get('callback'))
         return response
 
-    def login_user(self, **kwargs):
+    def login_user(self, username, password, **kwargs):
         """
         Logs user into the system
         
@@ -432,12 +441,12 @@ class UserApi(object):
         >>> def callback_function(response):
         >>>     pprint(response)
         >>>
-        >>> thread = api.login_user(callback=callback_function)
+        >>> thread = api.login_user(username, password, 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
+        :param str username: The user name for login (required)
+        :param str password: The password for login in clear text (required)
         :return: str
                  If the method is called asynchronously,
                  returns the request thread.
@@ -456,6 +465,12 @@ class UserApi(object):
             params[key] = val
         del params['kwargs']
 
+        # verify the required parameter 'username' is set
+        if ('username' not in params) or (params['username'] is None):
+            raise ValueError("Missing the required parameter `username` when calling `login_user`")
+        # verify the required parameter 'password' is set
+        if ('password' not in params) or (params['password'] is None):
+            raise ValueError("Missing the required parameter `password` when calling `login_user`")
 
         resource_path = '/user/login'.replace('{format}', 'json')
         path_params = {}
@@ -475,7 +490,7 @@ class UserApi(object):
 
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
+            select_header_accept(['application/xml', 'application/json'])
         if not header_params['Accept']:
             del header_params['Accept']
 
@@ -546,7 +561,7 @@ class UserApi(object):
 
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
+            select_header_accept(['application/xml', 'application/json'])
         if not header_params['Accept']:
             del header_params['Accept']
 
@@ -569,7 +584,7 @@ class UserApi(object):
                                             callback=params.get('callback'))
         return response
 
-    def update_user(self, username, **kwargs):
+    def update_user(self, username, body, **kwargs):
         """
         Updated user
         This can only be done by the logged in user.
@@ -580,12 +595,12 @@ class UserApi(object):
         >>> def callback_function(response):
         >>>     pprint(response)
         >>>
-        >>> thread = api.update_user(username, callback=callback_function)
+        >>> thread = api.update_user(username, body, 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
+        :param User body: Updated user object (required)
         :return: None
                  If the method is called asynchronously,
                  returns the request thread.
@@ -607,6 +622,9 @@ class UserApi(object):
         # verify the required parameter 'username' is set
         if ('username' not in params) or (params['username'] is None):
             raise ValueError("Missing the required parameter `username` when calling `update_user`")
+        # verify the required parameter 'body' is set
+        if ('body' not in params) or (params['body'] is None):
+            raise ValueError("Missing the required parameter `body` when calling `update_user`")
 
         resource_path = '/user/{username}'.replace('{format}', 'json')
         path_params = {}
@@ -626,7 +644,7 @@ class UserApi(object):
 
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/json', 'application/xml'])
+            select_header_accept(['application/xml', 'application/json'])
         if not header_params['Accept']:
             del header_params['Accept']
 
diff --git a/samples/client/petstore/python/swagger_client/configuration.py b/samples/client/petstore/python/swagger_client/configuration.py
index 8f66e4428c5..fe38630927e 100644
--- a/samples/client/petstore/python/swagger_client/configuration.py
+++ b/samples/client/petstore/python/swagger_client/configuration.py
@@ -217,13 +217,6 @@ class Configuration(object):
         :return: The Auth Settings information dict.
         """
         return {
-            'test_api_key_header':
-                {
-                    'type': 'api_key',
-                    'in': 'header',
-                    'key': 'test_api_key_header',
-                    'value': self.get_api_key_with_prefix('test_api_key_header')
-                },
             'api_key':
                 {
                     'type': 'api_key',
@@ -231,34 +224,6 @@ class Configuration(object):
                     'key': 'api_key',
                     'value': self.get_api_key_with_prefix('api_key')
                 },
-            'test_http_basic':
-                {
-                    'type': 'basic',
-                    'in': 'header',
-                    'key': 'Authorization',
-                    'value': self.get_basic_auth_token()
-                },
-            'test_api_client_secret':
-                {
-                    'type': 'api_key',
-                    'in': 'header',
-                    'key': 'x-test_api_client_secret',
-                    'value': self.get_api_key_with_prefix('x-test_api_client_secret')
-                },
-            'test_api_client_id':
-                {
-                    'type': 'api_key',
-                    'in': 'header',
-                    'key': 'x-test_api_client_id',
-                    'value': self.get_api_key_with_prefix('x-test_api_client_id')
-                },
-            'test_api_key_query':
-                {
-                    'type': 'api_key',
-                    'in': 'query',
-                    'key': 'test_api_key_query',
-                    'value': self.get_api_key_with_prefix('test_api_key_query')
-                },
 
         }
 
diff --git a/samples/client/petstore/python/swagger_client/models/__init__.py b/samples/client/petstore/python/swagger_client/models/__init__.py
index c441500bc40..1d0e82f2295 100644
--- a/samples/client/petstore/python/swagger_client/models/__init__.py
+++ b/samples/client/petstore/python/swagger_client/models/__init__.py
@@ -2,10 +2,11 @@ from __future__ import absolute_import
 
 # import models into model package
 from .animal import Animal
+from .api_response import ApiResponse
 from .cat import Cat
 from .category import Category
 from .dog import Dog
-from .inline_response_200 import InlineResponse200
+from .format_test import FormatTest
 from .model_200_response import Model200Response
 from .model_return import ModelReturn
 from .name import Name
diff --git a/samples/client/petstore/python/swagger_client/models/api_response.py b/samples/client/petstore/python/swagger_client/models/api_response.py
new file mode 100644
index 00000000000..c49bde7fbc6
--- /dev/null
+++ b/samples/client/petstore/python/swagger_client/models/api_response.py
@@ -0,0 +1,170 @@
+# coding: utf-8
+
+"""
+Copyright 2016 SmartBear Software
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+    Ref: https://github.com/swagger-api/swagger-codegen
+"""
+
+from pprint import pformat
+from six import iteritems
+
+
+class ApiResponse(object):
+    """
+    NOTE: This class is auto generated by the swagger code generator program.
+    Do not edit the class manually.
+    """
+    def __init__(self):
+        """
+        ApiResponse - 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 = {
+            'code': 'int',
+            'type': 'str',
+            'message': 'str'
+        }
+
+        self.attribute_map = {
+            'code': 'code',
+            'type': 'type',
+            'message': 'message'
+        }
+
+        self._code = None
+        self._type = None
+        self._message = None
+
+    @property
+    def code(self):
+        """
+        Gets the code of this ApiResponse.
+
+
+        :return: The code of this ApiResponse.
+        :rtype: int
+        """
+        return self._code
+
+    @code.setter
+    def code(self, code):
+        """
+        Sets the code of this ApiResponse.
+
+
+        :param code: The code of this ApiResponse.
+        :type: int
+        """
+        self._code = code
+
+    @property
+    def type(self):
+        """
+        Gets the type of this ApiResponse.
+
+
+        :return: The type of this ApiResponse.
+        :rtype: str
+        """
+        return self._type
+
+    @type.setter
+    def type(self, type):
+        """
+        Sets the type of this ApiResponse.
+
+
+        :param type: The type of this ApiResponse.
+        :type: str
+        """
+        self._type = type
+
+    @property
+    def message(self):
+        """
+        Gets the message of this ApiResponse.
+
+
+        :return: The message of this ApiResponse.
+        :rtype: str
+        """
+        return self._message
+
+    @message.setter
+    def message(self, message):
+        """
+        Sets the message of this ApiResponse.
+
+
+        :param message: The message of this ApiResponse.
+        :type: str
+        """
+        self._message = message
+
+    def to_dict(self):
+        """
+        Returns the model properties as a dict
+        """
+        result = {}
+
+        for attr, _ in iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+
+        return result
+
+    def to_str(self):
+        """
+        Returns the string representation of the model
+        """
+        return pformat(self.to_dict())
+
+    def __repr__(self):
+        """
+        For `print` and `pprint`
+        """
+        return self.to_str()
+
+    def __eq__(self, other):
+        """
+        Returns true if both objects are equal
+        """
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """
+        Returns true if both objects are not equal
+        """
+        return not self == other
+
diff --git a/samples/client/petstore/python/swagger_client/models/format_test.py b/samples/client/petstore/python/swagger_client/models/format_test.py
new file mode 100644
index 00000000000..8654d79bc3c
--- /dev/null
+++ b/samples/client/petstore/python/swagger_client/models/format_test.py
@@ -0,0 +1,395 @@
+# coding: utf-8
+
+"""
+Copyright 2016 SmartBear Software
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+    Ref: https://github.com/swagger-api/swagger-codegen
+"""
+
+from pprint import pformat
+from six import iteritems
+
+
+class FormatTest(object):
+    """
+    NOTE: This class is auto generated by the swagger code generator program.
+    Do not edit the class manually.
+    """
+    def __init__(self):
+        """
+        FormatTest - 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 = {
+            'integer': 'int',
+            'int32': 'int',
+            'int64': 'int',
+            'number': 'float',
+            'float': 'float',
+            'double': 'float',
+            'string': 'str',
+            'byte': 'str',
+            'binary': 'str',
+            'date': 'date',
+            'date_time': 'datetime',
+            'password': 'str'
+        }
+
+        self.attribute_map = {
+            'integer': 'integer',
+            'int32': 'int32',
+            'int64': 'int64',
+            'number': 'number',
+            'float': 'float',
+            'double': 'double',
+            'string': 'string',
+            'byte': 'byte',
+            'binary': 'binary',
+            'date': 'date',
+            'date_time': 'dateTime',
+            'password': 'password'
+        }
+
+        self._integer = None
+        self._int32 = None
+        self._int64 = None
+        self._number = None
+        self._float = None
+        self._double = None
+        self._string = None
+        self._byte = None
+        self._binary = None
+        self._date = None
+        self._date_time = None
+        self._password = None
+
+    @property
+    def integer(self):
+        """
+        Gets the integer of this FormatTest.
+
+
+        :return: The integer of this FormatTest.
+        :rtype: int
+        """
+        return self._integer
+
+    @integer.setter
+    def integer(self, integer):
+        """
+        Sets the integer of this FormatTest.
+
+
+        :param integer: The integer of this FormatTest.
+        :type: int
+        """
+        self._integer = integer
+
+    @property
+    def int32(self):
+        """
+        Gets the int32 of this FormatTest.
+
+
+        :return: The int32 of this FormatTest.
+        :rtype: int
+        """
+        return self._int32
+
+    @int32.setter
+    def int32(self, int32):
+        """
+        Sets the int32 of this FormatTest.
+
+
+        :param int32: The int32 of this FormatTest.
+        :type: int
+        """
+        self._int32 = int32
+
+    @property
+    def int64(self):
+        """
+        Gets the int64 of this FormatTest.
+
+
+        :return: The int64 of this FormatTest.
+        :rtype: int
+        """
+        return self._int64
+
+    @int64.setter
+    def int64(self, int64):
+        """
+        Sets the int64 of this FormatTest.
+
+
+        :param int64: The int64 of this FormatTest.
+        :type: int
+        """
+        self._int64 = int64
+
+    @property
+    def number(self):
+        """
+        Gets the number of this FormatTest.
+
+
+        :return: The number of this FormatTest.
+        :rtype: float
+        """
+        return self._number
+
+    @number.setter
+    def number(self, number):
+        """
+        Sets the number of this FormatTest.
+
+
+        :param number: The number of this FormatTest.
+        :type: float
+        """
+        self._number = number
+
+    @property
+    def float(self):
+        """
+        Gets the float of this FormatTest.
+
+
+        :return: The float of this FormatTest.
+        :rtype: float
+        """
+        return self._float
+
+    @float.setter
+    def float(self, float):
+        """
+        Sets the float of this FormatTest.
+
+
+        :param float: The float of this FormatTest.
+        :type: float
+        """
+        self._float = float
+
+    @property
+    def double(self):
+        """
+        Gets the double of this FormatTest.
+
+
+        :return: The double of this FormatTest.
+        :rtype: float
+        """
+        return self._double
+
+    @double.setter
+    def double(self, double):
+        """
+        Sets the double of this FormatTest.
+
+
+        :param double: The double of this FormatTest.
+        :type: float
+        """
+        self._double = double
+
+    @property
+    def string(self):
+        """
+        Gets the string of this FormatTest.
+
+
+        :return: The string of this FormatTest.
+        :rtype: str
+        """
+        return self._string
+
+    @string.setter
+    def string(self, string):
+        """
+        Sets the string of this FormatTest.
+
+
+        :param string: The string of this FormatTest.
+        :type: str
+        """
+        self._string = string
+
+    @property
+    def byte(self):
+        """
+        Gets the byte of this FormatTest.
+
+
+        :return: The byte of this FormatTest.
+        :rtype: str
+        """
+        return self._byte
+
+    @byte.setter
+    def byte(self, byte):
+        """
+        Sets the byte of this FormatTest.
+
+
+        :param byte: The byte of this FormatTest.
+        :type: str
+        """
+        self._byte = byte
+
+    @property
+    def binary(self):
+        """
+        Gets the binary of this FormatTest.
+
+
+        :return: The binary of this FormatTest.
+        :rtype: str
+        """
+        return self._binary
+
+    @binary.setter
+    def binary(self, binary):
+        """
+        Sets the binary of this FormatTest.
+
+
+        :param binary: The binary of this FormatTest.
+        :type: str
+        """
+        self._binary = binary
+
+    @property
+    def date(self):
+        """
+        Gets the date of this FormatTest.
+
+
+        :return: The date of this FormatTest.
+        :rtype: date
+        """
+        return self._date
+
+    @date.setter
+    def date(self, date):
+        """
+        Sets the date of this FormatTest.
+
+
+        :param date: The date of this FormatTest.
+        :type: date
+        """
+        self._date = date
+
+    @property
+    def date_time(self):
+        """
+        Gets the date_time of this FormatTest.
+
+
+        :return: The date_time of this FormatTest.
+        :rtype: datetime
+        """
+        return self._date_time
+
+    @date_time.setter
+    def date_time(self, date_time):
+        """
+        Sets the date_time of this FormatTest.
+
+
+        :param date_time: The date_time of this FormatTest.
+        :type: datetime
+        """
+        self._date_time = date_time
+
+    @property
+    def password(self):
+        """
+        Gets the password of this FormatTest.
+
+
+        :return: The password of this FormatTest.
+        :rtype: str
+        """
+        return self._password
+
+    @password.setter
+    def password(self, password):
+        """
+        Sets the password of this FormatTest.
+
+
+        :param password: The password of this FormatTest.
+        :type: str
+        """
+        self._password = password
+
+    def to_dict(self):
+        """
+        Returns the model properties as a dict
+        """
+        result = {}
+
+        for attr, _ in iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+
+        return result
+
+    def to_str(self):
+        """
+        Returns the string representation of the model
+        """
+        return pformat(self.to_dict())
+
+    def __repr__(self):
+        """
+        For `print` and `pprint`
+        """
+        return self.to_str()
+
+    def __eq__(self, other):
+        """
+        Returns true if both objects are equal
+        """
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """
+        Returns true if both objects are not equal
+        """
+        return not self == other
+
diff --git a/samples/client/petstore/python/swagger_client/models/order.py b/samples/client/petstore/python/swagger_client/models/order.py
index 4c8911f267b..8fe90765e03 100644
--- a/samples/client/petstore/python/swagger_client/models/order.py
+++ b/samples/client/petstore/python/swagger_client/models/order.py
@@ -59,7 +59,7 @@ class Order(object):
         self._quantity = None
         self._ship_date = None
         self._status = None
-        self._complete = None
+        self._complete = False
 
     @property
     def id(self):
diff --git a/samples/client/petstore/python/test.sh b/samples/client/petstore/python/test_python2.sh
similarity index 100%
rename from samples/client/petstore/python/test.sh
rename to samples/client/petstore/python/test_python2.sh
diff --git a/samples/client/petstore/python/test-all.sh b/samples/client/petstore/python/test_python2_and_3.sh
similarity index 100%
rename from samples/client/petstore/python/test-all.sh
rename to samples/client/petstore/python/test_python2_and_3.sh
diff --git a/samples/client/petstore/qt5cpp/client/SWGApiResponse.cpp b/samples/client/petstore/qt5cpp/client/SWGApiResponse.cpp
new file mode 100644
index 00000000000..3c813677bf1
--- /dev/null
+++ b/samples/client/petstore/qt5cpp/client/SWGApiResponse.cpp
@@ -0,0 +1,119 @@
+
+#include "SWGApiResponse.h"
+
+#include "SWGHelpers.h"
+
+#include <QJsonDocument>
+#include <QJsonArray>
+#include <QObject>
+#include <QDebug>
+
+namespace Swagger {
+
+
+SWGApiResponse::SWGApiResponse(QString* json) {
+    init();
+    this->fromJson(*json);
+}
+
+SWGApiResponse::SWGApiResponse() {
+    init();
+}
+
+SWGApiResponse::~SWGApiResponse() {
+    this->cleanup();
+}
+
+void
+SWGApiResponse::init() {
+    code = 0;
+type = new QString("");
+message = new QString("");
+}
+
+void
+SWGApiResponse::cleanup() {
+    
+if(type != NULL) {
+        delete type;
+    }
+if(message != NULL) {
+        delete message;
+    }
+}
+
+SWGApiResponse*
+SWGApiResponse::fromJson(QString &json) {
+    QByteArray array (json.toStdString().c_str());
+    QJsonDocument doc = QJsonDocument::fromJson(array);
+    QJsonObject jsonObject = doc.object();
+    this->fromJsonObject(jsonObject);
+    return this;
+}
+
+void
+SWGApiResponse::fromJsonObject(QJsonObject &pJson) {
+    setValue(&code, pJson["code"], "qint32", "");
+setValue(&type, pJson["type"], "QString", "QString");
+setValue(&message, pJson["message"], "QString", "QString");
+}
+
+QString
+SWGApiResponse::asJson ()
+{
+    QJsonObject* obj = this->asJsonObject();
+    
+    QJsonDocument doc(*obj);
+    QByteArray bytes = doc.toJson();
+    return QString(bytes);
+}
+
+QJsonObject*
+SWGApiResponse::asJsonObject() {
+    QJsonObject* obj = new QJsonObject();
+    obj->insert("code", QJsonValue(code));
+
+    
+    toJsonValue(QString("type"), type, obj, QString("QString"));
+    
+        
+
+    
+    toJsonValue(QString("message"), message, obj, QString("QString"));
+    
+        
+
+    return obj;
+}
+
+qint32
+SWGApiResponse::getCode() {
+    return code;
+}
+void
+SWGApiResponse::setCode(qint32 code) {
+    this->code = code;
+}
+
+QString*
+SWGApiResponse::getType() {
+    return type;
+}
+void
+SWGApiResponse::setType(QString* type) {
+    this->type = type;
+}
+
+QString*
+SWGApiResponse::getMessage() {
+    return message;
+}
+void
+SWGApiResponse::setMessage(QString* message) {
+    this->message = message;
+}
+
+
+
+} /* namespace Swagger */
+
diff --git a/samples/client/petstore/qt5cpp/client/SWGApiResponse.h b/samples/client/petstore/qt5cpp/client/SWGApiResponse.h
new file mode 100644
index 00000000000..0b9b0c1acac
--- /dev/null
+++ b/samples/client/petstore/qt5cpp/client/SWGApiResponse.h
@@ -0,0 +1,48 @@
+/*
+ * SWGApiResponse.h
+ * 
+ * 
+ */
+
+#ifndef SWGApiResponse_H_
+#define SWGApiResponse_H_
+
+#include <QJsonObject>
+
+
+#include <QString>
+
+#include "SWGObject.h"
+
+
+namespace Swagger {
+
+class SWGApiResponse: public SWGObject {
+public:
+    SWGApiResponse();
+    SWGApiResponse(QString* json);
+    virtual ~SWGApiResponse();
+    void init();
+    void cleanup();
+
+    QString asJson ();
+    QJsonObject* asJsonObject();
+    void fromJsonObject(QJsonObject &json);
+    SWGApiResponse* fromJson(QString &jsonString);
+
+    qint32 getCode();
+    void setCode(qint32 code);
+QString* getType();
+    void setType(QString* type);
+QString* getMessage();
+    void setMessage(QString* message);
+
+private:
+    qint32 code;
+QString* type;
+QString* message;
+};
+
+} /* namespace Swagger */
+
+#endif /* SWGApiResponse_H_ */
diff --git a/samples/client/petstore/qt5cpp/client/SWGCategory.cpp b/samples/client/petstore/qt5cpp/client/SWGCategory.cpp
index 9a5aaa14af7..c2f0a7e59b6 100644
--- a/samples/client/petstore/qt5cpp/client/SWGCategory.cpp
+++ b/samples/client/petstore/qt5cpp/client/SWGCategory.cpp
@@ -27,17 +27,15 @@ SWGCategory::~SWGCategory() {
 void
 SWGCategory::init() {
     id = 0L;
-    name = new QString("");
-    
+name = new QString("");
 }
 
 void
 SWGCategory::cleanup() {
     
-    if(name != NULL) {
+if(name != NULL) {
         delete name;
     }
-    
 }
 
 SWGCategory*
@@ -52,8 +50,7 @@ SWGCategory::fromJson(QString &json) {
 void
 SWGCategory::fromJsonObject(QJsonObject &pJson) {
     setValue(&id, pJson["id"], "qint64", "");
-    setValue(&name, pJson["name"], "QString", "QString");
-    
+setValue(&name, pJson["name"], "QString", "QString");
 }
 
 QString
@@ -70,13 +67,11 @@ QJsonObject*
 SWGCategory::asJsonObject() {
     QJsonObject* obj = new QJsonObject();
     obj->insert("id", QJsonValue(id));
-    
+
     
     toJsonValue(QString("name"), name, obj, QString("QString"));
     
-    
-    
-    
+        
 
     return obj;
 }
diff --git a/samples/client/petstore/qt5cpp/client/SWGCategory.h b/samples/client/petstore/qt5cpp/client/SWGCategory.h
index b1d5b65538f..248d0630ed7 100644
--- a/samples/client/petstore/qt5cpp/client/SWGCategory.h
+++ b/samples/client/petstore/qt5cpp/client/SWGCategory.h
@@ -32,14 +32,12 @@ public:
 
     qint64 getId();
     void setId(qint64 id);
-    QString* getName();
+QString* getName();
     void setName(QString* name);
-    
 
 private:
     qint64 id;
-    QString* name;
-    
+QString* name;
 };
 
 } /* namespace Swagger */
diff --git a/samples/client/petstore/qt5cpp/client/SWGModelFactory.h b/samples/client/petstore/qt5cpp/client/SWGModelFactory.h
index 588a7ad952b..18cc79911ab 100644
--- a/samples/client/petstore/qt5cpp/client/SWGModelFactory.h
+++ b/samples/client/petstore/qt5cpp/client/SWGModelFactory.h
@@ -2,28 +2,32 @@
 #define ModelFactory_H_
 
 
-#include "SWGUser.h"
+#include "SWGApiResponse.h"
 #include "SWGCategory.h"
+#include "SWGOrder.h"
 #include "SWGPet.h"
 #include "SWGTag.h"
-#include "SWGOrder.h"
+#include "SWGUser.h"
 
 namespace Swagger {
   inline void* create(QString type) {
-    if(QString("SWGUser").compare(type) == 0) {
-      return new SWGUser();
+    if(QString("SWGApiResponse").compare(type) == 0) {
+      return new SWGApiResponse();
     }
     if(QString("SWGCategory").compare(type) == 0) {
       return new SWGCategory();
     }
+    if(QString("SWGOrder").compare(type) == 0) {
+      return new SWGOrder();
+    }
     if(QString("SWGPet").compare(type) == 0) {
       return new SWGPet();
     }
     if(QString("SWGTag").compare(type) == 0) {
       return new SWGTag();
     }
-    if(QString("SWGOrder").compare(type) == 0) {
-      return new SWGOrder();
+    if(QString("SWGUser").compare(type) == 0) {
+      return new SWGUser();
     }
     
     return NULL;
diff --git a/samples/client/petstore/qt5cpp/client/SWGOrder.cpp b/samples/client/petstore/qt5cpp/client/SWGOrder.cpp
index 3e34f2669c7..2be083bbb3e 100644
--- a/samples/client/petstore/qt5cpp/client/SWGOrder.cpp
+++ b/samples/client/petstore/qt5cpp/client/SWGOrder.cpp
@@ -27,27 +27,25 @@ SWGOrder::~SWGOrder() {
 void
 SWGOrder::init() {
     id = 0L;
-    petId = 0L;
-    quantity = 0;
-    shipDate = NULL;
-    status = new QString("");
-    complete = false;
-    
+petId = 0L;
+quantity = 0;
+shipDate = NULL;
+status = new QString("");
+complete = false;
 }
 
 void
 SWGOrder::cleanup() {
     
-    
-    
-    if(shipDate != NULL) {
+
+
+if(shipDate != NULL) {
         delete shipDate;
     }
-    if(status != NULL) {
+if(status != NULL) {
         delete status;
     }
-    
-    
+
 }
 
 SWGOrder*
@@ -62,12 +60,11 @@ SWGOrder::fromJson(QString &json) {
 void
 SWGOrder::fromJsonObject(QJsonObject &pJson) {
     setValue(&id, pJson["id"], "qint64", "");
-    setValue(&petId, pJson["petId"], "qint64", "");
-    setValue(&quantity, pJson["quantity"], "qint32", "");
-    setValue(&shipDate, pJson["shipDate"], "QDateTime", "QDateTime");
-    setValue(&status, pJson["status"], "QString", "QString");
-    setValue(&complete, pJson["complete"], "bool", "");
-    
+setValue(&petId, pJson["petId"], "qint64", "");
+setValue(&quantity, pJson["quantity"], "qint32", "");
+setValue(&shipDate, pJson["shipDate"], "QDateTime", "QDateTime");
+setValue(&status, pJson["status"], "QString", "QString");
+setValue(&complete, pJson["complete"], "bool", "");
 }
 
 QString
@@ -84,22 +81,19 @@ QJsonObject*
 SWGOrder::asJsonObject() {
     QJsonObject* obj = new QJsonObject();
     obj->insert("id", QJsonValue(id));
-    obj->insert("petId", QJsonValue(petId));
-    obj->insert("quantity", QJsonValue(quantity));
-    
+obj->insert("petId", QJsonValue(petId));
+obj->insert("quantity", QJsonValue(quantity));
+
     
     toJsonValue(QString("shipDate"), shipDate, obj, QString("QDateTime"));
     
-    
-    
-    
+        
+
     
     toJsonValue(QString("status"), status, obj, QString("QString"));
     
-    
-    
-    obj->insert("complete", QJsonValue(complete));
-    
+        
+obj->insert("complete", QJsonValue(complete));
 
     return obj;
 }
diff --git a/samples/client/petstore/qt5cpp/client/SWGOrder.h b/samples/client/petstore/qt5cpp/client/SWGOrder.h
index d17713afe78..fd3855000ea 100644
--- a/samples/client/petstore/qt5cpp/client/SWGOrder.h
+++ b/samples/client/petstore/qt5cpp/client/SWGOrder.h
@@ -33,26 +33,24 @@ public:
 
     qint64 getId();
     void setId(qint64 id);
-    qint64 getPetId();
+qint64 getPetId();
     void setPetId(qint64 petId);
-    qint32 getQuantity();
+qint32 getQuantity();
     void setQuantity(qint32 quantity);
-    QDateTime* getShipDate();
+QDateTime* getShipDate();
     void setShipDate(QDateTime* shipDate);
-    QString* getStatus();
+QString* getStatus();
     void setStatus(QString* status);
-    bool getComplete();
+bool getComplete();
     void setComplete(bool complete);
-    
 
 private:
     qint64 id;
-    qint64 petId;
-    qint32 quantity;
-    QDateTime* shipDate;
-    QString* status;
-    bool complete;
-    
+qint64 petId;
+qint32 quantity;
+QDateTime* shipDate;
+QString* status;
+bool complete;
 };
 
 } /* namespace Swagger */
diff --git a/samples/client/petstore/qt5cpp/client/SWGPet.cpp b/samples/client/petstore/qt5cpp/client/SWGPet.cpp
index d0e5b8280e2..7152738ad8b 100644
--- a/samples/client/petstore/qt5cpp/client/SWGPet.cpp
+++ b/samples/client/petstore/qt5cpp/client/SWGPet.cpp
@@ -27,41 +27,39 @@ SWGPet::~SWGPet() {
 void
 SWGPet::init() {
     id = 0L;
-    category = new SWGCategory();
-    name = new QString("");
-    photoUrls = new QList<QString*>();
-    tags = new QList<SWGTag*>();
-    status = new QString("");
-    
+category = new SWGCategory();
+name = new QString("");
+photoUrls = new QList<QString*>();
+tags = new QList<SWGTag*>();
+status = new QString("");
 }
 
 void
 SWGPet::cleanup() {
     
-    if(category != NULL) {
+if(category != NULL) {
         delete category;
     }
-    if(name != NULL) {
+if(name != NULL) {
         delete name;
     }
-    if(photoUrls != NULL) {
+if(photoUrls != NULL) {
         QList<QString*>* arr = photoUrls;
         foreach(QString* o, *arr) {
             delete o;
         }
         delete photoUrls;
     }
-    if(tags != NULL) {
+if(tags != NULL) {
         QList<SWGTag*>* arr = tags;
         foreach(SWGTag* o, *arr) {
             delete o;
         }
         delete tags;
     }
-    if(status != NULL) {
+if(status != NULL) {
         delete status;
     }
-    
 }
 
 SWGPet*
@@ -76,12 +74,11 @@ SWGPet::fromJson(QString &json) {
 void
 SWGPet::fromJsonObject(QJsonObject &pJson) {
     setValue(&id, pJson["id"], "qint64", "");
-    setValue(&category, pJson["category"], "SWGCategory", "SWGCategory");
-    setValue(&name, pJson["name"], "QString", "QString");
-    setValue(&photoUrls, pJson["photoUrls"], "QList", "QString");
-    setValue(&tags, pJson["tags"], "QList", "SWGTag");
-    setValue(&status, pJson["status"], "QString", "QString");
-    
+setValue(&category, pJson["category"], "SWGCategory", "SWGCategory");
+setValue(&name, pJson["name"], "QString", "QString");
+setValue(&photoUrls, pJson["photoUrls"], "QList", "QString");
+setValue(&tags, pJson["tags"], "QList", "SWGTag");
+setValue(&status, pJson["status"], "QString", "QString");
 }
 
 QString
@@ -98,19 +95,17 @@ QJsonObject*
 SWGPet::asJsonObject() {
     QJsonObject* obj = new QJsonObject();
     obj->insert("id", QJsonValue(id));
-    
+
     
     toJsonValue(QString("category"), category, obj, QString("SWGCategory"));
     
-    
-    
-    
+        
+
     
     toJsonValue(QString("name"), name, obj, QString("QString"));
     
-    
-    
-    
+        
+
     
     QList<QString*>* photoUrlsList = photoUrls;
     QJsonArray photoUrlsJsonArray;
@@ -118,8 +113,7 @@ SWGPet::asJsonObject() {
 
     obj->insert("photoUrls", photoUrlsJsonArray);
     
-    
-    
+
     
     QList<SWGTag*>* tagsList = tags;
     QJsonArray tagsJsonArray;
@@ -127,14 +121,11 @@ SWGPet::asJsonObject() {
 
     obj->insert("tags", tagsJsonArray);
     
-    
-    
+
     
     toJsonValue(QString("status"), status, obj, QString("QString"));
     
-    
-    
-    
+        
 
     return obj;
 }
diff --git a/samples/client/petstore/qt5cpp/client/SWGPet.h b/samples/client/petstore/qt5cpp/client/SWGPet.h
index 7b96ffc03f3..a58e599d218 100644
--- a/samples/client/petstore/qt5cpp/client/SWGPet.h
+++ b/samples/client/petstore/qt5cpp/client/SWGPet.h
@@ -35,26 +35,24 @@ public:
 
     qint64 getId();
     void setId(qint64 id);
-    SWGCategory* getCategory();
+SWGCategory* getCategory();
     void setCategory(SWGCategory* category);
-    QString* getName();
+QString* getName();
     void setName(QString* name);
-    QList<QString*>* getPhotoUrls();
+QList<QString*>* getPhotoUrls();
     void setPhotoUrls(QList<QString*>* photoUrls);
-    QList<SWGTag*>* getTags();
+QList<SWGTag*>* getTags();
     void setTags(QList<SWGTag*>* tags);
-    QString* getStatus();
+QString* getStatus();
     void setStatus(QString* status);
-    
 
 private:
     qint64 id;
-    SWGCategory* category;
-    QString* name;
-    QList<QString*>* photoUrls;
-    QList<SWGTag*>* tags;
-    QString* status;
-    
+SWGCategory* category;
+QString* name;
+QList<QString*>* photoUrls;
+QList<SWGTag*>* tags;
+QString* status;
 };
 
 } /* namespace Swagger */
diff --git a/samples/client/petstore/qt5cpp/client/SWGPetApi.cpp b/samples/client/petstore/qt5cpp/client/SWGPetApi.cpp
index a50c172d5bf..b5e383575be 100644
--- a/samples/client/petstore/qt5cpp/client/SWGPetApi.cpp
+++ b/samples/client/petstore/qt5cpp/client/SWGPetApi.cpp
@@ -15,76 +15,21 @@ SWGPetApi::SWGPetApi(QString host, QString basePath) {
     this->basePath = basePath;
 }
 
-void
-SWGPetApi::updatePet(SWGPet body) {
-    QString fullPath;
-    fullPath.append(this->host).append(this->basePath).append("/pet");
-
-    
-
-    
-
-    HttpRequestWorker *worker = new HttpRequestWorker();
-    HttpRequestInput input(fullPath, "PUT");
-
-    
-
-    
-    
-    
-    QString output = body.asJson();
-    input.request_body.append(output);
-    
-
-    
-
-    connect(worker,
-            &HttpRequestWorker::on_execution_finished,
-            this,
-            &SWGPetApi::updatePetCallback);
-
-    worker->execute(&input);
-}
-
-void
-SWGPetApi::updatePetCallback(HttpRequestWorker * worker) {
-    QString msg;
-    if (worker->error_type == QNetworkReply::NoError) {
-        msg = QString("Success! %1 bytes").arg(worker->response.length());
-    }
-    else {
-        msg = "Error: " + worker->error_str;
-    }
-
-    
-
-    worker->deleteLater();
-
-    
-    emit updatePetSignal();
-}
 void
 SWGPetApi::addPet(SWGPet body) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/pet");
 
-    
 
-    
 
     HttpRequestWorker *worker = new HttpRequestWorker();
     HttpRequestInput input(fullPath, "POST");
 
     
-
-    
-    
-    
     QString output = body.asJson();
     input.request_body.append(output);
     
 
-    
 
     connect(worker,
             &HttpRequestWorker::on_execution_finished,
@@ -112,19 +57,57 @@ SWGPetApi::addPetCallback(HttpRequestWorker * worker) {
     emit addPetSignal();
 }
 void
+SWGPetApi::deletePet(qint64 petId, QString* apiKey) {
+    QString fullPath;
+    fullPath.append(this->host).append(this->basePath).append("/pet/{petId}");
+
+    QString petIdPathParam("{"); petIdPathParam.append("petId").append("}");
+    fullPath.replace(petIdPathParam, stringValue(petId));
+
+
+    HttpRequestWorker *worker = new HttpRequestWorker();
+    HttpRequestInput input(fullPath, "DELETE");
+
+    
+
+
+    // TODO: add header support
+
+    connect(worker,
+            &HttpRequestWorker::on_execution_finished,
+            this,
+            &SWGPetApi::deletePetCallback);
+
+    worker->execute(&input);
+}
+
+void
+SWGPetApi::deletePetCallback(HttpRequestWorker * worker) {
+    QString msg;
+    if (worker->error_type == QNetworkReply::NoError) {
+        msg = QString("Success! %1 bytes").arg(worker->response.length());
+    }
+    else {
+        msg = "Error: " + worker->error_str;
+    }
+
+    
+
+    worker->deleteLater();
+
+    
+    emit deletePetSignal();
+}
+void
 SWGPetApi::findPetsByStatus(QList<QString*>* status) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/pet/findByStatus");
 
-    
 
-    
-    
 
-    
 
     if (status->size() > 0) {
-      if (QString("multi").indexOf("multi") == 0) {
+      if (QString("csv").indexOf("multi") == 0) {
         foreach(QString* t, *status) {
           if (fullPath.indexOf("?") > 0)
             fullPath.append("&");
@@ -133,7 +116,7 @@ SWGPetApi::findPetsByStatus(QList<QString*>* status) {
           fullPath.append("status=").append(stringValue(t));
         }
       }
-      else if (QString("multi").indexOf("ssv") == 0) {
+      else if (QString("csv").indexOf("ssv") == 0) {
         if (fullPath.indexOf("?") > 0)
           fullPath.append("&");
         else 
@@ -147,7 +130,7 @@ SWGPetApi::findPetsByStatus(QList<QString*>* status) {
           fullPath.append(stringValue(t));
         }
       }
-      else if (QString("multi").indexOf("tsv") == 0) {
+      else if (QString("csv").indexOf("tsv") == 0) {
         if (fullPath.indexOf("?") > 0)
           fullPath.append("&");
         else 
@@ -163,17 +146,13 @@ SWGPetApi::findPetsByStatus(QList<QString*>* status) {
       }
     }
 
-    
-    
 
     HttpRequestWorker *worker = new HttpRequestWorker();
     HttpRequestInput input(fullPath, "GET");
 
     
 
-    
 
-    
 
     connect(worker,
             &HttpRequestWorker::on_execution_finished,
@@ -207,7 +186,6 @@ SWGPetApi::findPetsByStatusCallback(HttpRequestWorker * worker) {
         o->fromJsonObject(*ptr);
         output->append(o);
     }
-    
 
     
 
@@ -221,15 +199,11 @@ SWGPetApi::findPetsByTags(QList<QString*>* tags) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/pet/findByTags");
 
-    
 
-    
-    
 
-    
 
     if (tags->size() > 0) {
-      if (QString("multi").indexOf("multi") == 0) {
+      if (QString("csv").indexOf("multi") == 0) {
         foreach(QString* t, *tags) {
           if (fullPath.indexOf("?") > 0)
             fullPath.append("&");
@@ -238,7 +212,7 @@ SWGPetApi::findPetsByTags(QList<QString*>* tags) {
           fullPath.append("tags=").append(stringValue(t));
         }
       }
-      else if (QString("multi").indexOf("ssv") == 0) {
+      else if (QString("csv").indexOf("ssv") == 0) {
         if (fullPath.indexOf("?") > 0)
           fullPath.append("&");
         else 
@@ -252,7 +226,7 @@ SWGPetApi::findPetsByTags(QList<QString*>* tags) {
           fullPath.append(stringValue(t));
         }
       }
-      else if (QString("multi").indexOf("tsv") == 0) {
+      else if (QString("csv").indexOf("tsv") == 0) {
         if (fullPath.indexOf("?") > 0)
           fullPath.append("&");
         else 
@@ -268,17 +242,13 @@ SWGPetApi::findPetsByTags(QList<QString*>* tags) {
       }
     }
 
-    
-    
 
     HttpRequestWorker *worker = new HttpRequestWorker();
     HttpRequestInput input(fullPath, "GET");
 
     
 
-    
 
-    
 
     connect(worker,
             &HttpRequestWorker::on_execution_finished,
@@ -312,7 +282,6 @@ SWGPetApi::findPetsByTagsCallback(HttpRequestWorker * worker) {
         o->fromJsonObject(*ptr);
         output->append(o);
     }
-    
 
     
 
@@ -326,21 +295,16 @@ SWGPetApi::getPetById(qint64 petId) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/pet/{petId}");
 
-    
     QString petIdPathParam("{"); petIdPathParam.append("petId").append("}");
     fullPath.replace(petIdPathParam, stringValue(petId));
-    
 
-    
 
     HttpRequestWorker *worker = new HttpRequestWorker();
     HttpRequestInput input(fullPath, "GET");
 
     
 
-    
 
-    
 
     connect(worker,
             &HttpRequestWorker::on_execution_finished,
@@ -361,15 +325,9 @@ SWGPetApi::getPetByIdCallback(HttpRequestWorker * worker) {
     }
 
     
-
-    
-    
-    
-    QString json(worker->response);
+        QString json(worker->response);
     SWGPet* output = static_cast<SWGPet*>(create(json, QString("SWGPet")));
     
-    
-    
 
     worker->deleteLater();
 
@@ -377,16 +335,54 @@ SWGPetApi::getPetByIdCallback(HttpRequestWorker * worker) {
     
 }
 void
-SWGPetApi::updatePetWithForm(QString* petId, QString* name, QString* status) {
+SWGPetApi::updatePet(SWGPet body) {
+    QString fullPath;
+    fullPath.append(this->host).append(this->basePath).append("/pet");
+
+
+
+    HttpRequestWorker *worker = new HttpRequestWorker();
+    HttpRequestInput input(fullPath, "PUT");
+
+    
+    QString output = body.asJson();
+    input.request_body.append(output);
+    
+
+
+    connect(worker,
+            &HttpRequestWorker::on_execution_finished,
+            this,
+            &SWGPetApi::updatePetCallback);
+
+    worker->execute(&input);
+}
+
+void
+SWGPetApi::updatePetCallback(HttpRequestWorker * worker) {
+    QString msg;
+    if (worker->error_type == QNetworkReply::NoError) {
+        msg = QString("Success! %1 bytes").arg(worker->response.length());
+    }
+    else {
+        msg = "Error: " + worker->error_str;
+    }
+
+    
+
+    worker->deleteLater();
+
+    
+    emit updatePetSignal();
+}
+void
+SWGPetApi::updatePetWithForm(qint64 petId, QString* name, QString* status) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/pet/{petId}");
 
-    
     QString petIdPathParam("{"); petIdPathParam.append("petId").append("}");
     fullPath.replace(petIdPathParam, stringValue(petId));
-    
 
-    
 
     HttpRequestWorker *worker = new HttpRequestWorker();
     HttpRequestInput input(fullPath, "POST");
@@ -394,14 +390,12 @@ SWGPetApi::updatePetWithForm(QString* petId, QString* name, QString* status) {
     if (name != NULL) {
         input.add_var("name", *name);
     }
-    if (status != NULL) {
+if (status != NULL) {
         input.add_var("status", *status);
     }
-    
 
-    
 
-    
+
 
     connect(worker,
             &HttpRequestWorker::on_execution_finished,
@@ -429,64 +423,13 @@ SWGPetApi::updatePetWithFormCallback(HttpRequestWorker * worker) {
     emit updatePetWithFormSignal();
 }
 void
-SWGPetApi::deletePet(qint64 petId, QString* apiKey) {
-    QString fullPath;
-    fullPath.append(this->host).append(this->basePath).append("/pet/{petId}");
-
-    
-    QString petIdPathParam("{"); petIdPathParam.append("petId").append("}");
-    fullPath.replace(petIdPathParam, stringValue(petId));
-    
-
-    
-
-    HttpRequestWorker *worker = new HttpRequestWorker();
-    HttpRequestInput input(fullPath, "DELETE");
-
-    
-
-    
-
-    
-    // TODO: add header support
-    
-
-    connect(worker,
-            &HttpRequestWorker::on_execution_finished,
-            this,
-            &SWGPetApi::deletePetCallback);
-
-    worker->execute(&input);
-}
-
-void
-SWGPetApi::deletePetCallback(HttpRequestWorker * worker) {
-    QString msg;
-    if (worker->error_type == QNetworkReply::NoError) {
-        msg = QString("Success! %1 bytes").arg(worker->response.length());
-    }
-    else {
-        msg = "Error: " + worker->error_str;
-    }
-
-    
-
-    worker->deleteLater();
-
-    
-    emit deletePetSignal();
-}
-void
 SWGPetApi::uploadFile(qint64 petId, QString* additionalMetadata, SWGHttpRequestInputFileElement* file) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/pet/{petId}/uploadImage");
 
-    
     QString petIdPathParam("{"); petIdPathParam.append("petId").append("}");
     fullPath.replace(petIdPathParam, stringValue(petId));
-    
 
-    
 
     HttpRequestWorker *worker = new HttpRequestWorker();
     HttpRequestInput input(fullPath, "POST");
@@ -494,14 +437,12 @@ SWGPetApi::uploadFile(qint64 petId, QString* additionalMetadata, SWGHttpRequestI
     if (additionalMetadata != NULL) {
         input.add_var("additionalMetadata", *additionalMetadata);
     }
-    if (file != NULL) {
+if (file != NULL) {
         input.add_file("file", *file.local_filename, *file.request_filename, *file.mime_type);
     }
-    
 
-    
 
-    
+
 
     connect(worker,
             &HttpRequestWorker::on_execution_finished,
@@ -522,113 +463,13 @@ SWGPetApi::uploadFileCallback(HttpRequestWorker * worker) {
     }
 
     
-
-    worker->deleteLater();
-
-    
-    emit uploadFileSignal();
-}
-void
-SWGPetApi::getPetByIdWithByteArray(qint64 petId) {
-    QString fullPath;
-    fullPath.append(this->host).append(this->basePath).append("/pet/{petId}?testing_byte_array=true");
-
-    
-    QString petIdPathParam("{"); petIdPathParam.append("petId").append("}");
-    fullPath.replace(petIdPathParam, stringValue(petId));
-    
-
-    
-
-    HttpRequestWorker *worker = new HttpRequestWorker();
-    HttpRequestInput input(fullPath, "GET");
-
-    
-
-    
-
-    
-
-    connect(worker,
-            &HttpRequestWorker::on_execution_finished,
-            this,
-            &SWGPetApi::getPetByIdWithByteArrayCallback);
-
-    worker->execute(&input);
-}
-
-void
-SWGPetApi::getPetByIdWithByteArrayCallback(HttpRequestWorker * worker) {
-    QString msg;
-    if (worker->error_type == QNetworkReply::NoError) {
-        msg = QString("Success! %1 bytes").arg(worker->response.length());
-    }
-    else {
-        msg = "Error: " + worker->error_str;
-    }
-
-    
-
-    
-    
-    
-    QString json(worker->response);
-    QString* output = static_cast<QString*>(create(json, QString("QString")));
-    
-    
+        QString json(worker->response);
+    SWGApiResponse* output = static_cast<SWGApiResponse*>(create(json, QString("SWGApiResponse")));
     
 
     worker->deleteLater();
 
-    emit getPetByIdWithByteArraySignal(output);
+    emit uploadFileSignal(output);
     
 }
-void
-SWGPetApi::addPetUsingByteArray(QString* body) {
-    QString fullPath;
-    fullPath.append(this->host).append(this->basePath).append("/pet?testing_byte_array=true");
-
-    
-
-    
-
-    HttpRequestWorker *worker = new HttpRequestWorker();
-    HttpRequestInput input(fullPath, "POST");
-
-    
-
-    
-    
-    
-    QString output = body.asJson();
-    input.request_body.append(output);
-    
-
-    
-
-    connect(worker,
-            &HttpRequestWorker::on_execution_finished,
-            this,
-            &SWGPetApi::addPetUsingByteArrayCallback);
-
-    worker->execute(&input);
-}
-
-void
-SWGPetApi::addPetUsingByteArrayCallback(HttpRequestWorker * worker) {
-    QString msg;
-    if (worker->error_type == QNetworkReply::NoError) {
-        msg = QString("Success! %1 bytes").arg(worker->response.length());
-    }
-    else {
-        msg = "Error: " + worker->error_str;
-    }
-
-    
-
-    worker->deleteLater();
-
-    
-    emit addPetUsingByteArraySignal();
-}
 } /* namespace Swagger */
diff --git a/samples/client/petstore/qt5cpp/client/SWGPetApi.h b/samples/client/petstore/qt5cpp/client/SWGPetApi.h
index 89055da3b3d..a18a6375555 100644
--- a/samples/client/petstore/qt5cpp/client/SWGPetApi.h
+++ b/samples/client/petstore/qt5cpp/client/SWGPetApi.h
@@ -5,6 +5,7 @@
 
 #include "SWGPet.h"
 #include <QString>
+#include "SWGApiResponse.h"
 #include "SWGHttpRequest.h"
 
 #include <QObject>
@@ -22,40 +23,34 @@ public:
     QString host;
     QString basePath;
 
-    void updatePet(SWGPet body);
     void addPet(SWGPet body);
+    void deletePet(qint64 petId, QString* apiKey);
     void findPetsByStatus(QList<QString*>* status);
     void findPetsByTags(QList<QString*>* tags);
     void getPetById(qint64 petId);
-    void updatePetWithForm(QString* petId, QString* name, QString* status);
-    void deletePet(qint64 petId, QString* apiKey);
+    void updatePet(SWGPet body);
+    void updatePetWithForm(qint64 petId, QString* name, QString* status);
     void uploadFile(qint64 petId, QString* additionalMetadata, SWGHttpRequestInputFileElement* file);
-    void getPetByIdWithByteArray(qint64 petId);
-    void addPetUsingByteArray(QString* body);
     
 private:
-    void updatePetCallback (HttpRequestWorker * worker);
     void addPetCallback (HttpRequestWorker * worker);
+    void deletePetCallback (HttpRequestWorker * worker);
     void findPetsByStatusCallback (HttpRequestWorker * worker);
     void findPetsByTagsCallback (HttpRequestWorker * worker);
     void getPetByIdCallback (HttpRequestWorker * worker);
+    void updatePetCallback (HttpRequestWorker * worker);
     void updatePetWithFormCallback (HttpRequestWorker * worker);
-    void deletePetCallback (HttpRequestWorker * worker);
     void uploadFileCallback (HttpRequestWorker * worker);
-    void getPetByIdWithByteArrayCallback (HttpRequestWorker * worker);
-    void addPetUsingByteArrayCallback (HttpRequestWorker * worker);
     
 signals:
-    void updatePetSignal();
     void addPetSignal();
+    void deletePetSignal();
     void findPetsByStatusSignal(QList<SWGPet*>* summary);
     void findPetsByTagsSignal(QList<SWGPet*>* summary);
     void getPetByIdSignal(SWGPet* summary);
+    void updatePetSignal();
     void updatePetWithFormSignal();
-    void deletePetSignal();
-    void uploadFileSignal();
-    void getPetByIdWithByteArraySignal(QString* summary);
-    void addPetUsingByteArraySignal();
+    void uploadFileSignal(SWGApiResponse* summary);
     
 };
 }
diff --git a/samples/client/petstore/qt5cpp/client/SWGStoreApi.cpp b/samples/client/petstore/qt5cpp/client/SWGStoreApi.cpp
index be603573f62..968b89a4116 100644
--- a/samples/client/petstore/qt5cpp/client/SWGStoreApi.cpp
+++ b/samples/client/petstore/qt5cpp/client/SWGStoreApi.cpp
@@ -15,201 +15,21 @@ SWGStoreApi::SWGStoreApi(QString host, QString basePath) {
     this->basePath = basePath;
 }
 
-void
-SWGStoreApi::getInventory() {
-    QString fullPath;
-    fullPath.append(this->host).append(this->basePath).append("/store/inventory");
-
-    
-
-    
-
-    HttpRequestWorker *worker = new HttpRequestWorker();
-    HttpRequestInput input(fullPath, "GET");
-
-    
-
-    
-
-    
-
-    connect(worker,
-            &HttpRequestWorker::on_execution_finished,
-            this,
-            &SWGStoreApi::getInventoryCallback);
-
-    worker->execute(&input);
-}
-
-void
-SWGStoreApi::getInventoryCallback(HttpRequestWorker * worker) {
-    QString msg;
-    if (worker->error_type == QNetworkReply::NoError) {
-        msg = QString("Success! %1 bytes").arg(worker->response.length());
-    }
-    else {
-        msg = "Error: " + worker->error_str;
-    }
-
-    
-
-    
-     
-    QMap<QString, qint32>* output = new QMap<QString, qint32>();
-
-    QString json(worker->response);
-    QByteArray array (json.toStdString().c_str());
-    QJsonDocument doc = QJsonDocument::fromJson(array);
-    QJsonObject obj = doc.object();
-
-    foreach(QString key, obj.keys()) {
-        qint32* val;
-        setValue(&val, obj[key], "QMap", "");
-        output->insert(key, *val);
-    }
-
-
-    
-    
-    
-
-    worker->deleteLater();
-
-    emit getInventorySignal(output);
-    
-}
-void
-SWGStoreApi::placeOrder(SWGOrder body) {
-    QString fullPath;
-    fullPath.append(this->host).append(this->basePath).append("/store/order");
-
-    
-
-    
-
-    HttpRequestWorker *worker = new HttpRequestWorker();
-    HttpRequestInput input(fullPath, "POST");
-
-    
-
-    
-    
-    
-    QString output = body.asJson();
-    input.request_body.append(output);
-    
-
-    
-
-    connect(worker,
-            &HttpRequestWorker::on_execution_finished,
-            this,
-            &SWGStoreApi::placeOrderCallback);
-
-    worker->execute(&input);
-}
-
-void
-SWGStoreApi::placeOrderCallback(HttpRequestWorker * worker) {
-    QString msg;
-    if (worker->error_type == QNetworkReply::NoError) {
-        msg = QString("Success! %1 bytes").arg(worker->response.length());
-    }
-    else {
-        msg = "Error: " + worker->error_str;
-    }
-
-    
-
-    
-    
-    
-    QString json(worker->response);
-    SWGOrder* output = static_cast<SWGOrder*>(create(json, QString("SWGOrder")));
-    
-    
-    
-
-    worker->deleteLater();
-
-    emit placeOrderSignal(output);
-    
-}
-void
-SWGStoreApi::getOrderById(QString* orderId) {
-    QString fullPath;
-    fullPath.append(this->host).append(this->basePath).append("/store/order/{orderId}");
-
-    
-    QString orderIdPathParam("{"); orderIdPathParam.append("orderId").append("}");
-    fullPath.replace(orderIdPathParam, stringValue(orderId));
-    
-
-    
-
-    HttpRequestWorker *worker = new HttpRequestWorker();
-    HttpRequestInput input(fullPath, "GET");
-
-    
-
-    
-
-    
-
-    connect(worker,
-            &HttpRequestWorker::on_execution_finished,
-            this,
-            &SWGStoreApi::getOrderByIdCallback);
-
-    worker->execute(&input);
-}
-
-void
-SWGStoreApi::getOrderByIdCallback(HttpRequestWorker * worker) {
-    QString msg;
-    if (worker->error_type == QNetworkReply::NoError) {
-        msg = QString("Success! %1 bytes").arg(worker->response.length());
-    }
-    else {
-        msg = "Error: " + worker->error_str;
-    }
-
-    
-
-    
-    
-    
-    QString json(worker->response);
-    SWGOrder* output = static_cast<SWGOrder*>(create(json, QString("SWGOrder")));
-    
-    
-    
-
-    worker->deleteLater();
-
-    emit getOrderByIdSignal(output);
-    
-}
 void
 SWGStoreApi::deleteOrder(QString* orderId) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/store/order/{orderId}");
 
-    
     QString orderIdPathParam("{"); orderIdPathParam.append("orderId").append("}");
     fullPath.replace(orderIdPathParam, stringValue(orderId));
-    
 
-    
 
     HttpRequestWorker *worker = new HttpRequestWorker();
     HttpRequestInput input(fullPath, "DELETE");
 
     
 
-    
 
-    
 
     connect(worker,
             &HttpRequestWorker::on_execution_finished,
@@ -236,4 +56,146 @@ SWGStoreApi::deleteOrderCallback(HttpRequestWorker * worker) {
     
     emit deleteOrderSignal();
 }
+void
+SWGStoreApi::getInventory() {
+    QString fullPath;
+    fullPath.append(this->host).append(this->basePath).append("/store/inventory");
+
+
+
+    HttpRequestWorker *worker = new HttpRequestWorker();
+    HttpRequestInput input(fullPath, "GET");
+
+    
+
+
+
+    connect(worker,
+            &HttpRequestWorker::on_execution_finished,
+            this,
+            &SWGStoreApi::getInventoryCallback);
+
+    worker->execute(&input);
+}
+
+void
+SWGStoreApi::getInventoryCallback(HttpRequestWorker * worker) {
+    QString msg;
+    if (worker->error_type == QNetworkReply::NoError) {
+        msg = QString("Success! %1 bytes").arg(worker->response.length());
+    }
+    else {
+        msg = "Error: " + worker->error_str;
+    }
+
+    
+        QMap<QString, qint32>* output = new QMap<QString, qint32>();
+
+    QString json(worker->response);
+    QByteArray array (json.toStdString().c_str());
+    QJsonDocument doc = QJsonDocument::fromJson(array);
+    QJsonObject obj = doc.object();
+
+    foreach(QString key, obj.keys()) {
+        qint32* val;
+        setValue(&val, obj[key], "QMap", "");
+        output->insert(key, *val);
+    }
+
+
+    
+
+    worker->deleteLater();
+
+    emit getInventorySignal(output);
+    
+}
+void
+SWGStoreApi::getOrderById(qint64 orderId) {
+    QString fullPath;
+    fullPath.append(this->host).append(this->basePath).append("/store/order/{orderId}");
+
+    QString orderIdPathParam("{"); orderIdPathParam.append("orderId").append("}");
+    fullPath.replace(orderIdPathParam, stringValue(orderId));
+
+
+    HttpRequestWorker *worker = new HttpRequestWorker();
+    HttpRequestInput input(fullPath, "GET");
+
+    
+
+
+
+    connect(worker,
+            &HttpRequestWorker::on_execution_finished,
+            this,
+            &SWGStoreApi::getOrderByIdCallback);
+
+    worker->execute(&input);
+}
+
+void
+SWGStoreApi::getOrderByIdCallback(HttpRequestWorker * worker) {
+    QString msg;
+    if (worker->error_type == QNetworkReply::NoError) {
+        msg = QString("Success! %1 bytes").arg(worker->response.length());
+    }
+    else {
+        msg = "Error: " + worker->error_str;
+    }
+
+    
+        QString json(worker->response);
+    SWGOrder* output = static_cast<SWGOrder*>(create(json, QString("SWGOrder")));
+    
+
+    worker->deleteLater();
+
+    emit getOrderByIdSignal(output);
+    
+}
+void
+SWGStoreApi::placeOrder(SWGOrder body) {
+    QString fullPath;
+    fullPath.append(this->host).append(this->basePath).append("/store/order");
+
+
+
+    HttpRequestWorker *worker = new HttpRequestWorker();
+    HttpRequestInput input(fullPath, "POST");
+
+    
+    QString output = body.asJson();
+    input.request_body.append(output);
+    
+
+
+    connect(worker,
+            &HttpRequestWorker::on_execution_finished,
+            this,
+            &SWGStoreApi::placeOrderCallback);
+
+    worker->execute(&input);
+}
+
+void
+SWGStoreApi::placeOrderCallback(HttpRequestWorker * worker) {
+    QString msg;
+    if (worker->error_type == QNetworkReply::NoError) {
+        msg = QString("Success! %1 bytes").arg(worker->response.length());
+    }
+    else {
+        msg = "Error: " + worker->error_str;
+    }
+
+    
+        QString json(worker->response);
+    SWGOrder* output = static_cast<SWGOrder*>(create(json, QString("SWGOrder")));
+    
+
+    worker->deleteLater();
+
+    emit placeOrderSignal(output);
+    
+}
 } /* namespace Swagger */
diff --git a/samples/client/petstore/qt5cpp/client/SWGStoreApi.h b/samples/client/petstore/qt5cpp/client/SWGStoreApi.h
index 7bbe8e5f92a..a90a297499c 100644
--- a/samples/client/petstore/qt5cpp/client/SWGStoreApi.h
+++ b/samples/client/petstore/qt5cpp/client/SWGStoreApi.h
@@ -3,9 +3,9 @@
 
 #include "SWGHttpRequest.h"
 
+#include <QString>
 #include "QMap.h"
 #include "SWGOrder.h"
-#include <QString>
 
 #include <QObject>
 
@@ -22,22 +22,22 @@ public:
     QString host;
     QString basePath;
 
-    void getInventory();
-    void placeOrder(SWGOrder body);
-    void getOrderById(QString* orderId);
     void deleteOrder(QString* orderId);
+    void getInventory();
+    void getOrderById(qint64 orderId);
+    void placeOrder(SWGOrder body);
     
 private:
-    void getInventoryCallback (HttpRequestWorker * worker);
-    void placeOrderCallback (HttpRequestWorker * worker);
-    void getOrderByIdCallback (HttpRequestWorker * worker);
     void deleteOrderCallback (HttpRequestWorker * worker);
+    void getInventoryCallback (HttpRequestWorker * worker);
+    void getOrderByIdCallback (HttpRequestWorker * worker);
+    void placeOrderCallback (HttpRequestWorker * worker);
     
 signals:
-    void getInventorySignal(QMap<QString, qint32>* summary);
-    void placeOrderSignal(SWGOrder* summary);
-    void getOrderByIdSignal(SWGOrder* summary);
     void deleteOrderSignal();
+    void getInventorySignal(QMap<QString, qint32>* summary);
+    void getOrderByIdSignal(SWGOrder* summary);
+    void placeOrderSignal(SWGOrder* summary);
     
 };
 }
diff --git a/samples/client/petstore/qt5cpp/client/SWGTag.cpp b/samples/client/petstore/qt5cpp/client/SWGTag.cpp
index bb4404de8df..0f10c5ceec7 100644
--- a/samples/client/petstore/qt5cpp/client/SWGTag.cpp
+++ b/samples/client/petstore/qt5cpp/client/SWGTag.cpp
@@ -27,17 +27,15 @@ SWGTag::~SWGTag() {
 void
 SWGTag::init() {
     id = 0L;
-    name = new QString("");
-    
+name = new QString("");
 }
 
 void
 SWGTag::cleanup() {
     
-    if(name != NULL) {
+if(name != NULL) {
         delete name;
     }
-    
 }
 
 SWGTag*
@@ -52,8 +50,7 @@ SWGTag::fromJson(QString &json) {
 void
 SWGTag::fromJsonObject(QJsonObject &pJson) {
     setValue(&id, pJson["id"], "qint64", "");
-    setValue(&name, pJson["name"], "QString", "QString");
-    
+setValue(&name, pJson["name"], "QString", "QString");
 }
 
 QString
@@ -70,13 +67,11 @@ QJsonObject*
 SWGTag::asJsonObject() {
     QJsonObject* obj = new QJsonObject();
     obj->insert("id", QJsonValue(id));
-    
+
     
     toJsonValue(QString("name"), name, obj, QString("QString"));
     
-    
-    
-    
+        
 
     return obj;
 }
diff --git a/samples/client/petstore/qt5cpp/client/SWGTag.h b/samples/client/petstore/qt5cpp/client/SWGTag.h
index 067b200675b..15ab44f1ac1 100644
--- a/samples/client/petstore/qt5cpp/client/SWGTag.h
+++ b/samples/client/petstore/qt5cpp/client/SWGTag.h
@@ -32,14 +32,12 @@ public:
 
     qint64 getId();
     void setId(qint64 id);
-    QString* getName();
+QString* getName();
     void setName(QString* name);
-    
 
 private:
     qint64 id;
-    QString* name;
-    
+QString* name;
 };
 
 } /* namespace Swagger */
diff --git a/samples/client/petstore/qt5cpp/client/SWGUser.cpp b/samples/client/petstore/qt5cpp/client/SWGUser.cpp
index f0d58c7e97b..98704b8ac6a 100644
--- a/samples/client/petstore/qt5cpp/client/SWGUser.cpp
+++ b/samples/client/petstore/qt5cpp/client/SWGUser.cpp
@@ -27,39 +27,37 @@ SWGUser::~SWGUser() {
 void
 SWGUser::init() {
     id = 0L;
-    username = new QString("");
-    firstName = new QString("");
-    lastName = new QString("");
-    email = new QString("");
-    password = new QString("");
-    phone = new QString("");
-    userStatus = 0;
-    
+username = new QString("");
+firstName = new QString("");
+lastName = new QString("");
+email = new QString("");
+password = new QString("");
+phone = new QString("");
+userStatus = 0;
 }
 
 void
 SWGUser::cleanup() {
     
-    if(username != NULL) {
+if(username != NULL) {
         delete username;
     }
-    if(firstName != NULL) {
+if(firstName != NULL) {
         delete firstName;
     }
-    if(lastName != NULL) {
+if(lastName != NULL) {
         delete lastName;
     }
-    if(email != NULL) {
+if(email != NULL) {
         delete email;
     }
-    if(password != NULL) {
+if(password != NULL) {
         delete password;
     }
-    if(phone != NULL) {
+if(phone != NULL) {
         delete phone;
     }
-    
-    
+
 }
 
 SWGUser*
@@ -74,14 +72,13 @@ SWGUser::fromJson(QString &json) {
 void
 SWGUser::fromJsonObject(QJsonObject &pJson) {
     setValue(&id, pJson["id"], "qint64", "");
-    setValue(&username, pJson["username"], "QString", "QString");
-    setValue(&firstName, pJson["firstName"], "QString", "QString");
-    setValue(&lastName, pJson["lastName"], "QString", "QString");
-    setValue(&email, pJson["email"], "QString", "QString");
-    setValue(&password, pJson["password"], "QString", "QString");
-    setValue(&phone, pJson["phone"], "QString", "QString");
-    setValue(&userStatus, pJson["userStatus"], "qint32", "");
-    
+setValue(&username, pJson["username"], "QString", "QString");
+setValue(&firstName, pJson["firstName"], "QString", "QString");
+setValue(&lastName, pJson["lastName"], "QString", "QString");
+setValue(&email, pJson["email"], "QString", "QString");
+setValue(&password, pJson["password"], "QString", "QString");
+setValue(&phone, pJson["phone"], "QString", "QString");
+setValue(&userStatus, pJson["userStatus"], "qint32", "");
 }
 
 QString
@@ -98,44 +95,37 @@ QJsonObject*
 SWGUser::asJsonObject() {
     QJsonObject* obj = new QJsonObject();
     obj->insert("id", QJsonValue(id));
-    
+
     
     toJsonValue(QString("username"), username, obj, QString("QString"));
     
-    
-    
-    
+        
+
     
     toJsonValue(QString("firstName"), firstName, obj, QString("QString"));
     
-    
-    
-    
+        
+
     
     toJsonValue(QString("lastName"), lastName, obj, QString("QString"));
     
-    
-    
-    
+        
+
     
     toJsonValue(QString("email"), email, obj, QString("QString"));
     
-    
-    
-    
+        
+
     
     toJsonValue(QString("password"), password, obj, QString("QString"));
     
-    
-    
-    
+        
+
     
     toJsonValue(QString("phone"), phone, obj, QString("QString"));
     
-    
-    
-    obj->insert("userStatus", QJsonValue(userStatus));
-    
+        
+obj->insert("userStatus", QJsonValue(userStatus));
 
     return obj;
 }
diff --git a/samples/client/petstore/qt5cpp/client/SWGUser.h b/samples/client/petstore/qt5cpp/client/SWGUser.h
index eaa0e496c39..c9b0e0509ca 100644
--- a/samples/client/petstore/qt5cpp/client/SWGUser.h
+++ b/samples/client/petstore/qt5cpp/client/SWGUser.h
@@ -32,32 +32,30 @@ public:
 
     qint64 getId();
     void setId(qint64 id);
-    QString* getUsername();
+QString* getUsername();
     void setUsername(QString* username);
-    QString* getFirstName();
+QString* getFirstName();
     void setFirstName(QString* firstName);
-    QString* getLastName();
+QString* getLastName();
     void setLastName(QString* lastName);
-    QString* getEmail();
+QString* getEmail();
     void setEmail(QString* email);
-    QString* getPassword();
+QString* getPassword();
     void setPassword(QString* password);
-    QString* getPhone();
+QString* getPhone();
     void setPhone(QString* phone);
-    qint32 getUserStatus();
+qint32 getUserStatus();
     void setUserStatus(qint32 userStatus);
-    
 
 private:
     qint64 id;
-    QString* username;
-    QString* firstName;
-    QString* lastName;
-    QString* email;
-    QString* password;
-    QString* phone;
-    qint32 userStatus;
-    
+QString* username;
+QString* firstName;
+QString* lastName;
+QString* email;
+QString* password;
+QString* phone;
+qint32 userStatus;
 };
 
 } /* namespace Swagger */
diff --git a/samples/client/petstore/qt5cpp/client/SWGUserApi.cpp b/samples/client/petstore/qt5cpp/client/SWGUserApi.cpp
index 61b92fc5501..45bafbfdc32 100644
--- a/samples/client/petstore/qt5cpp/client/SWGUserApi.cpp
+++ b/samples/client/petstore/qt5cpp/client/SWGUserApi.cpp
@@ -20,23 +20,16 @@ SWGUserApi::createUser(SWGUser body) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/user");
 
-    
 
-    
 
     HttpRequestWorker *worker = new HttpRequestWorker();
     HttpRequestInput input(fullPath, "POST");
 
     
-
-    
-    
-    
     QString output = body.asJson();
     input.request_body.append(output);
     
 
-    
 
     connect(worker,
             &HttpRequestWorker::on_execution_finished,
@@ -68,17 +61,12 @@ SWGUserApi::createUsersWithArrayInput(QList<SWGUser*>* body) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/user/createWithArray");
 
-    
 
-    
 
     HttpRequestWorker *worker = new HttpRequestWorker();
     HttpRequestInput input(fullPath, "POST");
 
     
-
-    
-    
     QJsonArray* bodyArray = new QJsonArray();
     toJsonArray((QList<void*>*)body, bodyArray, QString("body"), QString("SWGUser*"));
 
@@ -86,10 +74,8 @@ SWGUserApi::createUsersWithArrayInput(QList<SWGUser*>* body) {
     QByteArray bytes = doc.toJson();
 
     input.request_body.append(bytes);
-    
-    
 
-    
+
 
     connect(worker,
             &HttpRequestWorker::on_execution_finished,
@@ -121,17 +107,12 @@ SWGUserApi::createUsersWithListInput(QList<SWGUser*>* body) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/user/createWithList");
 
-    
 
-    
 
     HttpRequestWorker *worker = new HttpRequestWorker();
     HttpRequestInput input(fullPath, "POST");
 
     
-
-    
-    
     QJsonArray* bodyArray = new QJsonArray();
     toJsonArray((QList<void*>*)body, bodyArray, QString("body"), QString("SWGUser*"));
 
@@ -139,10 +120,8 @@ SWGUserApi::createUsersWithListInput(QList<SWGUser*>* body) {
     QByteArray bytes = doc.toJson();
 
     input.request_body.append(bytes);
-    
-    
 
-    
+
 
     connect(worker,
             &HttpRequestWorker::on_execution_finished,
@@ -170,14 +149,96 @@ SWGUserApi::createUsersWithListInputCallback(HttpRequestWorker * worker) {
     emit createUsersWithListInputSignal();
 }
 void
+SWGUserApi::deleteUser(QString* username) {
+    QString fullPath;
+    fullPath.append(this->host).append(this->basePath).append("/user/{username}");
+
+    QString usernamePathParam("{"); usernamePathParam.append("username").append("}");
+    fullPath.replace(usernamePathParam, stringValue(username));
+
+
+    HttpRequestWorker *worker = new HttpRequestWorker();
+    HttpRequestInput input(fullPath, "DELETE");
+
+    
+
+
+
+    connect(worker,
+            &HttpRequestWorker::on_execution_finished,
+            this,
+            &SWGUserApi::deleteUserCallback);
+
+    worker->execute(&input);
+}
+
+void
+SWGUserApi::deleteUserCallback(HttpRequestWorker * worker) {
+    QString msg;
+    if (worker->error_type == QNetworkReply::NoError) {
+        msg = QString("Success! %1 bytes").arg(worker->response.length());
+    }
+    else {
+        msg = "Error: " + worker->error_str;
+    }
+
+    
+
+    worker->deleteLater();
+
+    
+    emit deleteUserSignal();
+}
+void
+SWGUserApi::getUserByName(QString* username) {
+    QString fullPath;
+    fullPath.append(this->host).append(this->basePath).append("/user/{username}");
+
+    QString usernamePathParam("{"); usernamePathParam.append("username").append("}");
+    fullPath.replace(usernamePathParam, stringValue(username));
+
+
+    HttpRequestWorker *worker = new HttpRequestWorker();
+    HttpRequestInput input(fullPath, "GET");
+
+    
+
+
+
+    connect(worker,
+            &HttpRequestWorker::on_execution_finished,
+            this,
+            &SWGUserApi::getUserByNameCallback);
+
+    worker->execute(&input);
+}
+
+void
+SWGUserApi::getUserByNameCallback(HttpRequestWorker * worker) {
+    QString msg;
+    if (worker->error_type == QNetworkReply::NoError) {
+        msg = QString("Success! %1 bytes").arg(worker->response.length());
+    }
+    else {
+        msg = "Error: " + worker->error_str;
+    }
+
+    
+        QString json(worker->response);
+    SWGUser* output = static_cast<SWGUser*>(create(json, QString("SWGUser")));
+    
+
+    worker->deleteLater();
+
+    emit getUserByNameSignal(output);
+    
+}
+void
 SWGUserApi::loginUser(QString* username, QString* password) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/user/login");
 
-    
 
-    
-    
     if (fullPath.indexOf("?") > 0) 
       fullPath.append("&");
     else 
@@ -185,11 +246,7 @@ SWGUserApi::loginUser(QString* username, QString* password) {
     fullPath.append(QUrl::toPercentEncoding("username"))
         .append("=")
         .append(QUrl::toPercentEncoding(stringValue(username)));
-    
 
-    
-    
-    
     if (fullPath.indexOf("?") > 0) 
       fullPath.append("&");
     else 
@@ -197,19 +254,14 @@ SWGUserApi::loginUser(QString* username, QString* password) {
     fullPath.append(QUrl::toPercentEncoding("password"))
         .append("=")
         .append(QUrl::toPercentEncoding(stringValue(password)));
-    
 
-    
-    
 
     HttpRequestWorker *worker = new HttpRequestWorker();
     HttpRequestInput input(fullPath, "GET");
 
     
 
-    
 
-    
 
     connect(worker,
             &HttpRequestWorker::on_execution_finished,
@@ -230,15 +282,9 @@ SWGUserApi::loginUserCallback(HttpRequestWorker * worker) {
     }
 
     
-
-    
-    
-    
-    QString json(worker->response);
+        QString json(worker->response);
     QString* output = static_cast<QString*>(create(json, QString("QString")));
     
-    
-    
 
     worker->deleteLater();
 
@@ -250,18 +296,14 @@ SWGUserApi::logoutUser() {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/user/logout");
 
-    
 
-    
 
     HttpRequestWorker *worker = new HttpRequestWorker();
     HttpRequestInput input(fullPath, "GET");
 
     
 
-    
 
-    
 
     connect(worker,
             &HttpRequestWorker::on_execution_finished,
@@ -289,85 +331,22 @@ SWGUserApi::logoutUserCallback(HttpRequestWorker * worker) {
     emit logoutUserSignal();
 }
 void
-SWGUserApi::getUserByName(QString* username) {
-    QString fullPath;
-    fullPath.append(this->host).append(this->basePath).append("/user/{username}");
-
-    
-    QString usernamePathParam("{"); usernamePathParam.append("username").append("}");
-    fullPath.replace(usernamePathParam, stringValue(username));
-    
-
-    
-
-    HttpRequestWorker *worker = new HttpRequestWorker();
-    HttpRequestInput input(fullPath, "GET");
-
-    
-
-    
-
-    
-
-    connect(worker,
-            &HttpRequestWorker::on_execution_finished,
-            this,
-            &SWGUserApi::getUserByNameCallback);
-
-    worker->execute(&input);
-}
-
-void
-SWGUserApi::getUserByNameCallback(HttpRequestWorker * worker) {
-    QString msg;
-    if (worker->error_type == QNetworkReply::NoError) {
-        msg = QString("Success! %1 bytes").arg(worker->response.length());
-    }
-    else {
-        msg = "Error: " + worker->error_str;
-    }
-
-    
-
-    
-    
-    
-    QString json(worker->response);
-    SWGUser* output = static_cast<SWGUser*>(create(json, QString("SWGUser")));
-    
-    
-    
-
-    worker->deleteLater();
-
-    emit getUserByNameSignal(output);
-    
-}
-void
 SWGUserApi::updateUser(QString* username, SWGUser body) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/user/{username}");
 
-    
     QString usernamePathParam("{"); usernamePathParam.append("username").append("}");
     fullPath.replace(usernamePathParam, stringValue(username));
-    
 
-    
 
     HttpRequestWorker *worker = new HttpRequestWorker();
     HttpRequestInput input(fullPath, "PUT");
 
     
-
-    
-    
-    
     QString output = body.asJson();
     input.request_body.append(output);
     
 
-    
 
     connect(worker,
             &HttpRequestWorker::on_execution_finished,
@@ -394,50 +373,4 @@ SWGUserApi::updateUserCallback(HttpRequestWorker * worker) {
     
     emit updateUserSignal();
 }
-void
-SWGUserApi::deleteUser(QString* username) {
-    QString fullPath;
-    fullPath.append(this->host).append(this->basePath).append("/user/{username}");
-
-    
-    QString usernamePathParam("{"); usernamePathParam.append("username").append("}");
-    fullPath.replace(usernamePathParam, stringValue(username));
-    
-
-    
-
-    HttpRequestWorker *worker = new HttpRequestWorker();
-    HttpRequestInput input(fullPath, "DELETE");
-
-    
-
-    
-
-    
-
-    connect(worker,
-            &HttpRequestWorker::on_execution_finished,
-            this,
-            &SWGUserApi::deleteUserCallback);
-
-    worker->execute(&input);
-}
-
-void
-SWGUserApi::deleteUserCallback(HttpRequestWorker * worker) {
-    QString msg;
-    if (worker->error_type == QNetworkReply::NoError) {
-        msg = QString("Success! %1 bytes").arg(worker->response.length());
-    }
-    else {
-        msg = "Error: " + worker->error_str;
-    }
-
-    
-
-    worker->deleteLater();
-
-    
-    emit deleteUserSignal();
-}
 } /* namespace Swagger */
diff --git a/samples/client/petstore/qt5cpp/client/SWGUserApi.h b/samples/client/petstore/qt5cpp/client/SWGUserApi.h
index 2e3e119dc78..9a7577a4103 100644
--- a/samples/client/petstore/qt5cpp/client/SWGUserApi.h
+++ b/samples/client/petstore/qt5cpp/client/SWGUserApi.h
@@ -25,31 +25,31 @@ public:
     void createUser(SWGUser body);
     void createUsersWithArrayInput(QList<SWGUser*>* body);
     void createUsersWithListInput(QList<SWGUser*>* body);
+    void deleteUser(QString* username);
+    void getUserByName(QString* username);
     void loginUser(QString* username, QString* password);
     void logoutUser();
-    void getUserByName(QString* username);
     void updateUser(QString* username, SWGUser body);
-    void deleteUser(QString* username);
     
 private:
     void createUserCallback (HttpRequestWorker * worker);
     void createUsersWithArrayInputCallback (HttpRequestWorker * worker);
     void createUsersWithListInputCallback (HttpRequestWorker * worker);
+    void deleteUserCallback (HttpRequestWorker * worker);
+    void getUserByNameCallback (HttpRequestWorker * worker);
     void loginUserCallback (HttpRequestWorker * worker);
     void logoutUserCallback (HttpRequestWorker * worker);
-    void getUserByNameCallback (HttpRequestWorker * worker);
     void updateUserCallback (HttpRequestWorker * worker);
-    void deleteUserCallback (HttpRequestWorker * worker);
     
 signals:
     void createUserSignal();
     void createUsersWithArrayInputSignal();
     void createUsersWithListInputSignal();
+    void deleteUserSignal();
+    void getUserByNameSignal(SWGUser* summary);
     void loginUserSignal(QString* summary);
     void logoutUserSignal();
-    void getUserByNameSignal(SWGUser* summary);
     void updateUserSignal();
-    void deleteUserSignal();
     
 };
 }
diff --git a/samples/client/petstore/ruby/README.md b/samples/client/petstore/ruby/README.md
index 9294e57a882..90622ef668a 100644
--- a/samples/client/petstore/ruby/README.md
+++ b/samples/client/petstore/ruby/README.md
@@ -2,13 +2,13 @@
 
 Petstore - the Ruby gem for the Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 This SDK is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build date: 2016-04-09T17:50:53.781+08:00
+- Build date: 2016-04-13T17:44:36.129+08:00
 - Build package: class io.swagger.codegen.languages.RubyClientCodegen
 
 ## Installation
@@ -62,13 +62,12 @@ end
 
 api_instance = Petstore::PetApi.new
 
-opts = { 
-  body: Petstore::Pet.new # Pet | Pet object that needs to be added to the store
-}
+body = Petstore::Pet.new # Pet | Pet object that needs to be added to the store
+
 
 begin
   #Add a new pet to the store
-  api_instance.add_pet(opts)
+  api_instance.add_pet(body)
 rescue Petstore::ApiError => e
   puts "Exception when calling PetApi->add_pet: #{e}"
 end
@@ -82,20 +81,15 @@ All URIs are relative to *http://petstore.swagger.io/v2*
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
 *Petstore::PetApi* | [**add_pet**](docs/PetApi.md#add_pet) | **POST** /pet | Add a new pet to the store
-*Petstore::PetApi* | [**add_pet_using_byte_array**](docs/PetApi.md#add_pet_using_byte_array) | **POST** /pet?testing_byte_array&#x3D;true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
 *Petstore::PetApi* | [**delete_pet**](docs/PetApi.md#delete_pet) | **DELETE** /pet/{petId} | Deletes a pet
 *Petstore::PetApi* | [**find_pets_by_status**](docs/PetApi.md#find_pets_by_status) | **GET** /pet/findByStatus | Finds Pets by status
 *Petstore::PetApi* | [**find_pets_by_tags**](docs/PetApi.md#find_pets_by_tags) | **GET** /pet/findByTags | Finds Pets by tags
 *Petstore::PetApi* | [**get_pet_by_id**](docs/PetApi.md#get_pet_by_id) | **GET** /pet/{petId} | Find pet by ID
-*Petstore::PetApi* | [**get_pet_by_id_in_object**](docs/PetApi.md#get_pet_by_id_in_object) | **GET** /pet/{petId}?response&#x3D;inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
-*Petstore::PetApi* | [**pet_pet_idtesting_byte_arraytrue_get**](docs/PetApi.md#pet_pet_idtesting_byte_arraytrue_get) | **GET** /pet/{petId}?testing_byte_array&#x3D;true | Fake endpoint to test byte array return by 'Find pet by ID'
 *Petstore::PetApi* | [**update_pet**](docs/PetApi.md#update_pet) | **PUT** /pet | Update an existing pet
 *Petstore::PetApi* | [**update_pet_with_form**](docs/PetApi.md#update_pet_with_form) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *Petstore::PetApi* | [**upload_file**](docs/PetApi.md#upload_file) | **POST** /pet/{petId}/uploadImage | uploads an image
 *Petstore::StoreApi* | [**delete_order**](docs/StoreApi.md#delete_order) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
-*Petstore::StoreApi* | [**find_orders_by_status**](docs/StoreApi.md#find_orders_by_status) | **GET** /store/findByStatus | Finds orders by status
 *Petstore::StoreApi* | [**get_inventory**](docs/StoreApi.md#get_inventory) | **GET** /store/inventory | Returns pet inventories by status
-*Petstore::StoreApi* | [**get_inventory_in_object**](docs/StoreApi.md#get_inventory_in_object) | **GET** /store/inventory?response&#x3D;arbitrary_object | Fake endpoint to test arbitrary object return by 'Get inventory'
 *Petstore::StoreApi* | [**get_order_by_id**](docs/StoreApi.md#get_order_by_id) | **GET** /store/order/{orderId} | Find purchase order by ID
 *Petstore::StoreApi* | [**place_order**](docs/StoreApi.md#place_order) | **POST** /store/order | Place an order for a pet
 *Petstore::UserApi* | [**create_user**](docs/UserApi.md#create_user) | **POST** /user | Create user
@@ -111,10 +105,11 @@ Class | Method | HTTP request | Description
 ## Documentation for Models
 
  - [Petstore::Animal](docs/Animal.md)
+ - [Petstore::ApiResponse](docs/ApiResponse.md)
  - [Petstore::Cat](docs/Cat.md)
  - [Petstore::Category](docs/Category.md)
  - [Petstore::Dog](docs/Dog.md)
- - [Petstore::InlineResponse200](docs/InlineResponse200.md)
+ - [Petstore::FormatTest](docs/FormatTest.md)
  - [Petstore::Model200Response](docs/Model200Response.md)
  - [Petstore::ModelReturn](docs/ModelReturn.md)
  - [Petstore::Name](docs/Name.md)
@@ -128,40 +123,12 @@ Class | Method | HTTP request | Description
 ## Documentation for Authorization
 
 
-### test_api_key_header
-
-- **Type**: API key
-- **API key parameter name**: test_api_key_header
-- **Location**: HTTP header
-
 ### api_key
 
 - **Type**: API key
 - **API key parameter name**: api_key
 - **Location**: HTTP header
 
-### test_http_basic
-
-- **Type**: HTTP basic authentication
-
-### test_api_client_secret
-
-- **Type**: API key
-- **API key parameter name**: x-test_api_client_secret
-- **Location**: HTTP header
-
-### test_api_client_id
-
-- **Type**: API key
-- **API key parameter name**: x-test_api_client_id
-- **Location**: HTTP header
-
-### test_api_key_query
-
-- **Type**: API key
-- **API key parameter name**: test_api_key_query
-- **Location**: URL query string
-
 ### petstore_auth
 
 - **Type**: OAuth
diff --git a/samples/client/petstore/ruby/docs/ApiResponse.md b/samples/client/petstore/ruby/docs/ApiResponse.md
new file mode 100644
index 00000000000..843f9cc525b
--- /dev/null
+++ b/samples/client/petstore/ruby/docs/ApiResponse.md
@@ -0,0 +1,10 @@
+# Petstore::ApiResponse
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**code** | **Integer** |  | [optional] 
+**type** | **String** |  | [optional] 
+**message** | **String** |  | [optional] 
+
+
diff --git a/samples/client/petstore/ruby/docs/FormatTest.md b/samples/client/petstore/ruby/docs/FormatTest.md
new file mode 100644
index 00000000000..2b64ed317b2
--- /dev/null
+++ b/samples/client/petstore/ruby/docs/FormatTest.md
@@ -0,0 +1,19 @@
+# Petstore::FormatTest
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**integer** | **Integer** |  | [optional] 
+**int32** | **Integer** |  | [optional] 
+**int64** | **Integer** |  | [optional] 
+**number** | **Float** |  | 
+**float** | **Float** |  | [optional] 
+**double** | **Float** |  | [optional] 
+**string** | **String** |  | [optional] 
+**byte** | **String** |  | [optional] 
+**binary** | **String** |  | [optional] 
+**date** | **Date** |  | [optional] 
+**date_time** | **DateTime** |  | [optional] 
+**password** | **String** |  | [optional] 
+
+
diff --git a/samples/client/petstore/ruby/docs/Name.md b/samples/client/petstore/ruby/docs/Name.md
index d4d89f6c4ce..2864a67fbd3 100644
--- a/samples/client/petstore/ruby/docs/Name.md
+++ b/samples/client/petstore/ruby/docs/Name.md
@@ -3,7 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**name** | **Integer** |  | [optional] 
+**name** | **Integer** |  | 
 **snake_case** | **Integer** |  | [optional] 
 
 
diff --git a/samples/client/petstore/ruby/docs/Order.md b/samples/client/petstore/ruby/docs/Order.md
index ed1b69874ee..52a832c5106 100644
--- a/samples/client/petstore/ruby/docs/Order.md
+++ b/samples/client/petstore/ruby/docs/Order.md
@@ -8,6 +8,6 @@ Name | Type | Description | Notes
 **quantity** | **Integer** |  | [optional] 
 **ship_date** | **DateTime** |  | [optional] 
 **status** | **String** | Order Status | [optional] 
-**complete** | **BOOLEAN** |  | [optional] 
+**complete** | **BOOLEAN** |  | [optional] [default to false]
 
 
diff --git a/samples/client/petstore/ruby/docs/PetApi.md b/samples/client/petstore/ruby/docs/PetApi.md
index f817316359b..36ca634b739 100644
--- a/samples/client/petstore/ruby/docs/PetApi.md
+++ b/samples/client/petstore/ruby/docs/PetApi.md
@@ -62,7 +62,7 @@ nil (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
  - **Accept**: application/json, application/xml
@@ -114,7 +114,7 @@ nil (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
  - **Accept**: application/json, application/xml
@@ -169,7 +169,7 @@ nil (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -222,7 +222,7 @@ Name | Type | Description  | Notes
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -275,7 +275,7 @@ Name | Type | Description  | Notes
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -332,7 +332,7 @@ Name | Type | Description  | Notes
 
 [api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -389,7 +389,7 @@ Name | Type | Description  | Notes
 
 [api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -446,7 +446,7 @@ Name | Type | Description  | Notes
 
 [api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -498,7 +498,7 @@ nil (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
  - **Accept**: application/json, application/xml
@@ -555,7 +555,7 @@ nil (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: application/json, application/xml
@@ -612,7 +612,7 @@ nil (empty response body)
 
 [petstore_auth](../README.md#petstore_auth)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: multipart/form-data
  - **Accept**: application/json, application/xml
diff --git a/samples/client/petstore/ruby/docs/StoreApi.md b/samples/client/petstore/ruby/docs/StoreApi.md
index 1ed9970698c..9165f119ba5 100644
--- a/samples/client/petstore/ruby/docs/StoreApi.md
+++ b/samples/client/petstore/ruby/docs/StoreApi.md
@@ -51,7 +51,7 @@ nil (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -111,7 +111,7 @@ Name | Type | Description  | Notes
 
 [test_api_client_id](../README.md#test_api_client_id), [test_api_client_secret](../README.md#test_api_client_secret)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -159,7 +159,7 @@ This endpoint does not need any parameter.
 
 [api_key](../README.md#api_key)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -207,7 +207,7 @@ This endpoint does not need any parameter.
 
 [api_key](../README.md#api_key)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -266,7 +266,7 @@ Name | Type | Description  | Notes
 
 [test_api_key_header](../README.md#test_api_key_header), [test_api_key_query](../README.md#test_api_key_query)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
@@ -326,7 +326,7 @@ Name | Type | Description  | Notes
 
 [test_api_client_id](../README.md#test_api_client_id), [test_api_client_secret](../README.md#test_api_client_secret)
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
  - **Accept**: application/json, application/xml
diff --git a/samples/client/petstore/ruby/docs/UserApi.md b/samples/client/petstore/ruby/docs/UserApi.md
index 7b1e241f835..87a63e19584 100644
--- a/samples/client/petstore/ruby/docs/UserApi.md
+++ b/samples/client/petstore/ruby/docs/UserApi.md
@@ -15,7 +15,7 @@ Method | HTTP request | Description
 
 
 # **create_user**
-> create_user(opts)
+> create_user(body)
 
 Create user
 
@@ -28,13 +28,12 @@ require 'petstore'
 
 api_instance = Petstore::UserApi.new
 
-opts = { 
-  body: Petstore::User.new # User | Created user object
-}
+body = Petstore::User.new # User | Created user object
+
 
 begin
   #Create user
-  api_instance.create_user(opts)
+  api_instance.create_user(body)
 rescue Petstore::ApiError => e
   puts "Exception when calling UserApi->create_user: #{e}"
 end
@@ -44,7 +43,7 @@ end
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**User**](User.md)| Created user object | [optional] 
+ **body** | [**User**](User.md)| Created user object | 
 
 ### Return type
 
@@ -54,15 +53,15 @@ nil (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 
 
 # **create_users_with_array_input**
-> create_users_with_array_input(opts)
+> create_users_with_array_input(body)
 
 Creates list of users with given input array
 
@@ -75,13 +74,12 @@ require 'petstore'
 
 api_instance = Petstore::UserApi.new
 
-opts = { 
-  body: [Petstore::User.new] # Array<User> | List of user object
-}
+body = [Petstore::User.new] # Array<User> | List of user object
+
 
 begin
   #Creates list of users with given input array
-  api_instance.create_users_with_array_input(opts)
+  api_instance.create_users_with_array_input(body)
 rescue Petstore::ApiError => e
   puts "Exception when calling UserApi->create_users_with_array_input: #{e}"
 end
@@ -91,7 +89,7 @@ end
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**Array&lt;User&gt;**](User.md)| List of user object | [optional] 
+ **body** | [**Array&lt;User&gt;**](User.md)| List of user object | 
 
 ### Return type
 
@@ -101,15 +99,15 @@ nil (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 
 
 # **create_users_with_list_input**
-> create_users_with_list_input(opts)
+> create_users_with_list_input(body)
 
 Creates list of users with given input array
 
@@ -122,13 +120,12 @@ require 'petstore'
 
 api_instance = Petstore::UserApi.new
 
-opts = { 
-  body: [Petstore::User.new] # Array<User> | List of user object
-}
+body = [Petstore::User.new] # Array<User> | List of user object
+
 
 begin
   #Creates list of users with given input array
-  api_instance.create_users_with_list_input(opts)
+  api_instance.create_users_with_list_input(body)
 rescue Petstore::ApiError => e
   puts "Exception when calling UserApi->create_users_with_list_input: #{e}"
 end
@@ -138,7 +135,7 @@ end
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**Array&lt;User&gt;**](User.md)| List of user object | [optional] 
+ **body** | [**Array&lt;User&gt;**](User.md)| List of user object | 
 
 ### Return type
 
@@ -148,10 +145,10 @@ nil (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 
 
@@ -166,12 +163,6 @@ This can only be done by the logged in user.
 ```ruby
 # load the gem
 require 'petstore'
-# setup authorization 
-Petstore.configure do |config|
-  # Configure HTTP basic authorization: test_http_basic
-  config.username = 'YOUR USERNAME'
-  config.password = 'YOUR PASSWORD'
-end
 
 api_instance = Petstore::UserApi.new
 
@@ -198,12 +189,12 @@ nil (empty response body)
 
 ### Authorization
 
-[test_http_basic](../README.md#test_http_basic)
+No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 
 
@@ -247,15 +238,15 @@ Name | Type | Description  | Notes
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 
 
 # **login_user**
-> String login_user(opts)
+> String login_user(username, password)
 
 Logs user into the system
 
@@ -268,14 +259,14 @@ require 'petstore'
 
 api_instance = Petstore::UserApi.new
 
-opts = { 
-  username: "username_example", # String | The user name for login
-  password: "password_example" # String | The password for login in clear text
-}
+username = "username_example" # String | The user name for login
+
+password = "password_example" # String | The password for login in clear text
+
 
 begin
   #Logs user into the system
-  result = api_instance.login_user(opts)
+  result = api_instance.login_user(username, password)
   p result
 rescue Petstore::ApiError => e
   puts "Exception when calling UserApi->login_user: #{e}"
@@ -286,8 +277,8 @@ end
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **username** | **String**| The user name for login | [optional] 
- **password** | **String**| The password for login in clear text | [optional] 
+ **username** | **String**| The user name for login | 
+ **password** | **String**| The password for login in clear text | 
 
 ### Return type
 
@@ -297,10 +288,10 @@ Name | Type | Description  | Notes
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 
 
@@ -337,15 +328,15 @@ nil (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 
 
 # **update_user**
-> update_user(username, opts)
+> update_user(username, body)
 
 Updated user
 
@@ -360,13 +351,12 @@ api_instance = Petstore::UserApi.new
 
 username = "username_example" # String | name that need to be deleted
 
-opts = { 
-  body: Petstore::User.new # User | Updated user object
-}
+body = Petstore::User.new # User | Updated user object
+
 
 begin
   #Updated user
-  api_instance.update_user(username, opts)
+  api_instance.update_user(username, body)
 rescue Petstore::ApiError => e
   puts "Exception when calling UserApi->update_user: #{e}"
 end
@@ -377,7 +367,7 @@ end
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **username** | **String**| name that need to be deleted | 
- **body** | [**User**](User.md)| Updated user object | [optional] 
+ **body** | [**User**](User.md)| Updated user object | 
 
 ### Return type
 
@@ -387,10 +377,10 @@ nil (empty response body)
 
 No authorization required
 
-### HTTP reuqest headers
+### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **Accept**: application/xml, application/json
 
 
 
diff --git a/samples/client/petstore/ruby/lib/petstore.rb b/samples/client/petstore/ruby/lib/petstore.rb
index 4b848d0c3a0..5964a522d9f 100644
--- a/samples/client/petstore/ruby/lib/petstore.rb
+++ b/samples/client/petstore/ruby/lib/petstore.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
@@ -22,10 +22,11 @@ require 'petstore/configuration'
 
 # Models
 require 'petstore/models/animal'
+require 'petstore/models/api_response'
 require 'petstore/models/cat'
 require 'petstore/models/category'
 require 'petstore/models/dog'
-require 'petstore/models/inline_response_200'
+require 'petstore/models/format_test'
 require 'petstore/models/model_200_response'
 require 'petstore/models/model_return'
 require 'petstore/models/name'
diff --git a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb
index 3bff1eda69a..4355642fc58 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
@@ -26,24 +26,27 @@ module Petstore
 
     # Add a new pet to the store
     # 
+    # @param body Pet object that needs to be added to the store
     # @param [Hash] opts the optional parameters
-    # @option opts [Pet] :body Pet object that needs to be added to the store
     # @return [nil]
-    def add_pet(opts = {})
-      add_pet_with_http_info(opts)
+    def add_pet(body, opts = {})
+      add_pet_with_http_info(body, opts)
       return nil
     end
 
     # Add a new pet to the store
     # 
+    # @param body Pet object that needs to be added to the store
     # @param [Hash] opts the optional parameters
-    # @option opts [Pet] :body Pet object that needs to be added to the store
     # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
-    def add_pet_with_http_info(opts = {})
+    def add_pet_with_http_info(body, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug "Calling API: PetApi#add_pet ..."
       end
       
+      # verify the required parameter 'body' is set
+      fail "Missing the required parameter 'body' when calling add_pet" if body.nil?
+      
       # resource path
       local_var_path = "/pet".sub('{format}','json')
 
@@ -54,7 +57,7 @@ module Petstore
       header_params = {}
 
       # HTTP header 'Accept' (if needed)
-      local_header_accept = ['application/json', 'application/xml']
+      local_header_accept = ['application/xml', 'application/json']
       local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
 
       # HTTP header 'Content-Type'
@@ -65,7 +68,7 @@ module Petstore
       form_params = {}
 
       # http body (model)
-      post_body = @api_client.object_to_http_body(opts[:'body'])
+      post_body = @api_client.object_to_http_body(body)
       auth_names = ['petstore_auth']
       data, status_code, headers = @api_client.call_api(:POST, local_var_path,
         :header_params => header_params,
@@ -79,61 +82,6 @@ module Petstore
       return data, status_code, headers
     end
 
-    # Fake endpoint to test byte array in body parameter for adding a new pet to the store
-    # 
-    # @param [Hash] opts the optional parameters
-    # @option opts [String] :body Pet object in the form of byte array
-    # @return [nil]
-    def add_pet_using_byte_array(opts = {})
-      add_pet_using_byte_array_with_http_info(opts)
-      return nil
-    end
-
-    # Fake endpoint to test byte array in body parameter for adding a new pet to the store
-    # 
-    # @param [Hash] opts the optional parameters
-    # @option opts [String] :body Pet object in the form of byte array
-    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
-    def add_pet_using_byte_array_with_http_info(opts = {})
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: PetApi#add_pet_using_byte_array ..."
-      end
-      
-      # resource path
-      local_var_path = "/pet?testing_byte_array&#x3D;true".sub('{format}','json')
-
-      # query parameters
-      query_params = {}
-
-      # header parameters
-      header_params = {}
-
-      # HTTP header 'Accept' (if needed)
-      local_header_accept = ['application/json', 'application/xml']
-      local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
-
-      # HTTP header 'Content-Type'
-      local_header_content_type = ['application/json', 'application/xml']
-      header_params['Content-Type'] = @api_client.select_header_content_type(local_header_content_type)
-
-      # form parameters
-      form_params = {}
-
-      # http body (model)
-      post_body = @api_client.object_to_http_body(opts[:'body'])
-      auth_names = ['petstore_auth']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
-        :header_params => header_params,
-        :query_params => query_params,
-        :form_params => form_params,
-        :body => post_body,
-        :auth_names => auth_names)
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: PetApi#add_pet_using_byte_array\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
-      end
-      return data, status_code, headers
-    end
-
     # Deletes a pet
     # 
     # @param pet_id Pet id to delete
@@ -169,7 +117,7 @@ module Petstore
       header_params = {}
 
       # HTTP header 'Accept' (if needed)
-      local_header_accept = ['application/json', 'application/xml']
+      local_header_accept = ['application/xml', 'application/json']
       local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
 
       # HTTP header 'Content-Type'
@@ -197,36 +145,39 @@ module Petstore
 
     # Finds Pets by status
     # Multiple status values can be provided with comma separated strings
+    # @param status Status values that need to be considered for filter
     # @param [Hash] opts the optional parameters
-    # @option opts [Array<String>] :status Status values that need to be considered for query (default to available)
     # @return [Array<Pet>]
-    def find_pets_by_status(opts = {})
-      data, _status_code, _headers = find_pets_by_status_with_http_info(opts)
+    def find_pets_by_status(status, opts = {})
+      data, _status_code, _headers = find_pets_by_status_with_http_info(status, opts)
       return data
     end
 
     # Finds Pets by status
     # Multiple status values can be provided with comma separated strings
+    # @param status Status values that need to be considered for filter
     # @param [Hash] opts the optional parameters
-    # @option opts [Array<String>] :status Status values that need to be considered for query
     # @return [Array<(Array<Pet>, Fixnum, Hash)>] Array<Pet> data, response status code and response headers
-    def find_pets_by_status_with_http_info(opts = {})
+    def find_pets_by_status_with_http_info(status, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug "Calling API: PetApi#find_pets_by_status ..."
       end
       
+      # verify the required parameter 'status' is set
+      fail "Missing the required parameter 'status' when calling find_pets_by_status" if status.nil?
+      
       # resource path
       local_var_path = "/pet/findByStatus".sub('{format}','json')
 
       # query parameters
       query_params = {}
-      query_params[:'status'] = @api_client.build_collection_param(opts[:'status'], :multi) if opts[:'status']
+      query_params[:'status'] = @api_client.build_collection_param(status, :csv)
 
       # header parameters
       header_params = {}
 
       # HTTP header 'Accept' (if needed)
-      local_header_accept = ['application/json', 'application/xml']
+      local_header_accept = ['application/xml', 'application/json']
       local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
 
       # HTTP header 'Content-Type'
@@ -253,37 +204,40 @@ module Petstore
     end
 
     # Finds Pets by tags
-    # Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+    # Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+    # @param tags Tags to filter by
     # @param [Hash] opts the optional parameters
-    # @option opts [Array<String>] :tags Tags to filter by
     # @return [Array<Pet>]
-    def find_pets_by_tags(opts = {})
-      data, _status_code, _headers = find_pets_by_tags_with_http_info(opts)
+    def find_pets_by_tags(tags, opts = {})
+      data, _status_code, _headers = find_pets_by_tags_with_http_info(tags, opts)
       return data
     end
 
     # Finds Pets by tags
-    # Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+    # Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+    # @param tags Tags to filter by
     # @param [Hash] opts the optional parameters
-    # @option opts [Array<String>] :tags Tags to filter by
     # @return [Array<(Array<Pet>, Fixnum, Hash)>] Array<Pet> data, response status code and response headers
-    def find_pets_by_tags_with_http_info(opts = {})
+    def find_pets_by_tags_with_http_info(tags, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug "Calling API: PetApi#find_pets_by_tags ..."
       end
       
+      # verify the required parameter 'tags' is set
+      fail "Missing the required parameter 'tags' when calling find_pets_by_tags" if tags.nil?
+      
       # resource path
       local_var_path = "/pet/findByTags".sub('{format}','json')
 
       # query parameters
       query_params = {}
-      query_params[:'tags'] = @api_client.build_collection_param(opts[:'tags'], :multi) if opts[:'tags']
+      query_params[:'tags'] = @api_client.build_collection_param(tags, :csv)
 
       # header parameters
       header_params = {}
 
       # HTTP header 'Accept' (if needed)
-      local_header_accept = ['application/json', 'application/xml']
+      local_header_accept = ['application/xml', 'application/json']
       local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
 
       # HTTP header 'Content-Type'
@@ -310,8 +264,8 @@ module Petstore
     end
 
     # Find pet by ID
-    # Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
-    # @param pet_id ID of pet that needs to be fetched
+    # Returns a single pet
+    # @param pet_id ID of pet to return
     # @param [Hash] opts the optional parameters
     # @return [Pet]
     def get_pet_by_id(pet_id, opts = {})
@@ -320,8 +274,8 @@ module Petstore
     end
 
     # Find pet by ID
-    # Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-    # @param pet_id ID of pet that needs to be fetched
+    # Returns a single pet
+    # @param pet_id ID of pet to return
     # @param [Hash] opts the optional parameters
     # @return [Array<(Pet, Fixnum, Hash)>] Pet data, response status code and response headers
     def get_pet_by_id_with_http_info(pet_id, opts = {})
@@ -342,7 +296,7 @@ module Petstore
       header_params = {}
 
       # HTTP header 'Accept' (if needed)
-      local_header_accept = ['application/json', 'application/xml']
+      local_header_accept = ['application/xml', 'application/json']
       local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
 
       # HTTP header 'Content-Type'
@@ -354,7 +308,7 @@ module Petstore
 
       # http body (model)
       post_body = nil
-            auth_names = ['api_key', 'petstore_auth']
+            auth_names = ['api_key']
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
@@ -368,144 +322,29 @@ module Petstore
       return data, status_code, headers
     end
 
-    # Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
-    # Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
-    # @param pet_id ID of pet that needs to be fetched
-    # @param [Hash] opts the optional parameters
-    # @return [InlineResponse200]
-    def get_pet_by_id_in_object(pet_id, opts = {})
-      data, _status_code, _headers = get_pet_by_id_in_object_with_http_info(pet_id, opts)
-      return data
-    end
-
-    # Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
-    # Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-    # @param pet_id ID of pet that needs to be fetched
-    # @param [Hash] opts the optional parameters
-    # @return [Array<(InlineResponse200, Fixnum, Hash)>] InlineResponse200 data, response status code and response headers
-    def get_pet_by_id_in_object_with_http_info(pet_id, opts = {})
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: PetApi#get_pet_by_id_in_object ..."
-      end
-      
-      # verify the required parameter 'pet_id' is set
-      fail "Missing the required parameter 'pet_id' when calling get_pet_by_id_in_object" if pet_id.nil?
-      
-      # resource path
-      local_var_path = "/pet/{petId}?response&#x3D;inline_arbitrary_object".sub('{format}','json').sub('{' + 'petId' + '}', pet_id.to_s)
-
-      # query parameters
-      query_params = {}
-
-      # header parameters
-      header_params = {}
-
-      # HTTP header 'Accept' (if needed)
-      local_header_accept = ['application/json', 'application/xml']
-      local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
-
-      # HTTP header 'Content-Type'
-      local_header_content_type = []
-      header_params['Content-Type'] = @api_client.select_header_content_type(local_header_content_type)
-
-      # form parameters
-      form_params = {}
-
-      # http body (model)
-      post_body = nil
-            auth_names = ['api_key', 'petstore_auth']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
-        :header_params => header_params,
-        :query_params => query_params,
-        :form_params => form_params,
-        :body => post_body,
-        :auth_names => auth_names,
-        :return_type => 'InlineResponse200')
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: PetApi#get_pet_by_id_in_object\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
-      end
-      return data, status_code, headers
-    end
-
-    # Fake endpoint to test byte array return by 'Find pet by ID'
-    # Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
-    # @param pet_id ID of pet that needs to be fetched
-    # @param [Hash] opts the optional parameters
-    # @return [String]
-    def pet_pet_idtesting_byte_arraytrue_get(pet_id, opts = {})
-      data, _status_code, _headers = pet_pet_idtesting_byte_arraytrue_get_with_http_info(pet_id, opts)
-      return data
-    end
-
-    # Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
-    # Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-    # @param pet_id ID of pet that needs to be fetched
-    # @param [Hash] opts the optional parameters
-    # @return [Array<(String, Fixnum, Hash)>] String data, response status code and response headers
-    def pet_pet_idtesting_byte_arraytrue_get_with_http_info(pet_id, opts = {})
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: PetApi#pet_pet_idtesting_byte_arraytrue_get ..."
-      end
-      
-      # verify the required parameter 'pet_id' is set
-      fail "Missing the required parameter 'pet_id' when calling pet_pet_idtesting_byte_arraytrue_get" if pet_id.nil?
-      
-      # resource path
-      local_var_path = "/pet/{petId}?testing_byte_array&#x3D;true".sub('{format}','json').sub('{' + 'petId' + '}', pet_id.to_s)
-
-      # query parameters
-      query_params = {}
-
-      # header parameters
-      header_params = {}
-
-      # HTTP header 'Accept' (if needed)
-      local_header_accept = ['application/json', 'application/xml']
-      local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
-
-      # HTTP header 'Content-Type'
-      local_header_content_type = []
-      header_params['Content-Type'] = @api_client.select_header_content_type(local_header_content_type)
-
-      # form parameters
-      form_params = {}
-
-      # http body (model)
-      post_body = nil
-            auth_names = ['api_key', 'petstore_auth']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
-        :header_params => header_params,
-        :query_params => query_params,
-        :form_params => form_params,
-        :body => post_body,
-        :auth_names => auth_names,
-        :return_type => 'String')
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: PetApi#pet_pet_idtesting_byte_arraytrue_get\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
-      end
-      return data, status_code, headers
-    end
-
     # Update an existing pet
     # 
+    # @param body Pet object that needs to be added to the store
     # @param [Hash] opts the optional parameters
-    # @option opts [Pet] :body Pet object that needs to be added to the store
     # @return [nil]
-    def update_pet(opts = {})
-      update_pet_with_http_info(opts)
+    def update_pet(body, opts = {})
+      update_pet_with_http_info(body, opts)
       return nil
     end
 
     # Update an existing pet
     # 
+    # @param body Pet object that needs to be added to the store
     # @param [Hash] opts the optional parameters
-    # @option opts [Pet] :body Pet object that needs to be added to the store
     # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
-    def update_pet_with_http_info(opts = {})
+    def update_pet_with_http_info(body, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug "Calling API: PetApi#update_pet ..."
       end
       
+      # verify the required parameter 'body' is set
+      fail "Missing the required parameter 'body' when calling update_pet" if body.nil?
+      
       # resource path
       local_var_path = "/pet".sub('{format}','json')
 
@@ -516,7 +355,7 @@ module Petstore
       header_params = {}
 
       # HTTP header 'Accept' (if needed)
-      local_header_accept = ['application/json', 'application/xml']
+      local_header_accept = ['application/xml', 'application/json']
       local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
 
       # HTTP header 'Content-Type'
@@ -527,7 +366,7 @@ module Petstore
       form_params = {}
 
       # http body (model)
-      post_body = @api_client.object_to_http_body(opts[:'body'])
+      post_body = @api_client.object_to_http_body(body)
       auth_names = ['petstore_auth']
       data, status_code, headers = @api_client.call_api(:PUT, local_var_path,
         :header_params => header_params,
@@ -578,7 +417,7 @@ module Petstore
       header_params = {}
 
       # HTTP header 'Accept' (if needed)
-      local_header_accept = ['application/json', 'application/xml']
+      local_header_accept = ['application/xml', 'application/json']
       local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
 
       # HTTP header 'Content-Type'
@@ -611,10 +450,10 @@ module Petstore
     # @param [Hash] opts the optional parameters
     # @option opts [String] :additional_metadata Additional data to pass to server
     # @option opts [File] :file file to upload
-    # @return [nil]
+    # @return [ApiResponse]
     def upload_file(pet_id, opts = {})
-      upload_file_with_http_info(pet_id, opts)
-      return nil
+      data, _status_code, _headers = upload_file_with_http_info(pet_id, opts)
+      return data
     end
 
     # uploads an image
@@ -623,7 +462,7 @@ module Petstore
     # @param [Hash] opts the optional parameters
     # @option opts [String] :additional_metadata Additional data to pass to server
     # @option opts [File] :file file to upload
-    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
+    # @return [Array<(ApiResponse, Fixnum, Hash)>] ApiResponse data, response status code and response headers
     def upload_file_with_http_info(pet_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug "Calling API: PetApi#upload_file ..."
@@ -642,7 +481,7 @@ module Petstore
       header_params = {}
 
       # HTTP header 'Accept' (if needed)
-      local_header_accept = ['application/json', 'application/xml']
+      local_header_accept = ['application/json']
       local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
 
       # HTTP header 'Content-Type'
@@ -662,7 +501,8 @@ module Petstore
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
-        :auth_names => auth_names)
+        :auth_names => auth_names,
+        :return_type => 'ApiResponse')
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: PetApi#upload_file\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
diff --git a/samples/client/petstore/ruby/lib/petstore/api/store_api.rb b/samples/client/petstore/ruby/lib/petstore/api/store_api.rb
index 548b5a355e0..5a3c8efeb82 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/store_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/store_api.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
@@ -57,7 +57,7 @@ module Petstore
       header_params = {}
 
       # HTTP header 'Accept' (if needed)
-      local_header_accept = ['application/json', 'application/xml']
+      local_header_accept = ['application/xml', 'application/json']
       local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
 
       # HTTP header 'Content-Type'
@@ -82,67 +82,6 @@ module Petstore
       return data, status_code, headers
     end
 
-    # Finds orders by status
-    # A single status value can be provided as a string
-    # @param [Hash] opts the optional parameters
-    # @option opts [String] :status Status value that needs to be considered for query (default to placed)
-    # @return [Array<Order>]
-    def find_orders_by_status(opts = {})
-      data, _status_code, _headers = find_orders_by_status_with_http_info(opts)
-      return data
-    end
-
-    # Finds orders by status
-    # A single status value can be provided as a string
-    # @param [Hash] opts the optional parameters
-    # @option opts [String] :status Status value that needs to be considered for query
-    # @return [Array<(Array<Order>, Fixnum, Hash)>] Array<Order> data, response status code and response headers
-    def find_orders_by_status_with_http_info(opts = {})
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: StoreApi#find_orders_by_status ..."
-      end
-      
-      if opts[:'status'] && !['placed', 'approved', 'delivered'].include?(opts[:'status'])
-        fail 'invalid value for "status", must be one of placed, approved, delivered'
-      end
-      
-      # resource path
-      local_var_path = "/store/findByStatus".sub('{format}','json')
-
-      # query parameters
-      query_params = {}
-      query_params[:'status'] = opts[:'status'] if opts[:'status']
-
-      # header parameters
-      header_params = {}
-
-      # HTTP header 'Accept' (if needed)
-      local_header_accept = ['application/json', 'application/xml']
-      local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
-
-      # HTTP header 'Content-Type'
-      local_header_content_type = []
-      header_params['Content-Type'] = @api_client.select_header_content_type(local_header_content_type)
-
-      # form parameters
-      form_params = {}
-
-      # http body (model)
-      post_body = nil
-            auth_names = ['test_api_client_id', 'test_api_client_secret']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
-        :header_params => header_params,
-        :query_params => query_params,
-        :form_params => form_params,
-        :body => post_body,
-        :auth_names => auth_names,
-        :return_type => 'Array<Order>')
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: StoreApi#find_orders_by_status\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
-      end
-      return data, status_code, headers
-    end
-
     # Returns pet inventories by status
     # Returns a map of status codes to quantities
     # @param [Hash] opts the optional parameters
@@ -171,7 +110,7 @@ module Petstore
       header_params = {}
 
       # HTTP header 'Accept' (if needed)
-      local_header_accept = ['application/json', 'application/xml']
+      local_header_accept = ['application/json']
       local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
 
       # HTTP header 'Content-Type'
@@ -197,60 +136,6 @@ module Petstore
       return data, status_code, headers
     end
 
-    # Fake endpoint to test arbitrary object return by 'Get inventory'
-    # Returns an arbitrary object which is actually a map of status codes to quantities
-    # @param [Hash] opts the optional parameters
-    # @return [Object]
-    def get_inventory_in_object(opts = {})
-      data, _status_code, _headers = get_inventory_in_object_with_http_info(opts)
-      return data
-    end
-
-    # Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
-    # Returns an arbitrary object which is actually a map of status codes to quantities
-    # @param [Hash] opts the optional parameters
-    # @return [Array<(Object, Fixnum, Hash)>] Object data, response status code and response headers
-    def get_inventory_in_object_with_http_info(opts = {})
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: StoreApi#get_inventory_in_object ..."
-      end
-      
-      # resource path
-      local_var_path = "/store/inventory?response&#x3D;arbitrary_object".sub('{format}','json')
-
-      # query parameters
-      query_params = {}
-
-      # header parameters
-      header_params = {}
-
-      # HTTP header 'Accept' (if needed)
-      local_header_accept = ['application/json', 'application/xml']
-      local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
-
-      # HTTP header 'Content-Type'
-      local_header_content_type = []
-      header_params['Content-Type'] = @api_client.select_header_content_type(local_header_content_type)
-
-      # form parameters
-      form_params = {}
-
-      # http body (model)
-      post_body = nil
-            auth_names = ['api_key']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
-        :header_params => header_params,
-        :query_params => query_params,
-        :form_params => form_params,
-        :body => post_body,
-        :auth_names => auth_names,
-        :return_type => 'Object')
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: StoreApi#get_inventory_in_object\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
-      end
-      return data, status_code, headers
-    end
-
     # Find purchase order by ID
     # For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
     # @param order_id ID of pet that needs to be fetched
@@ -284,7 +169,7 @@ module Petstore
       header_params = {}
 
       # HTTP header 'Accept' (if needed)
-      local_header_accept = ['application/json', 'application/xml']
+      local_header_accept = ['application/xml', 'application/json']
       local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
 
       # HTTP header 'Content-Type'
@@ -296,7 +181,7 @@ module Petstore
 
       # http body (model)
       post_body = nil
-            auth_names = ['test_api_key_header', 'test_api_key_query']
+            auth_names = []
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
@@ -312,24 +197,27 @@ module Petstore
 
     # Place an order for a pet
     # 
+    # @param body order placed for purchasing the pet
     # @param [Hash] opts the optional parameters
-    # @option opts [Order] :body order placed for purchasing the pet
     # @return [Order]
-    def place_order(opts = {})
-      data, _status_code, _headers = place_order_with_http_info(opts)
+    def place_order(body, opts = {})
+      data, _status_code, _headers = place_order_with_http_info(body, opts)
       return data
     end
 
     # Place an order for a pet
     # 
+    # @param body order placed for purchasing the pet
     # @param [Hash] opts the optional parameters
-    # @option opts [Order] :body order placed for purchasing the pet
     # @return [Array<(Order, Fixnum, Hash)>] Order data, response status code and response headers
-    def place_order_with_http_info(opts = {})
+    def place_order_with_http_info(body, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug "Calling API: StoreApi#place_order ..."
       end
       
+      # verify the required parameter 'body' is set
+      fail "Missing the required parameter 'body' when calling place_order" if body.nil?
+      
       # resource path
       local_var_path = "/store/order".sub('{format}','json')
 
@@ -340,7 +228,7 @@ module Petstore
       header_params = {}
 
       # HTTP header 'Accept' (if needed)
-      local_header_accept = ['application/json', 'application/xml']
+      local_header_accept = ['application/xml', 'application/json']
       local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
 
       # HTTP header 'Content-Type'
@@ -351,8 +239,8 @@ module Petstore
       form_params = {}
 
       # http body (model)
-      post_body = @api_client.object_to_http_body(opts[:'body'])
-      auth_names = ['test_api_client_id', 'test_api_client_secret']
+      post_body = @api_client.object_to_http_body(body)
+      auth_names = []
       data, status_code, headers = @api_client.call_api(:POST, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
diff --git a/samples/client/petstore/ruby/lib/petstore/api/user_api.rb b/samples/client/petstore/ruby/lib/petstore/api/user_api.rb
index 0f9af5bb7f0..d5535aac583 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/user_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/user_api.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
@@ -26,24 +26,27 @@ module Petstore
 
     # Create user
     # This can only be done by the logged in user.
+    # @param body Created user object
     # @param [Hash] opts the optional parameters
-    # @option opts [User] :body Created user object
     # @return [nil]
-    def create_user(opts = {})
-      create_user_with_http_info(opts)
+    def create_user(body, opts = {})
+      create_user_with_http_info(body, opts)
       return nil
     end
 
     # Create user
     # This can only be done by the logged in user.
+    # @param body Created user object
     # @param [Hash] opts the optional parameters
-    # @option opts [User] :body Created user object
     # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
-    def create_user_with_http_info(opts = {})
+    def create_user_with_http_info(body, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug "Calling API: UserApi#create_user ..."
       end
       
+      # verify the required parameter 'body' is set
+      fail "Missing the required parameter 'body' when calling create_user" if body.nil?
+      
       # resource path
       local_var_path = "/user".sub('{format}','json')
 
@@ -54,7 +57,7 @@ module Petstore
       header_params = {}
 
       # HTTP header 'Accept' (if needed)
-      local_header_accept = ['application/json', 'application/xml']
+      local_header_accept = ['application/xml', 'application/json']
       local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
 
       # HTTP header 'Content-Type'
@@ -65,7 +68,7 @@ module Petstore
       form_params = {}
 
       # http body (model)
-      post_body = @api_client.object_to_http_body(opts[:'body'])
+      post_body = @api_client.object_to_http_body(body)
       auth_names = []
       data, status_code, headers = @api_client.call_api(:POST, local_var_path,
         :header_params => header_params,
@@ -81,24 +84,27 @@ module Petstore
 
     # Creates list of users with given input array
     # 
+    # @param body List of user object
     # @param [Hash] opts the optional parameters
-    # @option opts [Array<User>] :body List of user object
     # @return [nil]
-    def create_users_with_array_input(opts = {})
-      create_users_with_array_input_with_http_info(opts)
+    def create_users_with_array_input(body, opts = {})
+      create_users_with_array_input_with_http_info(body, opts)
       return nil
     end
 
     # Creates list of users with given input array
     # 
+    # @param body List of user object
     # @param [Hash] opts the optional parameters
-    # @option opts [Array<User>] :body List of user object
     # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
-    def create_users_with_array_input_with_http_info(opts = {})
+    def create_users_with_array_input_with_http_info(body, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug "Calling API: UserApi#create_users_with_array_input ..."
       end
       
+      # verify the required parameter 'body' is set
+      fail "Missing the required parameter 'body' when calling create_users_with_array_input" if body.nil?
+      
       # resource path
       local_var_path = "/user/createWithArray".sub('{format}','json')
 
@@ -109,7 +115,7 @@ module Petstore
       header_params = {}
 
       # HTTP header 'Accept' (if needed)
-      local_header_accept = ['application/json', 'application/xml']
+      local_header_accept = ['application/xml', 'application/json']
       local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
 
       # HTTP header 'Content-Type'
@@ -120,7 +126,7 @@ module Petstore
       form_params = {}
 
       # http body (model)
-      post_body = @api_client.object_to_http_body(opts[:'body'])
+      post_body = @api_client.object_to_http_body(body)
       auth_names = []
       data, status_code, headers = @api_client.call_api(:POST, local_var_path,
         :header_params => header_params,
@@ -136,24 +142,27 @@ module Petstore
 
     # Creates list of users with given input array
     # 
+    # @param body List of user object
     # @param [Hash] opts the optional parameters
-    # @option opts [Array<User>] :body List of user object
     # @return [nil]
-    def create_users_with_list_input(opts = {})
-      create_users_with_list_input_with_http_info(opts)
+    def create_users_with_list_input(body, opts = {})
+      create_users_with_list_input_with_http_info(body, opts)
       return nil
     end
 
     # Creates list of users with given input array
     # 
+    # @param body List of user object
     # @param [Hash] opts the optional parameters
-    # @option opts [Array<User>] :body List of user object
     # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
-    def create_users_with_list_input_with_http_info(opts = {})
+    def create_users_with_list_input_with_http_info(body, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug "Calling API: UserApi#create_users_with_list_input ..."
       end
       
+      # verify the required parameter 'body' is set
+      fail "Missing the required parameter 'body' when calling create_users_with_list_input" if body.nil?
+      
       # resource path
       local_var_path = "/user/createWithList".sub('{format}','json')
 
@@ -164,7 +173,7 @@ module Petstore
       header_params = {}
 
       # HTTP header 'Accept' (if needed)
-      local_header_accept = ['application/json', 'application/xml']
+      local_header_accept = ['application/xml', 'application/json']
       local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
 
       # HTTP header 'Content-Type'
@@ -175,7 +184,7 @@ module Petstore
       form_params = {}
 
       # http body (model)
-      post_body = @api_client.object_to_http_body(opts[:'body'])
+      post_body = @api_client.object_to_http_body(body)
       auth_names = []
       data, status_code, headers = @api_client.call_api(:POST, local_var_path,
         :header_params => header_params,
@@ -222,7 +231,7 @@ module Petstore
       header_params = {}
 
       # HTTP header 'Accept' (if needed)
-      local_header_accept = ['application/json', 'application/xml']
+      local_header_accept = ['application/xml', 'application/json']
       local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
 
       # HTTP header 'Content-Type'
@@ -234,7 +243,7 @@ module Petstore
 
       # http body (model)
       post_body = nil
-            auth_names = ['test_http_basic']
+            auth_names = []
       data, status_code, headers = @api_client.call_api(:DELETE, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
@@ -280,7 +289,7 @@ module Petstore
       header_params = {}
 
       # HTTP header 'Accept' (if needed)
-      local_header_accept = ['application/json', 'application/xml']
+      local_header_accept = ['application/xml', 'application/json']
       local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
 
       # HTTP header 'Content-Type'
@@ -308,39 +317,45 @@ module Petstore
 
     # Logs user into the system
     # 
+    # @param username The user name for login
+    # @param password The password for login in clear text
     # @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]
-    def login_user(opts = {})
-      data, _status_code, _headers = login_user_with_http_info(opts)
+    def login_user(username, password, opts = {})
+      data, _status_code, _headers = login_user_with_http_info(username, password, opts)
       return data
     end
 
     # Logs user into the system
     # 
+    # @param username The user name for login
+    # @param password The password for login in clear text
     # @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 [Array<(String, Fixnum, Hash)>] String data, response status code and response headers
-    def login_user_with_http_info(opts = {})
+    def login_user_with_http_info(username, password, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug "Calling API: UserApi#login_user ..."
       end
       
+      # verify the required parameter 'username' is set
+      fail "Missing the required parameter 'username' when calling login_user" if username.nil?
+      
+      # verify the required parameter 'password' is set
+      fail "Missing the required parameter 'password' when calling login_user" if password.nil?
+      
       # resource path
       local_var_path = "/user/login".sub('{format}','json')
 
       # query parameters
       query_params = {}
-      query_params[:'username'] = opts[:'username'] if opts[:'username']
-      query_params[:'password'] = opts[:'password'] if opts[:'password']
+      query_params[:'username'] = username
+      query_params[:'password'] = password
 
       # header parameters
       header_params = {}
 
       # HTTP header 'Accept' (if needed)
-      local_header_accept = ['application/json', 'application/xml']
+      local_header_accept = ['application/xml', 'application/json']
       local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
 
       # HTTP header 'Content-Type'
@@ -394,7 +409,7 @@ module Petstore
       header_params = {}
 
       # HTTP header 'Accept' (if needed)
-      local_header_accept = ['application/json', 'application/xml']
+      local_header_accept = ['application/xml', 'application/json']
       local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
 
       # HTTP header 'Content-Type'
@@ -422,21 +437,21 @@ module Petstore
     # Updated user
     # This can only be done by the logged in user.
     # @param username name that need to be deleted
+    # @param body Updated user object
     # @param [Hash] opts the optional parameters
-    # @option opts [User] :body Updated user object
     # @return [nil]
-    def update_user(username, opts = {})
-      update_user_with_http_info(username, opts)
+    def update_user(username, body, opts = {})
+      update_user_with_http_info(username, body, opts)
       return nil
     end
 
     # Updated user
     # This can only be done by the logged in user.
     # @param username name that need to be deleted
+    # @param body Updated user object
     # @param [Hash] opts the optional parameters
-    # @option opts [User] :body Updated user object
     # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
-    def update_user_with_http_info(username, opts = {})
+    def update_user_with_http_info(username, body, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug "Calling API: UserApi#update_user ..."
       end
@@ -444,6 +459,9 @@ module Petstore
       # verify the required parameter 'username' is set
       fail "Missing the required parameter 'username' when calling update_user" if username.nil?
       
+      # verify the required parameter 'body' is set
+      fail "Missing the required parameter 'body' when calling update_user" if body.nil?
+      
       # resource path
       local_var_path = "/user/{username}".sub('{format}','json').sub('{' + 'username' + '}', username.to_s)
 
@@ -454,7 +472,7 @@ module Petstore
       header_params = {}
 
       # HTTP header 'Accept' (if needed)
-      local_header_accept = ['application/json', 'application/xml']
+      local_header_accept = ['application/xml', 'application/json']
       local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
 
       # HTTP header 'Content-Type'
@@ -465,7 +483,7 @@ module Petstore
       form_params = {}
 
       # http body (model)
-      post_body = @api_client.object_to_http_body(opts[:'body'])
+      post_body = @api_client.object_to_http_body(body)
       auth_names = []
       data, status_code, headers = @api_client.call_api(:PUT, local_var_path,
         :header_params => header_params,
diff --git a/samples/client/petstore/ruby/lib/petstore/api_client.rb b/samples/client/petstore/ruby/lib/petstore/api_client.rb
index 70111d07438..ed1c501d71a 100644
--- a/samples/client/petstore/ruby/lib/petstore/api_client.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api_client.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
diff --git a/samples/client/petstore/ruby/lib/petstore/api_error.rb b/samples/client/petstore/ruby/lib/petstore/api_error.rb
index b05ca2fdaf6..e4c233b2e98 100644
--- a/samples/client/petstore/ruby/lib/petstore/api_error.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api_error.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
diff --git a/samples/client/petstore/ruby/lib/petstore/configuration.rb b/samples/client/petstore/ruby/lib/petstore/configuration.rb
index 5125ebe5960..05973753287 100644
--- a/samples/client/petstore/ruby/lib/petstore/configuration.rb
+++ b/samples/client/petstore/ruby/lib/petstore/configuration.rb
@@ -157,13 +157,6 @@ module Petstore
     # Returns Auth Settings hash for api client.
     def auth_settings
       {
-        'test_api_key_header' =>
-          {
-            type: 'api_key',
-            in: 'header',
-            key: 'test_api_key_header',
-            value: api_key_with_prefix('test_api_key_header')
-          },
         'api_key' =>
           {
             type: 'api_key',
@@ -171,34 +164,6 @@ module Petstore
             key: 'api_key',
             value: api_key_with_prefix('api_key')
           },
-        'test_http_basic' =>
-          {
-            type: 'basic',
-            in: 'header',
-            key: 'Authorization',
-            value: basic_auth_token
-          },
-        'test_api_client_secret' =>
-          {
-            type: 'api_key',
-            in: 'header',
-            key: 'x-test_api_client_secret',
-            value: api_key_with_prefix('x-test_api_client_secret')
-          },
-        'test_api_client_id' =>
-          {
-            type: 'api_key',
-            in: 'header',
-            key: 'x-test_api_client_id',
-            value: api_key_with_prefix('x-test_api_client_id')
-          },
-        'test_api_key_query' =>
-          {
-            type: 'api_key',
-            in: 'query',
-            key: 'test_api_key_query',
-            value: api_key_with_prefix('test_api_key_query')
-          },
         'petstore_auth' =>
           {
             type: 'oauth2',
diff --git a/samples/client/petstore/ruby/lib/petstore/models/animal.rb b/samples/client/petstore/ruby/lib/petstore/models/animal.rb
index 325898c5676..342d3b2464d 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/animal.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/animal.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
diff --git a/samples/client/petstore/ruby/lib/petstore/models/api_response.rb b/samples/client/petstore/ruby/lib/petstore/models/api_response.rb
new file mode 100644
index 00000000000..683083be4b2
--- /dev/null
+++ b/samples/client/petstore/ruby/lib/petstore/models/api_response.rb
@@ -0,0 +1,191 @@
+=begin
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
+require 'date'
+
+module Petstore
+  class ApiResponse
+    attr_accessor :code
+
+    attr_accessor :type
+
+    attr_accessor :message
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        :'code' => :'code',
+        :'type' => :'type',
+        :'message' => :'message'
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+        :'code' => :'Integer',
+        :'type' => :'String',
+        :'message' => :'String'
+      }
+    end
+
+    # Initializes the object
+    # @param [Hash] attributes Model attributes in the form of hash
+    def initialize(attributes = {})
+      return unless attributes.is_a?(Hash)
+
+      # convert string to symbol for hash key
+      attributes = attributes.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
+
+      if attributes[:'code']
+        self.code = attributes[:'code']
+      end
+      if attributes[:'type']
+        self.type = attributes[:'type']
+      end
+      if attributes[:'message']
+        self.message = attributes[:'message']
+      end
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param [Object] Object to be compared 
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          code == o.code &&
+          type == o.type &&
+          message == o.message
+    end
+
+    # @see the `==` method
+    # @param [Object] Object to be compared 
+    def eql?(o)
+      self == o
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Fixnum] Hash code
+    def hash
+      [code, type, message].hash
+    end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    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
+          # check to ensure the input is an array given that the the attribute
+          # is documented as an array but the input is not
+          if attributes[self.class.attribute_map[key]].is_a?(Array)
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| _deserialize($1, v) } )
+          end
+        elsif !attributes[self.class.attribute_map[key]].nil?
+          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        end # or else data not found in attributes(hash), not an issue as the data can be optional
+      end
+
+      self
+    end
+
+    # Deserializes the data based on type
+    # @param string type Data type
+    # @param string value Value to be deserialized
+    # @return [Object] Deserialized data
+    def _deserialize(type, value)
+      case type.to_sym
+      when :DateTime
+        DateTime.parse(value)
+      when :Date
+        Date.parse(value)
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :BOOLEAN
+        if value.to_s =~ /^(true|t|yes|y|1)$/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else # model
+        temp_model = Petstore.const_get(type).new
+        temp_model.build_from_hash(value)
+      end
+    end
+
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_hash (backward compatibility)
+    # @return [Hash] Returns the object in the form of hash
+    def to_body
+      to_hash
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        next if value.nil?
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    # Outputs non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    # @param [Object] value Any valid value 
+    # @return [Hash] Returns the value in the form of hash
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map{ |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+
+  end
+end
diff --git a/samples/client/petstore/ruby/lib/petstore/models/cat.rb b/samples/client/petstore/ruby/lib/petstore/models/cat.rb
index 1de8e299b37..4489e6abb85 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/cat.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/cat.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
@@ -34,7 +34,7 @@ module Petstore
     def self.swagger_types
       {
         :'class_name' => :'String',
-:'declawed' => :'BOOLEAN'
+        :'declawed' => :'BOOLEAN'
       }
     end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/category.rb b/samples/client/petstore/ruby/lib/petstore/models/category.rb
index cb7091dc788..0f6d61d83af 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/category.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/category.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
@@ -34,7 +34,7 @@ module Petstore
     def self.swagger_types
       {
         :'id' => :'Integer',
-:'name' => :'String'
+        :'name' => :'String'
       }
     end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/dog.rb b/samples/client/petstore/ruby/lib/petstore/models/dog.rb
index b0efe164eb7..5173f9a01ec 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/dog.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/dog.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
@@ -34,7 +34,7 @@ module Petstore
     def self.swagger_types
       {
         :'class_name' => :'String',
-:'breed' => :'String'
+        :'breed' => :'String'
       }
     end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/format_test.rb b/samples/client/petstore/ruby/lib/petstore/models/format_test.rb
new file mode 100644
index 00000000000..87b6d4e4695
--- /dev/null
+++ b/samples/client/petstore/ruby/lib/petstore/models/format_test.rb
@@ -0,0 +1,263 @@
+=begin
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
+require 'date'
+
+module Petstore
+  class FormatTest
+    attr_accessor :integer
+
+    attr_accessor :int32
+
+    attr_accessor :int64
+
+    attr_accessor :number
+
+    attr_accessor :float
+
+    attr_accessor :double
+
+    attr_accessor :string
+
+    attr_accessor :byte
+
+    attr_accessor :binary
+
+    attr_accessor :date
+
+    attr_accessor :date_time
+
+    attr_accessor :password
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        :'integer' => :'integer',
+        :'int32' => :'int32',
+        :'int64' => :'int64',
+        :'number' => :'number',
+        :'float' => :'float',
+        :'double' => :'double',
+        :'string' => :'string',
+        :'byte' => :'byte',
+        :'binary' => :'binary',
+        :'date' => :'date',
+        :'date_time' => :'dateTime',
+        :'password' => :'password'
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+        :'integer' => :'Integer',
+        :'int32' => :'Integer',
+        :'int64' => :'Integer',
+        :'number' => :'Float',
+        :'float' => :'Float',
+        :'double' => :'Float',
+        :'string' => :'String',
+        :'byte' => :'String',
+        :'binary' => :'String',
+        :'date' => :'Date',
+        :'date_time' => :'DateTime',
+        :'password' => :'String'
+      }
+    end
+
+    # Initializes the object
+    # @param [Hash] attributes Model attributes in the form of hash
+    def initialize(attributes = {})
+      return unless attributes.is_a?(Hash)
+
+      # convert string to symbol for hash key
+      attributes = attributes.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
+
+      if attributes[:'integer']
+        self.integer = attributes[:'integer']
+      end
+      if attributes[:'int32']
+        self.int32 = attributes[:'int32']
+      end
+      if attributes[:'int64']
+        self.int64 = attributes[:'int64']
+      end
+      if attributes[:'number']
+        self.number = attributes[:'number']
+      end
+      if attributes[:'float']
+        self.float = attributes[:'float']
+      end
+      if attributes[:'double']
+        self.double = attributes[:'double']
+      end
+      if attributes[:'string']
+        self.string = attributes[:'string']
+      end
+      if attributes[:'byte']
+        self.byte = attributes[:'byte']
+      end
+      if attributes[:'binary']
+        self.binary = attributes[:'binary']
+      end
+      if attributes[:'date']
+        self.date = attributes[:'date']
+      end
+      if attributes[:'dateTime']
+        self.date_time = attributes[:'dateTime']
+      end
+      if attributes[:'password']
+        self.password = attributes[:'password']
+      end
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param [Object] Object to be compared 
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          integer == o.integer &&
+          int32 == o.int32 &&
+          int64 == o.int64 &&
+          number == o.number &&
+          float == o.float &&
+          double == o.double &&
+          string == o.string &&
+          byte == o.byte &&
+          binary == o.binary &&
+          date == o.date &&
+          date_time == o.date_time &&
+          password == o.password
+    end
+
+    # @see the `==` method
+    # @param [Object] Object to be compared 
+    def eql?(o)
+      self == o
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Fixnum] Hash code
+    def hash
+      [integer, int32, int64, number, float, double, string, byte, binary, date, date_time, password].hash
+    end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    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
+          # check to ensure the input is an array given that the the attribute
+          # is documented as an array but the input is not
+          if attributes[self.class.attribute_map[key]].is_a?(Array)
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| _deserialize($1, v) } )
+          end
+        elsif !attributes[self.class.attribute_map[key]].nil?
+          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        end # or else data not found in attributes(hash), not an issue as the data can be optional
+      end
+
+      self
+    end
+
+    # Deserializes the data based on type
+    # @param string type Data type
+    # @param string value Value to be deserialized
+    # @return [Object] Deserialized data
+    def _deserialize(type, value)
+      case type.to_sym
+      when :DateTime
+        DateTime.parse(value)
+      when :Date
+        Date.parse(value)
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :BOOLEAN
+        if value.to_s =~ /^(true|t|yes|y|1)$/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else # model
+        temp_model = Petstore.const_get(type).new
+        temp_model.build_from_hash(value)
+      end
+    end
+
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_hash (backward compatibility)
+    # @return [Hash] Returns the object in the form of hash
+    def to_body
+      to_hash
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        next if value.nil?
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    # Outputs non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    # @param [Object] value Any valid value 
+    # @return [Hash] Returns the value in the form of hash
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map{ |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+
+  end
+end
diff --git a/samples/client/petstore/ruby/lib/petstore/models/inline_response_200.rb b/samples/client/petstore/ruby/lib/petstore/models/inline_response_200.rb
index 3b75ff5e41e..a3a44b28cfe 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/inline_response_200.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/inline_response_200.rb
@@ -47,11 +47,11 @@ module Petstore
     def self.swagger_types
       {
         :'tags' => :'Array<Tag>',
-:'id' => :'Integer',
-:'category' => :'Object',
-:'status' => :'String',
-:'name' => :'String',
-:'photo_urls' => :'Array<String>'
+        :'id' => :'Integer',
+        :'category' => :'Object',
+        :'status' => :'String',
+        :'name' => :'String',
+        :'photo_urls' => :'Array<String>'
       }
     end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/model_200_response.rb b/samples/client/petstore/ruby/lib/petstore/models/model_200_response.rb
index 4e198a489b3..9cacbdb1298 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/model_200_response.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/model_200_response.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
diff --git a/samples/client/petstore/ruby/lib/petstore/models/model_return.rb b/samples/client/petstore/ruby/lib/petstore/models/model_return.rb
index f016ff32fe9..31adf497fa2 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/model_return.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/model_return.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
diff --git a/samples/client/petstore/ruby/lib/petstore/models/name.rb b/samples/client/petstore/ruby/lib/petstore/models/name.rb
index 35ed30e193c..9818aa41cc4 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/name.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/name.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
@@ -35,7 +35,7 @@ module Petstore
     def self.swagger_types
       {
         :'name' => :'Integer',
-:'snake_case' => :'Integer'
+        :'snake_case' => :'Integer'
       }
     end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/order.rb b/samples/client/petstore/ruby/lib/petstore/models/order.rb
index 223d748e990..81f2601e9d9 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/order.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/order.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
@@ -47,11 +47,11 @@ module Petstore
     def self.swagger_types
       {
         :'id' => :'Integer',
-:'pet_id' => :'Integer',
-:'quantity' => :'Integer',
-:'ship_date' => :'DateTime',
-:'status' => :'String',
-:'complete' => :'BOOLEAN'
+        :'pet_id' => :'Integer',
+        :'quantity' => :'Integer',
+        :'ship_date' => :'DateTime',
+        :'status' => :'String',
+        :'complete' => :'BOOLEAN'
       }
     end
 
@@ -80,6 +80,8 @@ module Petstore
       end
       if attributes[:'complete']
         self.complete = attributes[:'complete']
+      else
+        self.complete = false
       end
     end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/pet.rb b/samples/client/petstore/ruby/lib/petstore/models/pet.rb
index 07c5ee9d75b..095f91ca7c3 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/pet.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/pet.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
@@ -47,11 +47,11 @@ module Petstore
     def self.swagger_types
       {
         :'id' => :'Integer',
-:'category' => :'Category',
-:'name' => :'String',
-:'photo_urls' => :'Array<String>',
-:'tags' => :'Array<Tag>',
-:'status' => :'String'
+        :'category' => :'Category',
+        :'name' => :'String',
+        :'photo_urls' => :'Array<String>',
+        :'tags' => :'Array<Tag>',
+        :'status' => :'String'
       }
     end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb b/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb
index b0509903ef2..4c859270d1b 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
diff --git a/samples/client/petstore/ruby/lib/petstore/models/tag.rb b/samples/client/petstore/ruby/lib/petstore/models/tag.rb
index c1a07d1b5e6..e5c80ee2228 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/tag.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/tag.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
@@ -34,7 +34,7 @@ module Petstore
     def self.swagger_types
       {
         :'id' => :'Integer',
-:'name' => :'String'
+        :'name' => :'String'
       }
     end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/user.rb b/samples/client/petstore/ruby/lib/petstore/models/user.rb
index 8e0c4fc99db..e7ce160dfa2 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/user.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/user.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
@@ -53,13 +53,13 @@ module Petstore
     def self.swagger_types
       {
         :'id' => :'Integer',
-:'username' => :'String',
-:'first_name' => :'String',
-:'last_name' => :'String',
-:'email' => :'String',
-:'password' => :'String',
-:'phone' => :'String',
-:'user_status' => :'Integer'
+        :'username' => :'String',
+        :'first_name' => :'String',
+        :'last_name' => :'String',
+        :'email' => :'String',
+        :'password' => :'String',
+        :'phone' => :'String',
+        :'user_status' => :'Integer'
       }
     end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/version.rb b/samples/client/petstore/ruby/lib/petstore/version.rb
index 2c3d31c3399..e28b737d97c 100644
--- a/samples/client/petstore/ruby/lib/petstore/version.rb
+++ b/samples/client/petstore/ruby/lib/petstore/version.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
diff --git a/samples/client/petstore/ruby/spec/api/pet_api_spec.rb b/samples/client/petstore/ruby/spec/api/pet_api_spec.rb
index 12cdc70dc57..e903362291b 100644
--- a/samples/client/petstore/ruby/spec/api/pet_api_spec.rb
+++ b/samples/client/petstore/ruby/spec/api/pet_api_spec.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
@@ -39,8 +39,8 @@ describe 'PetApi' do
   # unit tests for add_pet
   # Add a new pet to the store
   # 
+  # @param body Pet object that needs to be added to the store
   # @param [Hash] opts the optional parameters
-  # @option opts [Pet] :body Pet object that needs to be added to the store
   # @return [nil]
   describe 'add_pet test' do
     it "should work" do
@@ -52,22 +52,6 @@ describe 'PetApi' do
     end
   end
 
-  # unit tests for add_pet_using_byte_array
-  # Fake endpoint to test byte array in body parameter for adding a new pet to the store
-  # 
-  # @param [Hash] opts the optional parameters
-  # @option opts [String] :body Pet object in the form of byte array
-  # @return [nil]
-  describe 'add_pet_using_byte_array test' do
-    it "should work" do
-      # assertion here
-      # should be_a()
-      # should be_nil
-      # should ==
-      # should_not ==
-    end
-  end
-
   # unit tests for delete_pet
   # Deletes a pet
   # 
@@ -88,8 +72,8 @@ describe 'PetApi' do
   # unit tests for find_pets_by_status
   # Finds Pets by status
   # Multiple status values can be provided with comma separated strings
+  # @param status Status values that need to be considered for filter
   # @param [Hash] opts the optional parameters
-  # @option opts [Array<String>] :status Status values that need to be considered for query
   # @return [Array<Pet>]
   describe 'find_pets_by_status test' do
     it "should work" do
@@ -103,9 +87,9 @@ describe 'PetApi' do
 
   # unit tests for find_pets_by_tags
   # Finds Pets by tags
-  # Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+  # Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+  # @param tags Tags to filter by
   # @param [Hash] opts the optional parameters
-  # @option opts [Array<String>] :tags Tags to filter by
   # @return [Array<Pet>]
   describe 'find_pets_by_tags test' do
     it "should work" do
@@ -119,8 +103,8 @@ describe 'PetApi' do
 
   # unit tests for get_pet_by_id
   # Find pet by ID
-  # Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-  # @param pet_id ID of pet that needs to be fetched
+  # Returns a single pet
+  # @param pet_id ID of pet to return
   # @param [Hash] opts the optional parameters
   # @return [Pet]
   describe 'get_pet_by_id test' do
@@ -133,43 +117,11 @@ describe 'PetApi' do
     end
   end
 
-  # unit tests for get_pet_by_id_in_object
-  # Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
-  # Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-  # @param pet_id ID of pet that needs to be fetched
-  # @param [Hash] opts the optional parameters
-  # @return [InlineResponse200]
-  describe 'get_pet_by_id_in_object test' do
-    it "should work" do
-      # assertion here
-      # should be_a()
-      # should be_nil
-      # should ==
-      # should_not ==
-    end
-  end
-
-  # unit tests for pet_pet_idtesting_byte_arraytrue_get
-  # Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
-  # Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-  # @param pet_id ID of pet that needs to be fetched
-  # @param [Hash] opts the optional parameters
-  # @return [String]
-  describe 'pet_pet_idtesting_byte_arraytrue_get test' do
-    it "should work" do
-      # assertion here
-      # should be_a()
-      # should be_nil
-      # should ==
-      # should_not ==
-    end
-  end
-
   # unit tests for update_pet
   # Update an existing pet
   # 
+  # @param body Pet object that needs to be added to the store
   # @param [Hash] opts the optional parameters
-  # @option opts [Pet] :body Pet object that needs to be added to the store
   # @return [nil]
   describe 'update_pet test' do
     it "should work" do
@@ -206,7 +158,7 @@ describe 'PetApi' do
   # @param [Hash] opts the optional parameters
   # @option opts [String] :additional_metadata Additional data to pass to server
   # @option opts [File] :file file to upload
-  # @return [nil]
+  # @return [ApiResponse]
   describe 'upload_file test' do
     it "should work" do
       # assertion here
diff --git a/samples/client/petstore/ruby/spec/api/store_api_spec.rb b/samples/client/petstore/ruby/spec/api/store_api_spec.rb
index 0952b075bf4..479891e9308 100644
--- a/samples/client/petstore/ruby/spec/api/store_api_spec.rb
+++ b/samples/client/petstore/ruby/spec/api/store_api_spec.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
@@ -52,22 +52,6 @@ describe 'StoreApi' do
     end
   end
 
-  # unit tests for find_orders_by_status
-  # Finds orders by status
-  # A single status value can be provided as a string
-  # @param [Hash] opts the optional parameters
-  # @option opts [String] :status Status value that needs to be considered for query
-  # @return [Array<Order>]
-  describe 'find_orders_by_status test' do
-    it "should work" do
-      # assertion here
-      # should be_a()
-      # should be_nil
-      # should ==
-      # should_not ==
-    end
-  end
-
   # unit tests for get_inventory
   # Returns pet inventories by status
   # Returns a map of status codes to quantities
@@ -83,21 +67,6 @@ describe 'StoreApi' do
     end
   end
 
-  # unit tests for get_inventory_in_object
-  # Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
-  # Returns an arbitrary object which is actually a map of status codes to quantities
-  # @param [Hash] opts the optional parameters
-  # @return [Object]
-  describe 'get_inventory_in_object test' do
-    it "should work" do
-      # assertion here
-      # should be_a()
-      # should be_nil
-      # should ==
-      # should_not ==
-    end
-  end
-
   # unit tests for get_order_by_id
   # Find purchase order by ID
   # For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
@@ -117,8 +86,8 @@ describe 'StoreApi' do
   # unit tests for place_order
   # Place an order for a pet
   # 
+  # @param body order placed for purchasing the pet
   # @param [Hash] opts the optional parameters
-  # @option opts [Order] :body order placed for purchasing the pet
   # @return [Order]
   describe 'place_order test' do
     it "should work" do
diff --git a/samples/client/petstore/ruby/spec/api/user_api_spec.rb b/samples/client/petstore/ruby/spec/api/user_api_spec.rb
index 60f1dcda16f..4564491d507 100644
--- a/samples/client/petstore/ruby/spec/api/user_api_spec.rb
+++ b/samples/client/petstore/ruby/spec/api/user_api_spec.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
@@ -39,8 +39,8 @@ describe 'UserApi' do
   # unit tests for create_user
   # Create user
   # This can only be done by the logged in user.
+  # @param body Created user object
   # @param [Hash] opts the optional parameters
-  # @option opts [User] :body Created user object
   # @return [nil]
   describe 'create_user test' do
     it "should work" do
@@ -55,8 +55,8 @@ describe 'UserApi' do
   # unit tests for create_users_with_array_input
   # Creates list of users with given input array
   # 
+  # @param body List of user object
   # @param [Hash] opts the optional parameters
-  # @option opts [Array<User>] :body List of user object
   # @return [nil]
   describe 'create_users_with_array_input test' do
     it "should work" do
@@ -71,8 +71,8 @@ describe 'UserApi' do
   # unit tests for create_users_with_list_input
   # Creates list of users with given input array
   # 
+  # @param body List of user object
   # @param [Hash] opts the optional parameters
-  # @option opts [Array<User>] :body List of user object
   # @return [nil]
   describe 'create_users_with_list_input test' do
     it "should work" do
@@ -119,9 +119,9 @@ describe 'UserApi' do
   # unit tests for login_user
   # Logs user into the system
   # 
+  # @param username The user name for login
+  # @param password The password for login in clear text
   # @param [Hash] opts the optional parameters
-  # @option opts [String] :username The user name for login
-  # @option opts [String] :password The password for login in clear text
   # @return [String]
   describe 'login_user test' do
     it "should work" do
@@ -152,8 +152,8 @@ describe 'UserApi' do
   # Updated user
   # This can only be done by the logged in user.
   # @param username name that need to be deleted
+  # @param body Updated user object
   # @param [Hash] opts the optional parameters
-  # @option opts [User] :body Updated user object
   # @return [nil]
   describe 'update_user test' do
     it "should work" do
diff --git a/samples/client/petstore/ruby/spec/models/animal_spec.rb b/samples/client/petstore/ruby/spec/models/animal_spec.rb
index ddbfeca85f9..e35b12411be 100644
--- a/samples/client/petstore/ruby/spec/models/animal_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/animal_spec.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
diff --git a/samples/client/petstore/ruby/spec/models/api_response_spec.rb b/samples/client/petstore/ruby/spec/models/api_response_spec.rb
new file mode 100644
index 00000000000..279d8cb0aa5
--- /dev/null
+++ b/samples/client/petstore/ruby/spec/models/api_response_spec.rb
@@ -0,0 +1,70 @@
+=begin
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
+require 'spec_helper'
+require 'json'
+require 'date'
+
+# Unit tests for Petstore::ApiResponse
+# Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
+# Please update as you see appropriate
+describe 'ApiResponse' do
+  before do
+    # run before each test
+    @instance = Petstore::ApiResponse.new
+  end
+
+  after do
+    # run after each test
+  end
+
+  describe 'test an instance of ApiResponse' do
+    it 'should create an instact of ApiResponse' do
+      @instance.should be_a(Petstore::ApiResponse) 
+    end
+  end
+  describe 'test attribute "code"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "type"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "message"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+end
+
diff --git a/samples/client/petstore/ruby/spec/models/cat_spec.rb b/samples/client/petstore/ruby/spec/models/cat_spec.rb
index 220a37dfebe..e9b20d57eb0 100644
--- a/samples/client/petstore/ruby/spec/models/cat_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/cat_spec.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
diff --git a/samples/client/petstore/ruby/spec/models/category_spec.rb b/samples/client/petstore/ruby/spec/models/category_spec.rb
index 745974cbabd..0e7001053f7 100644
--- a/samples/client/petstore/ruby/spec/models/category_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/category_spec.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
diff --git a/samples/client/petstore/ruby/spec/models/dog_spec.rb b/samples/client/petstore/ruby/spec/models/dog_spec.rb
index 23b1b9a83f7..20375338c7e 100644
--- a/samples/client/petstore/ruby/spec/models/dog_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/dog_spec.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
diff --git a/samples/client/petstore/ruby/spec/models/format_test_spec.rb b/samples/client/petstore/ruby/spec/models/format_test_spec.rb
new file mode 100644
index 00000000000..e44131192a3
--- /dev/null
+++ b/samples/client/petstore/ruby/spec/models/format_test_spec.rb
@@ -0,0 +1,160 @@
+=begin
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+License: Apache 2.0
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+Terms of Service: http://swagger.io/terms/
+
+=end
+
+require 'spec_helper'
+require 'json'
+require 'date'
+
+# Unit tests for Petstore::FormatTest
+# Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
+# Please update as you see appropriate
+describe 'FormatTest' do
+  before do
+    # run before each test
+    @instance = Petstore::FormatTest.new
+  end
+
+  after do
+    # run after each test
+  end
+
+  describe 'test an instance of FormatTest' do
+    it 'should create an instact of FormatTest' do
+      @instance.should be_a(Petstore::FormatTest) 
+    end
+  end
+  describe 'test attribute "integer"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "int32"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "int64"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "number"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "float"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "double"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "string"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "byte"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "binary"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "date"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "date_time"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+  describe 'test attribute "password"' do
+    it 'should work' do
+       # assertion here
+       # should be_a()
+       # should be_nil
+       # should ==
+       # should_not ==
+    end
+  end
+
+end
+
diff --git a/samples/client/petstore/ruby/spec/models/inline_response_200_spec.rb b/samples/client/petstore/ruby/spec/models/inline_response_200_spec.rb
index 858b6504908..36a4da3baaa 100644
--- a/samples/client/petstore/ruby/spec/models/inline_response_200_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/inline_response_200_spec.rb
@@ -21,7 +21,7 @@ require 'date'
 # Unit tests for Petstore::InlineResponse200
 # Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
 # Please update as you see appropriate
-describe 'InlineResponse200' do
+describe 'InlineResponse200', pending: "Original spec does not have InlineResponse200 and we'll renable this after updating Petstore server" do
   before do
     # run before each test
     @instance = Petstore::InlineResponse200.new
diff --git a/samples/client/petstore/ruby/spec/models/model_200_response_spec.rb b/samples/client/petstore/ruby/spec/models/model_200_response_spec.rb
index 4e2f92c5212..88045611d9c 100644
--- a/samples/client/petstore/ruby/spec/models/model_200_response_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/model_200_response_spec.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
diff --git a/samples/client/petstore/ruby/spec/models/model_return_spec.rb b/samples/client/petstore/ruby/spec/models/model_return_spec.rb
index 018798b47e3..7b6f3a571c4 100644
--- a/samples/client/petstore/ruby/spec/models/model_return_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/model_return_spec.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
diff --git a/samples/client/petstore/ruby/spec/models/name_spec.rb b/samples/client/petstore/ruby/spec/models/name_spec.rb
index 5d66fd078f3..9eef65de2fa 100644
--- a/samples/client/petstore/ruby/spec/models/name_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/name_spec.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
diff --git a/samples/client/petstore/ruby/spec/models/order_spec.rb b/samples/client/petstore/ruby/spec/models/order_spec.rb
index 698f3af9268..420cfea059c 100644
--- a/samples/client/petstore/ruby/spec/models/order_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/order_spec.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
diff --git a/samples/client/petstore/ruby/spec/models/pet_spec.rb b/samples/client/petstore/ruby/spec/models/pet_spec.rb
index cf18e1a5f3a..96ced2cd366 100644
--- a/samples/client/petstore/ruby/spec/models/pet_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/pet_spec.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
diff --git a/samples/client/petstore/ruby/spec/models/special_model_name_spec.rb b/samples/client/petstore/ruby/spec/models/special_model_name_spec.rb
index e3201cb2e31..aa32e3fc7b2 100644
--- a/samples/client/petstore/ruby/spec/models/special_model_name_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/special_model_name_spec.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
diff --git a/samples/client/petstore/ruby/spec/models/tag_spec.rb b/samples/client/petstore/ruby/spec/models/tag_spec.rb
index 4b3ff7ac611..55778d8fd67 100644
--- a/samples/client/petstore/ruby/spec/models/tag_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/tag_spec.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
diff --git a/samples/client/petstore/ruby/spec/models/user_spec.rb b/samples/client/petstore/ruby/spec/models/user_spec.rb
index 2c289705417..a6b872e834c 100644
--- a/samples/client/petstore/ruby/spec/models/user_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/user_spec.rb
@@ -1,7 +1,7 @@
 =begin
 Swagger Petstore
 
-This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
diff --git a/samples/client/petstore/ruby/spec/pet_spec.rb b/samples/client/petstore/ruby/spec/pet_spec.rb
index fc1f3087678..b05b2163353 100644
--- a/samples/client/petstore/ruby/spec/pet_spec.rb
+++ b/samples/client/petstore/ruby/spec/pet_spec.rb
@@ -94,7 +94,9 @@ describe "Pet" do
       end
     end
 
-    it "should create and get pet with byte array (binary, string)" do
+    # skip the following as original petstore spec does not have endpoints for testing byte array
+    # we will re-enable this after updating the petstore server
+    xit "should create and get pet with byte array (binary, string)" do
       pet = @pet_api.get_pet_by_id(@pet_id)
       pet.id = @pet_id + 1
       str = serialize_json(pet)
@@ -111,7 +113,9 @@ describe "Pet" do
       @pet_api.delete_pet(pet.id)
     end
 
-    it "should get pet in bject" do
+    # skip the following as original petstore spec does not have endpoints for testing byte array
+    # we will re-enable this after updating the petstore server
+    xit "should get pet in object" do
       pet = @pet_api.get_pet_by_id_in_object(@pet_id)
       pet.should be_a(Petstore::InlineResponse200)
       pet.id.should == @pet_id
@@ -136,7 +140,7 @@ describe "Pet" do
     end
 
     it "should find pets by status" do
-      pets = @pet_api.find_pets_by_status(:status => 'available')
+      pets = @pet_api.find_pets_by_status(['available'])
       pets.length.should >= 3
       pets.each do |pet|
         pet.should be_a(Petstore::Pet)
@@ -145,12 +149,12 @@ describe "Pet" do
     end
 
     it "should not find a pet with invalid status" do
-      pets = @pet_api.find_pets_by_status(:status => 'invalid-status')
+      pets = @pet_api.find_pets_by_status(['invalid-status'])
       pets.length.should == 0
     end
 
     it "should find a pet by status" do
-      pets = @pet_api.find_pets_by_status(:status => "available,sold")
+      pets = @pet_api.find_pets_by_status(["available", "sold"])
       pets.each do |pet|
         if pet.status != 'available' && pet.status != 'sold'
           raise "pet status wasn't right"
@@ -162,7 +166,7 @@ describe "Pet" do
       id = @pet_id + 1
 
       pet = Petstore::Pet.new('id' => id, 'name' => "RUBY UNIT TESTING")
-      result = @pet_api.add_pet(:body => pet)
+      result = @pet_api.add_pet(pet)
       # nothing is returned
       result.should be_nil
 
@@ -175,13 +179,14 @@ describe "Pet" do
 
     it "should upload a file to a pet" do
       result = @pet_api.upload_file(@pet_id, file: File.new('hello.txt'))
-      # nothing is returned
-      result.should be_nil
+      # ApiResponse is returned
+      result.should be_a(Petstore::ApiResponse)
     end
 
     it "should upload a file with form parameter to a pet" do
       result = @pet_api.upload_file(@pet_id, file: File.new('hello.txt'), additional_metadata: 'metadata')
-      result.should be_nil
+      # ApiResponse is returned
+      result.should be_a(Petstore::ApiResponse)
     end
 
     it "should implement eql? and hash" do
diff --git a/samples/client/petstore/ruby/spec/spec_helper.rb b/samples/client/petstore/ruby/spec/spec_helper.rb
index 5382a3879ef..68147e76b72 100644
--- a/samples/client/petstore/ruby/spec/spec_helper.rb
+++ b/samples/client/petstore/ruby/spec/spec_helper.rb
@@ -49,7 +49,7 @@ def prepare_pet(pet_api)
   tag = Petstore::Tag.new('id' => 30002, 'name' => 'tag test')
   pet = Petstore::Pet.new('id' => pet_id, 'name' => "RUBY UNIT TESTING", 'photo_urls' => 'photo url',
                           'category' => category, 'tags' => [tag], 'status' => 'pending')
-  pet_api.add_pet(:'body'=> pet)
+  pet_api.add_pet(pet)
   return pet_id
 end
 
@@ -62,7 +62,7 @@ def prepare_store(store_api)
 		  "shipDate" => "2015-04-06T23:42:01.678Z",
 		  "status" => "placed",
 		  "complete" => false)
-  store_api.place_order(:body => order)
+  store_api.place_order(order)
   return order_id
 end
 
diff --git a/samples/client/petstore/ruby/spec/store_spec.rb b/samples/client/petstore/ruby/spec/store_spec.rb
index 67b678575d0..229a9dfd40a 100644
--- a/samples/client/petstore/ruby/spec/store_spec.rb
+++ b/samples/client/petstore/ruby/spec/store_spec.rb
@@ -24,7 +24,9 @@ describe "Store" do
     end
   end
 
-  it "should featch the inventory in object" do
+  # mark as pending since original petstore does not return object
+  # will re-enable this after updating the petstore server
+  xit "should featch the inventory in object" do
     result = @api.get_inventory_in_object
     result.should be_a(Hash)
     result.should_not be_empty
diff --git a/samples/client/petstore/scala/pom.xml b/samples/client/petstore/scala/pom.xml
index c700bebfc83..5b036cd8fc1 100644
--- a/samples/client/petstore/scala/pom.xml
+++ b/samples/client/petstore/scala/pom.xml
@@ -210,7 +210,7 @@
     <joda-version>1.2</joda-version>
     <joda-time-version>2.2</joda-time-version>
     <jersey-version>1.19</jersey-version>
-    <swagger-core-version>1.5.7</swagger-core-version>
+    <swagger-core-version>1.5.8</swagger-core-version>
     <jersey-async-version>1.0.5</jersey-async-version>
     <maven-plugin.version>1.0.0</maven-plugin.version>
     <jackson-version>2.4.2</jackson-version>
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala
index c52f7159e4c..f7e82cd1b61 100644
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala
@@ -1,7 +1,7 @@
 package io.swagger.client.api
 
 import io.swagger.client.model.Pet
-import io.swagger.client.model.InlineResponse200
+import io.swagger.client.model.ApiResponse
 import java.io.File
 import io.swagger.client.ApiInvoker
 import io.swagger.client.ApiException
@@ -23,17 +23,15 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
 
   def addHeader(key: String, value: String) = apiInvoker.defaultHeaders += key -> value 
 
-  
   /**
    * Add a new pet to the store
    * 
-   * @param body Pet object that needs to be added to the store (optional)
+   * @param body Pet object that needs to be added to the store 
    * @return void
    */
   def addPet (body: Pet)  = {
     // create path and map variables
     val path = "/pet".replaceAll("\\{format\\}","json")
-
     val contentTypes = List("application/json", "application/xml", "application/json")
     val contentType = contentTypes(0)
 
@@ -42,12 +40,10 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     val headerParams = new HashMap[String, String]
     val formParams = new HashMap[String, String]
 
-    
+    if (body == null) throw new Exception("Missing required parameter 'body' when calling PetApi->addPet")
 
+        
     
-    
-    
-
     var postBody: AnyRef = body
 
     if(contentType.startsWith("multipart/form-data")) {
@@ -56,68 +52,19 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       postBody = mp
     }
     else {
-      
     }
 
     try {
       apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
         case s: String =>
-           
-        case _ => None
+                  case _ => None
       }
     } catch {
       case ex: ApiException if ex.code == 404 => None
       case ex: ApiException => throw ex
     }
   }
-  
-  /**
-   * Fake endpoint to test byte array in body parameter for adding a new pet to the store
-   * 
-   * @param body Pet object in the form of byte array (optional)
-   * @return void
-   */
-  def addPetUsingByteArray (body: String)  = {
-    // create path and map variables
-    val path = "/pet?testing_byte_array=true".replaceAll("\\{format\\}","json")
 
-    val contentTypes = List("application/json", "application/xml", "application/json")
-    val contentType = contentTypes(0)
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-    val formParams = new HashMap[String, String]
-
-    
-
-    
-    
-    
-
-    var postBody: AnyRef = body
-
-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      
-      postBody = mp
-    }
-    else {
-      
-    }
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
-        case s: String =>
-           
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-  
   /**
    * Deletes a pet
    * 
@@ -129,7 +76,6 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     // create path and map variables
     val path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId))
 
-    
 
     val contentTypes = List("application/json")
     val contentType = contentTypes(0)
@@ -139,12 +85,8 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     val headerParams = new HashMap[String, String]
     val formParams = new HashMap[String, String]
 
-    
-
-    
-    
+        
     headerParams += "api_key" -> apiKey
-    
 
     var postBody: AnyRef = null
 
@@ -154,31 +96,28 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       postBody = mp
     }
     else {
-      
     }
 
     try {
       apiInvoker.invokeApi(basePath, path, "DELETE", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
         case s: String =>
-           
-        case _ => None
+                  case _ => None
       }
     } catch {
       case ex: ApiException if ex.code == 404 => None
       case ex: ApiException => throw ex
     }
   }
-  
+
   /**
    * Finds Pets by status
    * Multiple status values can be provided with comma separated strings
-   * @param status Status values that need to be considered for query (optional, default to available)
+   * @param status Status values that need to be considered for filter 
    * @return List[Pet]
    */
-  def findPetsByStatus (status: List[String] /* = available */) : Option[List[Pet]] = {
+  def findPetsByStatus (status: List[String]) : Option[List[Pet]] = {
     // create path and map variables
     val path = "/pet/findByStatus".replaceAll("\\{format\\}","json")
-
     val contentTypes = List("application/json")
     val contentType = contentTypes(0)
 
@@ -187,13 +126,11 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     val headerParams = new HashMap[String, String]
     val formParams = new HashMap[String, String]
 
-    
+    if (status == null) throw new Exception("Missing required parameter 'status' when calling PetApi->findPetsByStatus")
 
     if(String.valueOf(status) != "null") queryParams += "status" -> status.toString
     
     
-    
-
     var postBody: AnyRef = null
 
     if(contentType.startsWith("multipart/form-data")) {
@@ -202,14 +139,12 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       postBody = mp
     }
     else {
-      
     }
 
     try {
       apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
         case s: String =>
            Some(ApiInvoker.deserialize(s, "array", classOf[Pet]).asInstanceOf[List[Pet]])
-         
         case _ => None
       }
     } catch {
@@ -217,17 +152,16 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       case ex: ApiException => throw ex
     }
   }
-  
+
   /**
    * Finds Pets by tags
-   * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-   * @param tags Tags to filter by (optional)
+   * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+   * @param tags Tags to filter by 
    * @return List[Pet]
    */
   def findPetsByTags (tags: List[String]) : Option[List[Pet]] = {
     // create path and map variables
     val path = "/pet/findByTags".replaceAll("\\{format\\}","json")
-
     val contentTypes = List("application/json")
     val contentType = contentTypes(0)
 
@@ -236,13 +170,11 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     val headerParams = new HashMap[String, String]
     val formParams = new HashMap[String, String]
 
-    
+    if (tags == null) throw new Exception("Missing required parameter 'tags' when calling PetApi->findPetsByTags")
 
     if(String.valueOf(tags) != "null") queryParams += "tags" -> tags.toString
     
     
-    
-
     var postBody: AnyRef = null
 
     if(contentType.startsWith("multipart/form-data")) {
@@ -251,14 +183,12 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       postBody = mp
     }
     else {
-      
     }
 
     try {
       apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
         case s: String =>
            Some(ApiInvoker.deserialize(s, "array", classOf[Pet]).asInstanceOf[List[Pet]])
-         
         case _ => None
       }
     } catch {
@@ -266,18 +196,17 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       case ex: ApiException => throw ex
     }
   }
-  
+
   /**
    * Find pet by ID
-   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-   * @param petId ID of pet that needs to be fetched 
+   * Returns a single pet
+   * @param petId ID of pet to return 
    * @return Pet
    */
   def getPetById (petId: Long) : Option[Pet] = {
     // create path and map variables
     val path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId))
 
-    
 
     val contentTypes = List("application/json")
     val contentType = contentTypes(0)
@@ -287,12 +216,8 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     val headerParams = new HashMap[String, String]
     val formParams = new HashMap[String, String]
 
+        
     
-
-    
-    
-    
-
     var postBody: AnyRef = null
 
     if(contentType.startsWith("multipart/form-data")) {
@@ -301,14 +226,12 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       postBody = mp
     }
     else {
-      
     }
 
     try {
       apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
         case s: String =>
            Some(ApiInvoker.deserialize(s, "", classOf[Pet]).asInstanceOf[Pet])
-         
         case _ => None
       }
     } catch {
@@ -316,117 +239,16 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       case ex: ApiException => throw ex
     }
   }
-  
-  /**
-   * Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
-   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-   * @param petId ID of pet that needs to be fetched 
-   * @return InlineResponse200
-   */
-  def getPetByIdInObject (petId: Long) : Option[InlineResponse200] = {
-    // create path and map variables
-    val path = "/pet/{petId}?response=inline_arbitrary_object".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId))
 
-    
-
-    val contentTypes = List("application/json")
-    val contentType = contentTypes(0)
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-    val formParams = new HashMap[String, String]
-
-    
-
-    
-    
-    
-
-    var postBody: AnyRef = null
-
-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      
-      postBody = mp
-    }
-    else {
-      
-    }
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
-        case s: String =>
-           Some(ApiInvoker.deserialize(s, "", classOf[InlineResponse200]).asInstanceOf[InlineResponse200])
-         
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-  
-  /**
-   * Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
-   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-   * @param petId ID of pet that needs to be fetched 
-   * @return String
-   */
-  def petPetIdtestingByteArraytrueGet (petId: Long) : Option[String] = {
-    // create path and map variables
-    val path = "/pet/{petId}?testing_byte_array=true".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId))
-
-    
-
-    val contentTypes = List("application/json")
-    val contentType = contentTypes(0)
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-    val formParams = new HashMap[String, String]
-
-    
-
-    
-    
-    
-
-    var postBody: AnyRef = null
-
-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      
-      postBody = mp
-    }
-    else {
-      
-    }
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
-        case s: String =>
-           Some(ApiInvoker.deserialize(s, "", classOf[String]).asInstanceOf[String])
-         
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-  
   /**
    * Update an existing pet
    * 
-   * @param body Pet object that needs to be added to the store (optional)
+   * @param body Pet object that needs to be added to the store 
    * @return void
    */
   def updatePet (body: Pet)  = {
     // create path and map variables
     val path = "/pet".replaceAll("\\{format\\}","json")
-
     val contentTypes = List("application/json", "application/xml", "application/json")
     val contentType = contentTypes(0)
 
@@ -435,12 +257,10 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     val headerParams = new HashMap[String, String]
     val formParams = new HashMap[String, String]
 
-    
+    if (body == null) throw new Exception("Missing required parameter 'body' when calling PetApi->updatePet")
 
+        
     
-    
-    
-
     var postBody: AnyRef = body
 
     if(contentType.startsWith("multipart/form-data")) {
@@ -449,21 +269,19 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       postBody = mp
     }
     else {
-      
     }
 
     try {
       apiInvoker.invokeApi(basePath, path, "PUT", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
         case s: String =>
-           
-        case _ => None
+                  case _ => None
       }
     } catch {
       case ex: ApiException if ex.code == 404 => None
       case ex: ApiException => throw ex
     }
   }
-  
+
   /**
    * Updates a pet in the store with form data
    * 
@@ -472,11 +290,10 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
    * @param status Updated status of the pet (optional)
    * @return void
    */
-  def updatePetWithForm (petId: String, name: String, status: String)  = {
+  def updatePetWithForm (petId: Long, name: String, status: String)  = {
     // create path and map variables
     val path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId))
 
-    
 
     val contentTypes = List("application/x-www-form-urlencoded", "application/json")
     val contentType = contentTypes(0)
@@ -486,12 +303,8 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     val headerParams = new HashMap[String, String]
     val formParams = new HashMap[String, String]
 
+        
     
-
-    
-    
-    
-
     var postBody: AnyRef = null
 
     if(contentType.startsWith("multipart/form-data")) {
@@ -506,34 +319,31 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     else {
       formParams += "name" -> name.toString()
       formParams += "status" -> status.toString()
-      
     }
 
     try {
       apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
         case s: String =>
-           
-        case _ => None
+                  case _ => None
       }
     } catch {
       case ex: ApiException if ex.code == 404 => None
       case ex: ApiException => throw ex
     }
   }
-  
+
   /**
    * uploads an image
    * 
    * @param petId ID of pet to update 
    * @param additionalMetadata Additional data to pass to server (optional)
    * @param file file to upload (optional)
-   * @return void
+   * @return ApiResponse
    */
-  def uploadFile (petId: Long, additionalMetadata: String, file: File)  = {
+  def uploadFile (petId: Long, additionalMetadata: String, file: File) : Option[ApiResponse] = {
     // create path and map variables
     val path = "/pet/{petId}/uploadImage".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId))
 
-    
 
     val contentTypes = List("multipart/form-data", "application/json")
     val contentType = contentTypes(0)
@@ -543,12 +353,8 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     val headerParams = new HashMap[String, String]
     val formParams = new HashMap[String, String]
 
+        
     
-
-    
-    
-    
-
     var postBody: AnyRef = null
 
     if(contentType.startsWith("multipart/form-data")) {
@@ -564,13 +370,12 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     else {
       formParams += "additionalMetadata" -> additionalMetadata.toString()
       
-      
     }
 
     try {
       apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
         case s: String =>
-           
+           Some(ApiInvoker.deserialize(s, "", classOf[ApiResponse]).asInstanceOf[ApiResponse])
         case _ => None
       }
     } catch {
@@ -578,5 +383,5 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       case ex: ApiException => throw ex
     }
   }
-  
+
 }
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/StoreApi.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/StoreApi.scala
index 388c612976f..c507ad34403 100644
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/StoreApi.scala
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/StoreApi.scala
@@ -21,7 +21,6 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
 
   def addHeader(key: String, value: String) = apiInvoker.defaultHeaders += key -> value 
 
-  
   /**
    * Delete purchase order by ID
    * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
@@ -32,7 +31,6 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     // create path and map variables
     val path = "/store/order/{orderId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "orderId" + "\\}",apiInvoker.escape(orderId))
 
-    
 
     val contentTypes = List("application/json")
     val contentType = contentTypes(0)
@@ -42,12 +40,8 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     val headerParams = new HashMap[String, String]
     val formParams = new HashMap[String, String]
 
+        
     
-
-    
-    
-    
-
     var postBody: AnyRef = null
 
     if(contentType.startsWith("multipart/form-data")) {
@@ -56,70 +50,19 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       postBody = mp
     }
     else {
-      
     }
 
     try {
       apiInvoker.invokeApi(basePath, path, "DELETE", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
         case s: String =>
-           
-        case _ => None
+                  case _ => None
       }
     } catch {
       case ex: ApiException if ex.code == 404 => None
       case ex: ApiException => throw ex
     }
   }
-  
-  /**
-   * Finds orders by status
-   * A single status value can be provided as a string
-   * @param status Status value that needs to be considered for query (optional, default to placed)
-   * @return List[Order]
-   */
-  def findOrdersByStatus (status: String /* = placed */) : Option[List[Order]] = {
-    // create path and map variables
-    val path = "/store/findByStatus".replaceAll("\\{format\\}","json")
 
-    val contentTypes = List("application/json")
-    val contentType = contentTypes(0)
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-    val formParams = new HashMap[String, String]
-
-    
-
-    if(String.valueOf(status) != "null") queryParams += "status" -> status.toString
-    
-    
-    
-
-    var postBody: AnyRef = null
-
-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      
-      postBody = mp
-    }
-    else {
-      
-    }
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
-        case s: String =>
-           Some(ApiInvoker.deserialize(s, "array", classOf[Order]).asInstanceOf[List[Order]])
-         
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-  
   /**
    * Returns pet inventories by status
    * Returns a map of status codes to quantities
@@ -128,7 +71,6 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   def getInventory () : Option[Map[String, Integer]] = {
     // create path and map variables
     val path = "/store/inventory".replaceAll("\\{format\\}","json")
-
     val contentTypes = List("application/json")
     val contentType = contentTypes(0)
 
@@ -137,12 +79,8 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     val headerParams = new HashMap[String, String]
     val formParams = new HashMap[String, String]
 
+        
     
-
-    
-    
-    
-
     var postBody: AnyRef = null
 
     if(contentType.startsWith("multipart/form-data")) {
@@ -151,14 +89,12 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       postBody = mp
     }
     else {
-      
     }
 
     try {
       apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
         case s: String =>
            Some(ApiInvoker.deserialize(s, "map", classOf[Integer]).asInstanceOf[Map[String, Integer]])
-         
         case _ => None
       }
     } catch {
@@ -166,65 +102,17 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       case ex: ApiException => throw ex
     }
   }
-  
-  /**
-   * Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
-   * Returns an arbitrary object which is actually a map of status codes to quantities
-   * @return Any
-   */
-  def getInventoryInObject () : Option[Any] = {
-    // create path and map variables
-    val path = "/store/inventory?response=arbitrary_object".replaceAll("\\{format\\}","json")
 
-    val contentTypes = List("application/json")
-    val contentType = contentTypes(0)
-
-    // query params
-    val queryParams = new HashMap[String, String]
-    val headerParams = new HashMap[String, String]
-    val formParams = new HashMap[String, String]
-
-    
-
-    
-    
-    
-
-    var postBody: AnyRef = null
-
-    if(contentType.startsWith("multipart/form-data")) {
-      val mp = new FormDataMultiPart()
-      
-      postBody = mp
-    }
-    else {
-      
-    }
-
-    try {
-      apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
-        case s: String =>
-           Some(ApiInvoker.deserialize(s, "", classOf[Any]).asInstanceOf[Any])
-         
-        case _ => None
-      }
-    } catch {
-      case ex: ApiException if ex.code == 404 => None
-      case ex: ApiException => throw ex
-    }
-  }
-  
   /**
    * Find purchase order by ID
-   * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+   * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
    * @param orderId ID of pet that needs to be fetched 
    * @return Order
    */
-  def getOrderById (orderId: String) : Option[Order] = {
+  def getOrderById (orderId: Long) : Option[Order] = {
     // create path and map variables
     val path = "/store/order/{orderId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "orderId" + "\\}",apiInvoker.escape(orderId))
 
-    
 
     val contentTypes = List("application/json")
     val contentType = contentTypes(0)
@@ -234,12 +122,8 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     val headerParams = new HashMap[String, String]
     val formParams = new HashMap[String, String]
 
+        
     
-
-    
-    
-    
-
     var postBody: AnyRef = null
 
     if(contentType.startsWith("multipart/form-data")) {
@@ -248,14 +132,12 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       postBody = mp
     }
     else {
-      
     }
 
     try {
       apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
         case s: String =>
            Some(ApiInvoker.deserialize(s, "", classOf[Order]).asInstanceOf[Order])
-         
         case _ => None
       }
     } catch {
@@ -263,17 +145,16 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       case ex: ApiException => throw ex
     }
   }
-  
+
   /**
    * Place an order for a pet
    * 
-   * @param body order placed for purchasing the pet (optional)
+   * @param body order placed for purchasing the pet 
    * @return Order
    */
   def placeOrder (body: Order) : Option[Order] = {
     // create path and map variables
     val path = "/store/order".replaceAll("\\{format\\}","json")
-
     val contentTypes = List("application/json")
     val contentType = contentTypes(0)
 
@@ -282,12 +163,10 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     val headerParams = new HashMap[String, String]
     val formParams = new HashMap[String, String]
 
-    
+    if (body == null) throw new Exception("Missing required parameter 'body' when calling StoreApi->placeOrder")
 
+        
     
-    
-    
-
     var postBody: AnyRef = body
 
     if(contentType.startsWith("multipart/form-data")) {
@@ -296,14 +175,12 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       postBody = mp
     }
     else {
-      
     }
 
     try {
       apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
         case s: String =>
            Some(ApiInvoker.deserialize(s, "", classOf[Order]).asInstanceOf[Order])
-         
         case _ => None
       }
     } catch {
@@ -311,5 +188,5 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       case ex: ApiException => throw ex
     }
   }
-  
+
 }
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/UserApi.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/UserApi.scala
index e68922f3cce..010ec2da652 100644
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/UserApi.scala
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/UserApi.scala
@@ -21,17 +21,15 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
 
   def addHeader(key: String, value: String) = apiInvoker.defaultHeaders += key -> value 
 
-  
   /**
    * Create user
    * This can only be done by the logged in user.
-   * @param body Created user object (optional)
+   * @param body Created user object 
    * @return void
    */
   def createUser (body: User)  = {
     // create path and map variables
     val path = "/user".replaceAll("\\{format\\}","json")
-
     val contentTypes = List("application/json")
     val contentType = contentTypes(0)
 
@@ -40,12 +38,10 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     val headerParams = new HashMap[String, String]
     val formParams = new HashMap[String, String]
 
-    
+    if (body == null) throw new Exception("Missing required parameter 'body' when calling UserApi->createUser")
 
+        
     
-    
-    
-
     var postBody: AnyRef = body
 
     if(contentType.startsWith("multipart/form-data")) {
@@ -54,31 +50,28 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       postBody = mp
     }
     else {
-      
     }
 
     try {
       apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
         case s: String =>
-           
-        case _ => None
+                  case _ => None
       }
     } catch {
       case ex: ApiException if ex.code == 404 => None
       case ex: ApiException => throw ex
     }
   }
-  
+
   /**
    * Creates list of users with given input array
    * 
-   * @param body List of user object (optional)
+   * @param body List of user object 
    * @return void
    */
   def createUsersWithArrayInput (body: List[User])  = {
     // create path and map variables
     val path = "/user/createWithArray".replaceAll("\\{format\\}","json")
-
     val contentTypes = List("application/json")
     val contentType = contentTypes(0)
 
@@ -87,12 +80,10 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     val headerParams = new HashMap[String, String]
     val formParams = new HashMap[String, String]
 
-    
+    if (body == null) throw new Exception("Missing required parameter 'body' when calling UserApi->createUsersWithArrayInput")
 
+        
     
-    
-    
-
     var postBody: AnyRef = body
 
     if(contentType.startsWith("multipart/form-data")) {
@@ -101,31 +92,28 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       postBody = mp
     }
     else {
-      
     }
 
     try {
       apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
         case s: String =>
-           
-        case _ => None
+                  case _ => None
       }
     } catch {
       case ex: ApiException if ex.code == 404 => None
       case ex: ApiException => throw ex
     }
   }
-  
+
   /**
    * Creates list of users with given input array
    * 
-   * @param body List of user object (optional)
+   * @param body List of user object 
    * @return void
    */
   def createUsersWithListInput (body: List[User])  = {
     // create path and map variables
     val path = "/user/createWithList".replaceAll("\\{format\\}","json")
-
     val contentTypes = List("application/json")
     val contentType = contentTypes(0)
 
@@ -134,12 +122,10 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     val headerParams = new HashMap[String, String]
     val formParams = new HashMap[String, String]
 
-    
+    if (body == null) throw new Exception("Missing required parameter 'body' when calling UserApi->createUsersWithListInput")
 
+        
     
-    
-    
-
     var postBody: AnyRef = body
 
     if(contentType.startsWith("multipart/form-data")) {
@@ -148,21 +134,19 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       postBody = mp
     }
     else {
-      
     }
 
     try {
       apiInvoker.invokeApi(basePath, path, "POST", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
         case s: String =>
-           
-        case _ => None
+                  case _ => None
       }
     } catch {
       case ex: ApiException if ex.code == 404 => None
       case ex: ApiException => throw ex
     }
   }
-  
+
   /**
    * Delete user
    * This can only be done by the logged in user.
@@ -173,7 +157,6 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     // create path and map variables
     val path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}",apiInvoker.escape(username))
 
-    
 
     val contentTypes = List("application/json")
     val contentType = contentTypes(0)
@@ -183,12 +166,8 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     val headerParams = new HashMap[String, String]
     val formParams = new HashMap[String, String]
 
+        
     
-
-    
-    
-    
-
     var postBody: AnyRef = null
 
     if(contentType.startsWith("multipart/form-data")) {
@@ -197,32 +176,29 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       postBody = mp
     }
     else {
-      
     }
 
     try {
       apiInvoker.invokeApi(basePath, path, "DELETE", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
         case s: String =>
-           
-        case _ => None
+                  case _ => None
       }
     } catch {
       case ex: ApiException if ex.code == 404 => None
       case ex: ApiException => throw ex
     }
   }
-  
+
   /**
    * Get user by user name
    * 
-   * @param username The name that needs to be fetched. Use user1 for testing. 
+   * @param username The name that needs to be fetched. Use user1 for testing.  
    * @return User
    */
   def getUserByName (username: String) : Option[User] = {
     // create path and map variables
     val path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}",apiInvoker.escape(username))
 
-    
 
     val contentTypes = List("application/json")
     val contentType = contentTypes(0)
@@ -232,12 +208,8 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     val headerParams = new HashMap[String, String]
     val formParams = new HashMap[String, String]
 
+        
     
-
-    
-    
-    
-
     var postBody: AnyRef = null
 
     if(contentType.startsWith("multipart/form-data")) {
@@ -246,14 +218,12 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       postBody = mp
     }
     else {
-      
     }
 
     try {
       apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
         case s: String =>
            Some(ApiInvoker.deserialize(s, "", classOf[User]).asInstanceOf[User])
-         
         case _ => None
       }
     } catch {
@@ -261,18 +231,17 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       case ex: ApiException => throw ex
     }
   }
-  
+
   /**
    * Logs user into the system
    * 
-   * @param username The user name for login (optional)
-   * @param password The password for login in clear text (optional)
+   * @param username The user name for login 
+   * @param password The password for login in clear text 
    * @return String
    */
   def loginUser (username: String, password: String) : Option[String] = {
     // create path and map variables
     val path = "/user/login".replaceAll("\\{format\\}","json")
-
     val contentTypes = List("application/json")
     val contentType = contentTypes(0)
 
@@ -281,14 +250,10 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     val headerParams = new HashMap[String, String]
     val formParams = new HashMap[String, String]
 
-    
-
     if(String.valueOf(username) != "null") queryParams += "username" -> username.toString
-    if(String.valueOf(password) != "null") queryParams += "password" -> password.toString
+if(String.valueOf(password) != "null") queryParams += "password" -> password.toString
     
     
-    
-
     var postBody: AnyRef = null
 
     if(contentType.startsWith("multipart/form-data")) {
@@ -297,14 +262,12 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       postBody = mp
     }
     else {
-      
     }
 
     try {
       apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
         case s: String =>
            Some(ApiInvoker.deserialize(s, "", classOf[String]).asInstanceOf[String])
-         
         case _ => None
       }
     } catch {
@@ -312,7 +275,7 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       case ex: ApiException => throw ex
     }
   }
-  
+
   /**
    * Logs out current logged in user session
    * 
@@ -321,7 +284,6 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   def logoutUser ()  = {
     // create path and map variables
     val path = "/user/logout".replaceAll("\\{format\\}","json")
-
     val contentTypes = List("application/json")
     val contentType = contentTypes(0)
 
@@ -330,12 +292,8 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     val headerParams = new HashMap[String, String]
     val formParams = new HashMap[String, String]
 
+        
     
-
-    
-    
-    
-
     var postBody: AnyRef = null
 
     if(contentType.startsWith("multipart/form-data")) {
@@ -344,33 +302,30 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       postBody = mp
     }
     else {
-      
     }
 
     try {
       apiInvoker.invokeApi(basePath, path, "GET", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
         case s: String =>
-           
-        case _ => None
+                  case _ => None
       }
     } catch {
       case ex: ApiException if ex.code == 404 => None
       case ex: ApiException => throw ex
     }
   }
-  
+
   /**
    * Updated user
    * This can only be done by the logged in user.
    * @param username name that need to be deleted 
-   * @param body Updated user object (optional)
+   * @param body Updated user object 
    * @return void
    */
   def updateUser (username: String, body: User)  = {
     // create path and map variables
     val path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}",apiInvoker.escape(username))
 
-    
 
     val contentTypes = List("application/json")
     val contentType = contentTypes(0)
@@ -380,12 +335,10 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     val headerParams = new HashMap[String, String]
     val formParams = new HashMap[String, String]
 
-    
+    if (body == null) throw new Exception("Missing required parameter 'body' when calling UserApi->updateUser")
 
+        
     
-    
-    
-
     var postBody: AnyRef = body
 
     if(contentType.startsWith("multipart/form-data")) {
@@ -394,19 +347,17 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       postBody = mp
     }
     else {
-      
     }
 
     try {
       apiInvoker.invokeApi(basePath, path, "PUT", queryParams.toMap, formParams.toMap, postBody, headerParams.toMap, contentType) match {
         case s: String =>
-           
-        case _ => None
+                  case _ => None
       }
     } catch {
       case ex: ApiException if ex.code == 404 => None
       case ex: ApiException => throw ex
     }
   }
-  
+
 }
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/ApiResponse.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/ApiResponse.scala
new file mode 100644
index 00000000000..9ee64cf474e
--- /dev/null
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/ApiResponse.scala
@@ -0,0 +1,9 @@
+package io.swagger.client.model
+
+
+
+
+case class ApiResponse (
+  code: Integer,
+_type: String,
+message: String)
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Category.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Category.scala
index 122411e3ff7..f11e76cfb5a 100644
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Category.scala
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Category.scala
@@ -5,5 +5,4 @@ package io.swagger.client.model
 
 case class Category (
   id: Long,
-  name: String)
-  
+name: String)
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/InlineResponse200.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/InlineResponse200.scala
deleted file mode 100644
index e13f63eeefb..00000000000
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/InlineResponse200.scala
+++ /dev/null
@@ -1,14 +0,0 @@
-package io.swagger.client.model
-
-
-
-
-case class InlineResponse200 (
-  tags: List[Tag],
-  id: Long,
-  category: Any,
-  /* pet status in the store */
-  status: String,
-  name: String,
-  photoUrls: List[String])
-  
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Model200Response.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Model200Response.scala
deleted file mode 100644
index 68601a84e1a..00000000000
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Model200Response.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.swagger.client.model
-
-
-
-
-case class Model200Response (
-  name: Integer)
-  
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/ModelReturn.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/ModelReturn.scala
deleted file mode 100644
index e4ac8eb1ea7..00000000000
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/ModelReturn.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.swagger.client.model
-
-
-
-
-case class ModelReturn (
-  _return: Integer)
-  
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Name.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Name.scala
deleted file mode 100644
index 854a11e6088..00000000000
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Name.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.swagger.client.model
-
-
-
-
-case class Name (
-  name: Integer)
-  
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Order.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Order.scala
index 845fe32c973..105db7ea950 100644
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Order.scala
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Order.scala
@@ -6,10 +6,9 @@ import org.joda.time.DateTime
 
 case class Order (
   id: Long,
-  petId: Long,
-  quantity: Integer,
-  shipDate: DateTime,
-  /* Order Status */
+petId: Long,
+quantity: Integer,
+shipDate: DateTime,
+/* Order Status */
   status: String,
-  complete: Boolean)
-  
+complete: Boolean)
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 30dc8750976..1c3eb94ec29 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
@@ -5,10 +5,9 @@ package io.swagger.client.model
 
 case class Pet (
   id: Long,
-  category: Category,
-  name: String,
-  photoUrls: List[String],
-  tags: List[Tag],
-  /* pet status in the store */
+category: Category,
+name: String,
+photoUrls: List[String],
+tags: List[Tag],
+/* pet status in the store */
   status: String)
-  
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/SpecialModelName.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/SpecialModelName.scala
deleted file mode 100644
index 2fee09a7f7c..00000000000
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/SpecialModelName.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.swagger.client.model
-
-
-
-
-case class SpecialModelName (
-  specialPropertyName: Long)
-  
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Tag.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Tag.scala
index b0b75d4a96c..bee65208137 100644
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Tag.scala
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/Tag.scala
@@ -5,5 +5,4 @@ package io.swagger.client.model
 
 case class Tag (
   id: Long,
-  name: String)
-  
+name: String)
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/User.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/User.scala
index 125147c0ae0..51844e21142 100644
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/User.scala
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/model/User.scala
@@ -5,12 +5,11 @@ package io.swagger.client.model
 
 case class User (
   id: Long,
-  username: String,
-  firstName: String,
-  lastName: String,
-  email: String,
-  password: String,
-  phone: String,
-  /* User Status */
+username: String,
+firstName: String,
+lastName: String,
+email: String,
+password: String,
+phone: String,
+/* User Status */
   userStatus: Integer)
-  
diff --git a/samples/client/petstore/scala/src/test/scala/StoreApiTest.scala b/samples/client/petstore/scala/src/test/scala/StoreApiTest.scala
index 5a1d641c12b..b0eac1af66e 100644
--- a/samples/client/petstore/scala/src/test/scala/StoreApiTest.scala
+++ b/samples/client/petstore/scala/src/test/scala/StoreApiTest.scala
@@ -29,7 +29,7 @@ class StoreApiTest extends FlatSpec with Matchers {
 
     api.placeOrder(order)
 
-    api.getOrderById("1000") match {
+    api.getOrderById(1000) match {
       case Some(order) => {
         order.id should be(1000)
         order.petId should be(10)
@@ -53,13 +53,13 @@ class StoreApiTest extends FlatSpec with Matchers {
 
     api.placeOrder(order)
 
-    api.getOrderById("1001") match {
+    api.getOrderById(1001) match {
       case Some(order) => order.id should be(1001)
       case None => fail("didn't find order created")
     }
 
     api.deleteOrder("1001")
-    api.getOrderById("1001") match {
+    api.getOrderById(1001) match {
       case Some(order) => fail("order should have been deleted")
       case None =>
     }
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift
index a76f0352f52..1d39c7885d3 100644
--- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift
@@ -12,26 +12,24 @@ import PromiseKit
 
 public class PetAPI: APIBase {
     /**
-     
      Add a new pet to the store
      
      - parameter body: (body) Pet object that needs to be added to the store (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    public class func addPet(body body: Pet?, completion: ((error: ErrorType?) -> Void)) {
+    public class func addPet(body body: Pet? = nil, completion: ((error: ErrorType?) -> Void)) {
         addPetWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(error: error);
         }
     }
 
     /**
-     
      Add a new pet to the store
      
      - parameter body: (body) Pet object that needs to be added to the store (optional)
      - returns: Promise<Void>
      */
-    public class func addPet(body body: Pet?) -> Promise<Void> {
+    public class func addPet(body body: Pet? = nil) -> Promise<Void> {
         let deferred = Promise<Void>.pendingPromise()
         addPet(body: body) { error in
             if let error = error {
@@ -44,9 +42,7 @@ public class PetAPI: APIBase {
     }
 
     /**
-     
      Add a new pet to the store
-     
      - POST /pet
      - 
      - OAuth:
@@ -57,10 +53,9 @@ public class PetAPI: APIBase {
 
      - returns: RequestBuilder<Void> 
      */
-    public class func addPetWithRequestBuilder(body body: Pet?) -> RequestBuilder<Void> {
+    public class func addPetWithRequestBuilder(body body: Pet? = nil) -> RequestBuilder<Void> {
         let path = "/pet"
         let URLString = PetstoreClientAPI.basePath + path
-        
         let parameters = body?.encodeToJSON() as? [String:AnyObject]
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -69,26 +64,24 @@ public class PetAPI: APIBase {
     }
 
     /**
-     
      Fake endpoint to test byte array in body parameter for adding a new pet to the store
      
      - parameter body: (body) Pet object in the form of byte array (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    public class func addPetUsingByteArray(body body: String?, completion: ((error: ErrorType?) -> Void)) {
+    public class func addPetUsingByteArray(body body: String? = nil, completion: ((error: ErrorType?) -> Void)) {
         addPetUsingByteArrayWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(error: error);
         }
     }
 
     /**
-     
      Fake endpoint to test byte array in body parameter for adding a new pet to the store
      
      - parameter body: (body) Pet object in the form of byte array (optional)
      - returns: Promise<Void>
      */
-    public class func addPetUsingByteArray(body body: String?) -> Promise<Void> {
+    public class func addPetUsingByteArray(body body: String? = nil) -> Promise<Void> {
         let deferred = Promise<Void>.pendingPromise()
         addPetUsingByteArray(body: body) { error in
             if let error = error {
@@ -101,10 +94,8 @@ public class PetAPI: APIBase {
     }
 
     /**
-     
      Fake endpoint to test byte array in body parameter for adding a new pet to the store
-     
-     - POST /pet?testing_byte_array=true
+     - POST /pet?testing_byte_array&#x3D;true
      - 
      - OAuth:
        - type: oauth2
@@ -114,10 +105,9 @@ public class PetAPI: APIBase {
 
      - returns: RequestBuilder<Void> 
      */
-    public class func addPetUsingByteArrayWithRequestBuilder(body body: String?) -> RequestBuilder<Void> {
-        let path = "/pet?testing_byte_array=true"
+    public class func addPetUsingByteArrayWithRequestBuilder(body body: String? = nil) -> RequestBuilder<Void> {
+        let path = "/pet?testing_byte_array&#x3D;true"
         let URLString = PetstoreClientAPI.basePath + path
-        
         let parameters = body?.encodeToJSON() as? [String:AnyObject]
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -126,7 +116,6 @@ public class PetAPI: APIBase {
     }
 
     /**
-     
      Deletes a pet
      
      - parameter petId: (path) Pet id to delete 
@@ -139,7 +128,6 @@ public class PetAPI: APIBase {
     }
 
     /**
-     
      Deletes a pet
      
      - parameter petId: (path) Pet id to delete 
@@ -158,9 +146,7 @@ public class PetAPI: APIBase {
     }
 
     /**
-     
      Deletes a pet
-     
      - DELETE /pet/{petId}
      - 
      - OAuth:
@@ -175,7 +161,7 @@ public class PetAPI: APIBase {
         var path = "/pet/{petId}"
         path = path.stringByReplacingOccurrencesOfString("{petId}", withString: "\(petId)", options: .LiteralSearch, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        
+
         let nillableParameters: [String:AnyObject?] = [:]
         let parameters = APIHelper.rejectNil(nillableParameters)
 
@@ -185,26 +171,24 @@ public class PetAPI: APIBase {
     }
 
     /**
-     
      Finds Pets by status
      
      - parameter status: (query) Status values that need to be considered for query (optional, default to available)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    public class func findPetsByStatus(status status: [String]?, completion: ((data: [Pet]?, error: ErrorType?) -> Void)) {
+    public class func findPetsByStatus(status status: [String]? = nil, completion: ((data: [Pet]?, error: ErrorType?) -> Void)) {
         findPetsByStatusWithRequestBuilder(status: status).execute { (response, error) -> Void in
             completion(data: response?.body, error: error);
         }
     }
 
     /**
-     
      Finds Pets by status
      
      - parameter status: (query) Status values that need to be considered for query (optional, default to available)
      - returns: Promise<[Pet]>
      */
-    public class func findPetsByStatus(status status: [String]?) -> Promise<[Pet]> {
+    public class func findPetsByStatus(status status: [String]? = nil) -> Promise<[Pet]> {
         let deferred = Promise<[Pet]>.pendingPromise()
         findPetsByStatus(status: status) { data, error in
             if let error = error {
@@ -217,9 +201,7 @@ public class PetAPI: APIBase {
     }
 
     /**
-     
      Finds Pets by status
-     
      - GET /pet/findByStatus
      - Multiple status values can be provided with comma separated strings
      - OAuth:
@@ -276,10 +258,10 @@ public class PetAPI: APIBase {
 
      - returns: RequestBuilder<[Pet]> 
      */
-    public class func findPetsByStatusWithRequestBuilder(status status: [String]?) -> RequestBuilder<[Pet]> {
+    public class func findPetsByStatusWithRequestBuilder(status status: [String]? = nil) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByStatus"
         let URLString = PetstoreClientAPI.basePath + path
-        
+
         let nillableParameters: [String:AnyObject?] = [
             "status": status
         ]
@@ -291,26 +273,24 @@ public class PetAPI: APIBase {
     }
 
     /**
-     
      Finds Pets by tags
      
      - parameter tags: (query) Tags to filter by (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    public class func findPetsByTags(tags tags: [String]?, completion: ((data: [Pet]?, error: ErrorType?) -> Void)) {
+    public class func findPetsByTags(tags tags: [String]? = nil, completion: ((data: [Pet]?, error: ErrorType?) -> Void)) {
         findPetsByTagsWithRequestBuilder(tags: tags).execute { (response, error) -> Void in
             completion(data: response?.body, error: error);
         }
     }
 
     /**
-     
      Finds Pets by tags
      
      - parameter tags: (query) Tags to filter by (optional)
      - returns: Promise<[Pet]>
      */
-    public class func findPetsByTags(tags tags: [String]?) -> Promise<[Pet]> {
+    public class func findPetsByTags(tags tags: [String]? = nil) -> Promise<[Pet]> {
         let deferred = Promise<[Pet]>.pendingPromise()
         findPetsByTags(tags: tags) { data, error in
             if let error = error {
@@ -323,9 +303,7 @@ public class PetAPI: APIBase {
     }
 
     /**
-     
      Finds Pets by tags
-     
      - GET /pet/findByTags
      - Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
      - OAuth:
@@ -382,10 +360,10 @@ public class PetAPI: APIBase {
 
      - returns: RequestBuilder<[Pet]> 
      */
-    public class func findPetsByTagsWithRequestBuilder(tags tags: [String]?) -> RequestBuilder<[Pet]> {
+    public class func findPetsByTagsWithRequestBuilder(tags tags: [String]? = nil) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByTags"
         let URLString = PetstoreClientAPI.basePath + path
-        
+
         let nillableParameters: [String:AnyObject?] = [
             "tags": tags
         ]
@@ -397,7 +375,6 @@ public class PetAPI: APIBase {
     }
 
     /**
-     
      Find pet by ID
      
      - parameter petId: (path) ID of pet that needs to be fetched 
@@ -410,7 +387,6 @@ public class PetAPI: APIBase {
     }
 
     /**
-     
      Find pet by ID
      
      - parameter petId: (path) ID of pet that needs to be fetched 
@@ -429,9 +405,7 @@ public class PetAPI: APIBase {
     }
 
     /**
-     
      Find pet by ID
-     
      - GET /pet/{petId}
      - Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
      - OAuth:
@@ -495,7 +469,7 @@ public class PetAPI: APIBase {
         var path = "/pet/{petId}"
         path = path.stringByReplacingOccurrencesOfString("{petId}", withString: "\(petId)", options: .LiteralSearch, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        
+
         let nillableParameters: [String:AnyObject?] = [:]
         let parameters = APIHelper.rejectNil(nillableParameters)
 
@@ -505,7 +479,6 @@ public class PetAPI: APIBase {
     }
 
     /**
-     
      Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
      
      - parameter petId: (path) ID of pet that needs to be fetched 
@@ -518,7 +491,6 @@ public class PetAPI: APIBase {
     }
 
     /**
-     
      Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
      
      - parameter petId: (path) ID of pet that needs to be fetched 
@@ -537,10 +509,8 @@ public class PetAPI: APIBase {
     }
 
     /**
-     
      Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
-     
-     - GET /pet/{petId}?response=inline_arbitrary_object
+     - GET /pet/{petId}?response&#x3D;inline_arbitrary_object
      - Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
      - OAuth:
        - type: oauth2
@@ -588,10 +558,10 @@ public class PetAPI: APIBase {
      - returns: RequestBuilder<InlineResponse200> 
      */
     public class func getPetByIdInObjectWithRequestBuilder(petId petId: Int64) -> RequestBuilder<InlineResponse200> {
-        var path = "/pet/{petId}?response=inline_arbitrary_object"
+        var path = "/pet/{petId}?response&#x3D;inline_arbitrary_object"
         path = path.stringByReplacingOccurrencesOfString("{petId}", withString: "\(petId)", options: .LiteralSearch, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        
+
         let nillableParameters: [String:AnyObject?] = [:]
         let parameters = APIHelper.rejectNil(nillableParameters)
 
@@ -601,7 +571,6 @@ public class PetAPI: APIBase {
     }
 
     /**
-     
      Fake endpoint to test byte array return by 'Find pet by ID'
      
      - parameter petId: (path) ID of pet that needs to be fetched 
@@ -614,7 +583,6 @@ public class PetAPI: APIBase {
     }
 
     /**
-     
      Fake endpoint to test byte array return by 'Find pet by ID'
      
      - parameter petId: (path) ID of pet that needs to be fetched 
@@ -633,10 +601,8 @@ public class PetAPI: APIBase {
     }
 
     /**
-     
      Fake endpoint to test byte array return by 'Find pet by ID'
-     
-     - GET /pet/{petId}?testing_byte_array=true
+     - GET /pet/{petId}?testing_byte_array&#x3D;true
      - Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
      - OAuth:
        - type: oauth2
@@ -652,10 +618,10 @@ public class PetAPI: APIBase {
      - returns: RequestBuilder<String> 
      */
     public class func petPetIdtestingByteArraytrueGetWithRequestBuilder(petId petId: Int64) -> RequestBuilder<String> {
-        var path = "/pet/{petId}?testing_byte_array=true"
+        var path = "/pet/{petId}?testing_byte_array&#x3D;true"
         path = path.stringByReplacingOccurrencesOfString("{petId}", withString: "\(petId)", options: .LiteralSearch, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        
+
         let nillableParameters: [String:AnyObject?] = [:]
         let parameters = APIHelper.rejectNil(nillableParameters)
 
@@ -665,26 +631,24 @@ public class PetAPI: APIBase {
     }
 
     /**
-     
      Update an existing pet
      
      - parameter body: (body) Pet object that needs to be added to the store (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    public class func updatePet(body body: Pet?, completion: ((error: ErrorType?) -> Void)) {
+    public class func updatePet(body body: Pet? = nil, completion: ((error: ErrorType?) -> Void)) {
         updatePetWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(error: error);
         }
     }
 
     /**
-     
      Update an existing pet
      
      - parameter body: (body) Pet object that needs to be added to the store (optional)
      - returns: Promise<Void>
      */
-    public class func updatePet(body body: Pet?) -> Promise<Void> {
+    public class func updatePet(body body: Pet? = nil) -> Promise<Void> {
         let deferred = Promise<Void>.pendingPromise()
         updatePet(body: body) { error in
             if let error = error {
@@ -697,9 +661,7 @@ public class PetAPI: APIBase {
     }
 
     /**
-     
      Update an existing pet
-     
      - PUT /pet
      - 
      - OAuth:
@@ -710,10 +672,9 @@ public class PetAPI: APIBase {
 
      - returns: RequestBuilder<Void> 
      */
-    public class func updatePetWithRequestBuilder(body body: Pet?) -> RequestBuilder<Void> {
+    public class func updatePetWithRequestBuilder(body body: Pet? = nil) -> RequestBuilder<Void> {
         let path = "/pet"
         let URLString = PetstoreClientAPI.basePath + path
-        
         let parameters = body?.encodeToJSON() as? [String:AnyObject]
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -722,7 +683,6 @@ public class PetAPI: APIBase {
     }
 
     /**
-     
      Updates a pet in the store with form data
      
      - parameter petId: (path) ID of pet that needs to be updated 
@@ -730,14 +690,13 @@ public class PetAPI: APIBase {
      - parameter status: (form) Updated status of the pet (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    public class func updatePetWithForm(petId petId: String, name: String?, status: String?, completion: ((error: ErrorType?) -> Void)) {
+    public class func updatePetWithForm(petId petId: String, name: String? = nil, status: String? = nil, completion: ((error: ErrorType?) -> Void)) {
         updatePetWithFormWithRequestBuilder(petId: petId, name: name, status: status).execute { (response, error) -> Void in
             completion(error: error);
         }
     }
 
     /**
-     
      Updates a pet in the store with form data
      
      - parameter petId: (path) ID of pet that needs to be updated 
@@ -745,7 +704,7 @@ public class PetAPI: APIBase {
      - parameter status: (form) Updated status of the pet (optional)
      - returns: Promise<Void>
      */
-    public class func updatePetWithForm(petId petId: String, name: String?, status: String?) -> Promise<Void> {
+    public class func updatePetWithForm(petId petId: String, name: String? = nil, status: String? = nil) -> Promise<Void> {
         let deferred = Promise<Void>.pendingPromise()
         updatePetWithForm(petId: petId, name: name, status: status) { error in
             if let error = error {
@@ -758,9 +717,7 @@ public class PetAPI: APIBase {
     }
 
     /**
-     
      Updates a pet in the store with form data
-     
      - POST /pet/{petId}
      - 
      - OAuth:
@@ -773,11 +730,11 @@ public class PetAPI: APIBase {
 
      - returns: RequestBuilder<Void> 
      */
-    public class func updatePetWithFormWithRequestBuilder(petId petId: String, name: String?, status: String?) -> RequestBuilder<Void> {
+    public class func updatePetWithFormWithRequestBuilder(petId petId: String, name: String? = nil, status: String? = nil) -> RequestBuilder<Void> {
         var path = "/pet/{petId}"
         path = path.stringByReplacingOccurrencesOfString("{petId}", withString: "\(petId)", options: .LiteralSearch, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        
+
         let nillableParameters: [String:AnyObject?] = [
             "name": name,
             "status": status
@@ -790,7 +747,6 @@ public class PetAPI: APIBase {
     }
 
     /**
-     
      uploads an image
      
      - parameter petId: (path) ID of pet to update 
@@ -798,14 +754,13 @@ public class PetAPI: APIBase {
      - parameter _file: (form) file to upload (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    public class func uploadFile(petId petId: Int64, additionalMetadata: String?, _file: NSURL?, completion: ((error: ErrorType?) -> Void)) {
+    public class func uploadFile(petId petId: Int64, additionalMetadata: String? = nil, _file: NSURL? = nil, completion: ((error: ErrorType?) -> Void)) {
         uploadFileWithRequestBuilder(petId: petId, additionalMetadata: additionalMetadata, _file: _file).execute { (response, error) -> Void in
             completion(error: error);
         }
     }
 
     /**
-     
      uploads an image
      
      - parameter petId: (path) ID of pet to update 
@@ -813,7 +768,7 @@ public class PetAPI: APIBase {
      - parameter _file: (form) file to upload (optional)
      - returns: Promise<Void>
      */
-    public class func uploadFile(petId petId: Int64, additionalMetadata: String?, _file: NSURL?) -> Promise<Void> {
+    public class func uploadFile(petId petId: Int64, additionalMetadata: String? = nil, _file: NSURL? = nil) -> Promise<Void> {
         let deferred = Promise<Void>.pendingPromise()
         uploadFile(petId: petId, additionalMetadata: additionalMetadata, _file: _file) { error in
             if let error = error {
@@ -826,9 +781,7 @@ public class PetAPI: APIBase {
     }
 
     /**
-     
      uploads an image
-     
      - POST /pet/{petId}/uploadImage
      - 
      - OAuth:
@@ -841,11 +794,11 @@ public class PetAPI: APIBase {
 
      - returns: RequestBuilder<Void> 
      */
-    public class func uploadFileWithRequestBuilder(petId petId: Int64, additionalMetadata: String?, _file: NSURL?) -> RequestBuilder<Void> {
+    public class func uploadFileWithRequestBuilder(petId petId: Int64, additionalMetadata: String? = nil, _file: NSURL? = nil) -> RequestBuilder<Void> {
         var path = "/pet/{petId}/uploadImage"
         path = path.stringByReplacingOccurrencesOfString("{petId}", withString: "\(petId)", options: .LiteralSearch, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        
+
         let nillableParameters: [String:AnyObject?] = [
             "additionalMetadata": additionalMetadata,
             "file": _file
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
index 82d8ff179e5..f4f0cea288b 100644
--- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
@@ -12,7 +12,6 @@ import PromiseKit
 
 public class StoreAPI: APIBase {
     /**
-     
      Delete purchase order by ID
      
      - parameter orderId: (path) ID of the order that needs to be deleted 
@@ -25,7 +24,6 @@ public class StoreAPI: APIBase {
     }
 
     /**
-     
      Delete purchase order by ID
      
      - parameter orderId: (path) ID of the order that needs to be deleted 
@@ -44,9 +42,7 @@ public class StoreAPI: APIBase {
     }
 
     /**
-     
      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
      
@@ -58,7 +54,7 @@ public class StoreAPI: APIBase {
         var path = "/store/order/{orderId}"
         path = path.stringByReplacingOccurrencesOfString("{orderId}", withString: "\(orderId)", options: .LiteralSearch, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        
+
         let nillableParameters: [String:AnyObject?] = [:]
         let parameters = APIHelper.rejectNil(nillableParameters)
 
@@ -68,26 +64,24 @@ public class StoreAPI: APIBase {
     }
 
     /**
-     
      Finds orders by status
      
      - parameter status: (query) Status value that needs to be considered for query (optional, default to placed)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    public class func findOrdersByStatus(status status: String?, completion: ((data: [Order]?, error: ErrorType?) -> Void)) {
+    public class func findOrdersByStatus(status status: String? = nil, completion: ((data: [Order]?, error: ErrorType?) -> Void)) {
         findOrdersByStatusWithRequestBuilder(status: status).execute { (response, error) -> Void in
             completion(data: response?.body, error: error);
         }
     }
 
     /**
-     
      Finds orders by status
      
      - parameter status: (query) Status value that needs to be considered for query (optional, default to placed)
      - returns: Promise<[Order]>
      */
-    public class func findOrdersByStatus(status status: String?) -> Promise<[Order]> {
+    public class func findOrdersByStatus(status status: String? = nil) -> Promise<[Order]> {
         let deferred = Promise<[Order]>.pendingPromise()
         findOrdersByStatus(status: status) { data, error in
             if let error = error {
@@ -100,9 +94,7 @@ public class StoreAPI: APIBase {
     }
 
     /**
-     
      Finds orders by status
-     
      - GET /store/findByStatus
      - A single status value can be provided as a string
      - API Key:
@@ -146,10 +138,10 @@ public class StoreAPI: APIBase {
 
      - returns: RequestBuilder<[Order]> 
      */
-    public class func findOrdersByStatusWithRequestBuilder(status status: String?) -> RequestBuilder<[Order]> {
+    public class func findOrdersByStatusWithRequestBuilder(status status: String? = nil) -> RequestBuilder<[Order]> {
         let path = "/store/findByStatus"
         let URLString = PetstoreClientAPI.basePath + path
-        
+
         let nillableParameters: [String:AnyObject?] = [
             "status": status
         ]
@@ -161,7 +153,6 @@ public class StoreAPI: APIBase {
     }
 
     /**
-     
      Returns pet inventories by status
      
      - parameter completion: completion handler to receive the data and the error objects
@@ -173,7 +164,6 @@ public class StoreAPI: APIBase {
     }
 
     /**
-     
      Returns pet inventories by status
      
      - returns: Promise<[String:Int32]>
@@ -191,9 +181,7 @@ public class StoreAPI: APIBase {
     }
 
     /**
-     
      Returns pet inventories by status
-     
      - GET /store/inventory
      - Returns a map of status codes to quantities
      - API Key:
@@ -211,7 +199,7 @@ public class StoreAPI: APIBase {
     public class func getInventoryWithRequestBuilder() -> RequestBuilder<[String:Int32]> {
         let path = "/store/inventory"
         let URLString = PetstoreClientAPI.basePath + path
-        
+
         let nillableParameters: [String:AnyObject?] = [:]
         let parameters = APIHelper.rejectNil(nillableParameters)
 
@@ -221,7 +209,6 @@ public class StoreAPI: APIBase {
     }
 
     /**
-     
      Fake endpoint to test arbitrary object return by 'Get inventory'
      
      - parameter completion: completion handler to receive the data and the error objects
@@ -233,7 +220,6 @@ public class StoreAPI: APIBase {
     }
 
     /**
-     
      Fake endpoint to test arbitrary object return by 'Get inventory'
      
      - returns: Promise<AnyObject>
@@ -251,10 +237,8 @@ public class StoreAPI: APIBase {
     }
 
     /**
-     
      Fake endpoint to test arbitrary object return by 'Get inventory'
-     
-     - GET /store/inventory?response=arbitrary_object
+     - GET /store/inventory?response&#x3D;arbitrary_object
      - Returns an arbitrary object which is actually a map of status codes to quantities
      - API Key:
        - type: apiKey api_key 
@@ -265,9 +249,9 @@ public class StoreAPI: APIBase {
      - returns: RequestBuilder<AnyObject> 
      */
     public class func getInventoryInObjectWithRequestBuilder() -> RequestBuilder<AnyObject> {
-        let path = "/store/inventory?response=arbitrary_object"
+        let path = "/store/inventory?response&#x3D;arbitrary_object"
         let URLString = PetstoreClientAPI.basePath + path
-        
+
         let nillableParameters: [String:AnyObject?] = [:]
         let parameters = APIHelper.rejectNil(nillableParameters)
 
@@ -277,7 +261,6 @@ public class StoreAPI: APIBase {
     }
 
     /**
-     
      Find purchase order by ID
      
      - parameter orderId: (path) ID of pet that needs to be fetched 
@@ -290,7 +273,6 @@ public class StoreAPI: APIBase {
     }
 
     /**
-     
      Find purchase order by ID
      
      - parameter orderId: (path) ID of pet that needs to be fetched 
@@ -309,9 +291,7 @@ public class StoreAPI: APIBase {
     }
 
     /**
-     
      Find purchase order by ID
-     
      - GET /store/order/{orderId}
      - For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
      - API Key:
@@ -359,7 +339,7 @@ public class StoreAPI: APIBase {
         var path = "/store/order/{orderId}"
         path = path.stringByReplacingOccurrencesOfString("{orderId}", withString: "\(orderId)", options: .LiteralSearch, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        
+
         let nillableParameters: [String:AnyObject?] = [:]
         let parameters = APIHelper.rejectNil(nillableParameters)
 
@@ -369,26 +349,24 @@ public class StoreAPI: APIBase {
     }
 
     /**
-     
      Place an order for a pet
      
      - parameter body: (body) order placed for purchasing the pet (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    public class func placeOrder(body body: Order?, completion: ((data: Order?, error: ErrorType?) -> Void)) {
+    public class func placeOrder(body body: Order? = nil, completion: ((data: Order?, error: ErrorType?) -> Void)) {
         placeOrderWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(data: response?.body, error: error);
         }
     }
 
     /**
-     
      Place an order for a pet
      
      - parameter body: (body) order placed for purchasing the pet (optional)
      - returns: Promise<Order>
      */
-    public class func placeOrder(body body: Order?) -> Promise<Order> {
+    public class func placeOrder(body body: Order? = nil) -> Promise<Order> {
         let deferred = Promise<Order>.pendingPromise()
         placeOrder(body: body) { data, error in
             if let error = error {
@@ -401,9 +379,7 @@ public class StoreAPI: APIBase {
     }
 
     /**
-     
      Place an order for a pet
-     
      - POST /store/order
      - 
      - API Key:
@@ -447,10 +423,9 @@ public class StoreAPI: APIBase {
 
      - returns: RequestBuilder<Order> 
      */
-    public class func placeOrderWithRequestBuilder(body body: Order?) -> RequestBuilder<Order> {
+    public class func placeOrderWithRequestBuilder(body body: Order? = nil) -> RequestBuilder<Order> {
         let path = "/store/order"
         let URLString = PetstoreClientAPI.basePath + path
-        
         let parameters = body?.encodeToJSON() as? [String:AnyObject]
 
         let requestBuilder: RequestBuilder<Order>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
index ec73c765ac1..6a522eb8813 100644
--- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
@@ -12,26 +12,24 @@ import PromiseKit
 
 public class UserAPI: APIBase {
     /**
-     
      Create user
      
      - parameter body: (body) Created user object (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    public class func createUser(body body: User?, completion: ((error: ErrorType?) -> Void)) {
+    public class func createUser(body body: User? = nil, completion: ((error: ErrorType?) -> Void)) {
         createUserWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(error: error);
         }
     }
 
     /**
-     
      Create user
      
      - parameter body: (body) Created user object (optional)
      - returns: Promise<Void>
      */
-    public class func createUser(body body: User?) -> Promise<Void> {
+    public class func createUser(body body: User? = nil) -> Promise<Void> {
         let deferred = Promise<Void>.pendingPromise()
         createUser(body: body) { error in
             if let error = error {
@@ -44,9 +42,7 @@ public class UserAPI: APIBase {
     }
 
     /**
-     
      Create user
-     
      - POST /user
      - This can only be done by the logged in user.
      
@@ -54,10 +50,9 @@ public class UserAPI: APIBase {
 
      - returns: RequestBuilder<Void> 
      */
-    public class func createUserWithRequestBuilder(body body: User?) -> RequestBuilder<Void> {
+    public class func createUserWithRequestBuilder(body body: User? = nil) -> RequestBuilder<Void> {
         let path = "/user"
         let URLString = PetstoreClientAPI.basePath + path
-        
         let parameters = body?.encodeToJSON() as? [String:AnyObject]
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -66,26 +61,24 @@ public class UserAPI: APIBase {
     }
 
     /**
-     
      Creates list of users with given input array
      
      - parameter body: (body) List of user object (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    public class func createUsersWithArrayInput(body body: [User]?, completion: ((error: ErrorType?) -> Void)) {
+    public class func createUsersWithArrayInput(body body: [User]? = nil, completion: ((error: ErrorType?) -> Void)) {
         createUsersWithArrayInputWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(error: error);
         }
     }
 
     /**
-     
      Creates list of users with given input array
      
      - parameter body: (body) List of user object (optional)
      - returns: Promise<Void>
      */
-    public class func createUsersWithArrayInput(body body: [User]?) -> Promise<Void> {
+    public class func createUsersWithArrayInput(body body: [User]? = nil) -> Promise<Void> {
         let deferred = Promise<Void>.pendingPromise()
         createUsersWithArrayInput(body: body) { error in
             if let error = error {
@@ -98,9 +91,7 @@ public class UserAPI: APIBase {
     }
 
     /**
-     
      Creates list of users with given input array
-     
      - POST /user/createWithArray
      - 
      
@@ -108,10 +99,9 @@ public class UserAPI: APIBase {
 
      - returns: RequestBuilder<Void> 
      */
-    public class func createUsersWithArrayInputWithRequestBuilder(body body: [User]?) -> RequestBuilder<Void> {
+    public class func createUsersWithArrayInputWithRequestBuilder(body body: [User]? = nil) -> RequestBuilder<Void> {
         let path = "/user/createWithArray"
         let URLString = PetstoreClientAPI.basePath + path
-        
         let parameters = body?.encodeToJSON() as? [String:AnyObject]
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -120,26 +110,24 @@ public class UserAPI: APIBase {
     }
 
     /**
-     
      Creates list of users with given input array
      
      - parameter body: (body) List of user object (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    public class func createUsersWithListInput(body body: [User]?, completion: ((error: ErrorType?) -> Void)) {
+    public class func createUsersWithListInput(body body: [User]? = nil, completion: ((error: ErrorType?) -> Void)) {
         createUsersWithListInputWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(error: error);
         }
     }
 
     /**
-     
      Creates list of users with given input array
      
      - parameter body: (body) List of user object (optional)
      - returns: Promise<Void>
      */
-    public class func createUsersWithListInput(body body: [User]?) -> Promise<Void> {
+    public class func createUsersWithListInput(body body: [User]? = nil) -> Promise<Void> {
         let deferred = Promise<Void>.pendingPromise()
         createUsersWithListInput(body: body) { error in
             if let error = error {
@@ -152,9 +140,7 @@ public class UserAPI: APIBase {
     }
 
     /**
-     
      Creates list of users with given input array
-     
      - POST /user/createWithList
      - 
      
@@ -162,10 +148,9 @@ public class UserAPI: APIBase {
 
      - returns: RequestBuilder<Void> 
      */
-    public class func createUsersWithListInputWithRequestBuilder(body body: [User]?) -> RequestBuilder<Void> {
+    public class func createUsersWithListInputWithRequestBuilder(body body: [User]? = nil) -> RequestBuilder<Void> {
         let path = "/user/createWithList"
         let URLString = PetstoreClientAPI.basePath + path
-        
         let parameters = body?.encodeToJSON() as? [String:AnyObject]
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -174,7 +159,6 @@ public class UserAPI: APIBase {
     }
 
     /**
-     
      Delete user
      
      - parameter username: (path) The name that needs to be deleted 
@@ -187,7 +171,6 @@ public class UserAPI: APIBase {
     }
 
     /**
-     
      Delete user
      
      - parameter username: (path) The name that needs to be deleted 
@@ -206,9 +189,7 @@ public class UserAPI: APIBase {
     }
 
     /**
-     
      Delete user
-     
      - DELETE /user/{username}
      - This can only be done by the logged in user.
      - BASIC:
@@ -223,7 +204,7 @@ public class UserAPI: APIBase {
         var path = "/user/{username}"
         path = path.stringByReplacingOccurrencesOfString("{username}", withString: "\(username)", options: .LiteralSearch, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        
+
         let nillableParameters: [String:AnyObject?] = [:]
         let parameters = APIHelper.rejectNil(nillableParameters)
 
@@ -233,10 +214,9 @@ public class UserAPI: APIBase {
     }
 
     /**
-     
      Get user by user name
      
-     - parameter username: (path) The name that needs to be fetched. Use user1 for testing. 
+     - parameter username: (path) The name that needs to be fetched. Use user1 for testing.  
      - parameter completion: completion handler to receive the data and the error objects
      */
     public class func getUserByName(username username: String, completion: ((data: User?, error: ErrorType?) -> Void)) {
@@ -246,10 +226,9 @@ public class UserAPI: APIBase {
     }
 
     /**
-     
      Get user by user name
      
-     - parameter username: (path) The name that needs to be fetched. Use user1 for testing. 
+     - parameter username: (path) The name that needs to be fetched. Use user1 for testing.  
      - returns: Promise<User>
      */
     public class func getUserByName(username username: String) -> Promise<User> {
@@ -265,9 +244,7 @@ public class UserAPI: APIBase {
     }
 
     /**
-     
      Get user by user name
-     
      - GET /user/{username}
      - 
      - examples: [{contentType=application/json, example={
@@ -281,7 +258,7 @@ public class UserAPI: APIBase {
   "userStatus" : 0
 }}]
      
-     - parameter username: (path) The name that needs to be fetched. Use user1 for testing. 
+     - parameter username: (path) The name that needs to be fetched. Use user1 for testing.  
 
      - returns: RequestBuilder<User> 
      */
@@ -289,7 +266,7 @@ public class UserAPI: APIBase {
         var path = "/user/{username}"
         path = path.stringByReplacingOccurrencesOfString("{username}", withString: "\(username)", options: .LiteralSearch, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        
+
         let nillableParameters: [String:AnyObject?] = [:]
         let parameters = APIHelper.rejectNil(nillableParameters)
 
@@ -299,28 +276,26 @@ public class UserAPI: APIBase {
     }
 
     /**
-     
      Logs user into the system
      
      - parameter username: (query) The user name for login (optional)
      - parameter password: (query) The password for login in clear text (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    public class func loginUser(username username: String?, password: String?, completion: ((data: String?, error: ErrorType?) -> Void)) {
+    public class func loginUser(username username: String? = nil, password: String? = nil, completion: ((data: String?, error: ErrorType?) -> Void)) {
         loginUserWithRequestBuilder(username: username, password: password).execute { (response, error) -> Void in
             completion(data: response?.body, error: error);
         }
     }
 
     /**
-     
      Logs user into the system
      
      - parameter username: (query) The user name for login (optional)
      - parameter password: (query) The password for login in clear text (optional)
      - returns: Promise<String>
      */
-    public class func loginUser(username username: String?, password: String?) -> Promise<String> {
+    public class func loginUser(username username: String? = nil, password: String? = nil) -> Promise<String> {
         let deferred = Promise<String>.pendingPromise()
         loginUser(username: username, password: password) { data, error in
             if let error = error {
@@ -333,9 +308,7 @@ public class UserAPI: APIBase {
     }
 
     /**
-     
      Logs user into the system
-     
      - GET /user/login
      - 
      - examples: [{contentType=application/json, example="aeiou"}, {contentType=application/xml, example=string}]
@@ -346,10 +319,10 @@ public class UserAPI: APIBase {
 
      - returns: RequestBuilder<String> 
      */
-    public class func loginUserWithRequestBuilder(username username: String?, password: String?) -> RequestBuilder<String> {
+    public class func loginUserWithRequestBuilder(username username: String? = nil, password: String? = nil) -> RequestBuilder<String> {
         let path = "/user/login"
         let URLString = PetstoreClientAPI.basePath + path
-        
+
         let nillableParameters: [String:AnyObject?] = [
             "username": username,
             "password": password
@@ -362,7 +335,6 @@ public class UserAPI: APIBase {
     }
 
     /**
-     
      Logs out current logged in user session
      
      - parameter completion: completion handler to receive the data and the error objects
@@ -374,7 +346,6 @@ public class UserAPI: APIBase {
     }
 
     /**
-     
      Logs out current logged in user session
      
      - returns: Promise<Void>
@@ -392,9 +363,7 @@ public class UserAPI: APIBase {
     }
 
     /**
-     
      Logs out current logged in user session
-     
      - GET /user/logout
      - 
 
@@ -403,7 +372,7 @@ public class UserAPI: APIBase {
     public class func logoutUserWithRequestBuilder() -> RequestBuilder<Void> {
         let path = "/user/logout"
         let URLString = PetstoreClientAPI.basePath + path
-        
+
         let nillableParameters: [String:AnyObject?] = [:]
         let parameters = APIHelper.rejectNil(nillableParameters)
 
@@ -413,28 +382,26 @@ public class UserAPI: APIBase {
     }
 
     /**
-     
      Updated user
      
      - parameter username: (path) name that need to be deleted 
      - parameter body: (body) Updated user object (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    public class func updateUser(username username: String, body: User?, completion: ((error: ErrorType?) -> Void)) {
+    public class func updateUser(username username: String, body: User? = nil, completion: ((error: ErrorType?) -> Void)) {
         updateUserWithRequestBuilder(username: username, body: body).execute { (response, error) -> Void in
             completion(error: error);
         }
     }
 
     /**
-     
      Updated user
      
      - parameter username: (path) name that need to be deleted 
      - parameter body: (body) Updated user object (optional)
      - returns: Promise<Void>
      */
-    public class func updateUser(username username: String, body: User?) -> Promise<Void> {
+    public class func updateUser(username username: String, body: User? = nil) -> Promise<Void> {
         let deferred = Promise<Void>.pendingPromise()
         updateUser(username: username, body: body) { error in
             if let error = error {
@@ -447,9 +414,7 @@ public class UserAPI: APIBase {
     }
 
     /**
-     
      Updated user
-     
      - PUT /user/{username}
      - This can only be done by the logged in user.
      
@@ -458,11 +423,10 @@ public class UserAPI: APIBase {
 
      - returns: RequestBuilder<Void> 
      */
-    public class func updateUserWithRequestBuilder(username username: String, body: User?) -> RequestBuilder<Void> {
+    public class func updateUserWithRequestBuilder(username username: String, body: User? = nil) -> RequestBuilder<Void> {
         var path = "/user/{username}"
         path = path.stringByReplacingOccurrencesOfString("{username}", withString: "\(username)", options: .LiteralSearch, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        
         let parameters = body?.encodeToJSON() as? [String:AnyObject]
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models.swift
index 329eb295157..3d3710ea223 100644
--- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models.swift
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models.swift
@@ -130,11 +130,38 @@ class Decoders {
                 fatalError("formatter failed to parse \(source)")
             } 
 
-			// Decoder for [Category]
+            // Decoder for [Animal]
+            Decoders.addDecoder(clazz: [Animal].self) { (source: AnyObject) -> [Animal] in
+                return Decoders.decode(clazz: [Animal].self, source: source)
+            }
+            // Decoder for Animal
+            Decoders.addDecoder(clazz: Animal.self) { (source: AnyObject) -> Animal in
+                let sourceDictionary = source as! [NSObject:AnyObject]
+                let instance = Animal()
+                instance.className = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["className"])
+                return instance
+            }
+
+
+            // Decoder for [Cat]
+            Decoders.addDecoder(clazz: [Cat].self) { (source: AnyObject) -> [Cat] in
+                return Decoders.decode(clazz: [Cat].self, source: source)
+            }
+            // Decoder for Cat
+            Decoders.addDecoder(clazz: Cat.self) { (source: AnyObject) -> Cat in
+                let sourceDictionary = source as! [NSObject:AnyObject]
+                let instance = Cat()
+                instance.className = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["className"])
+                instance.declawed = Decoders.decodeOptional(clazz: Bool.self, source: sourceDictionary["declawed"])
+                return instance
+            }
+
+
+            // Decoder for [Category]
             Decoders.addDecoder(clazz: [Category].self) { (source: AnyObject) -> [Category] in
                 return Decoders.decode(clazz: [Category].self, source: source)
             }
-			// Decoder for Category
+            // Decoder for Category
             Decoders.addDecoder(clazz: Category.self) { (source: AnyObject) -> Category in
                 let sourceDictionary = source as! [NSObject:AnyObject]
                 let instance = Category()
@@ -142,13 +169,51 @@ class Decoders {
                 instance.name = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["name"])
                 return instance
             }
-			
 
-			// Decoder for [InlineResponse200]
+
+            // Decoder for [Dog]
+            Decoders.addDecoder(clazz: [Dog].self) { (source: AnyObject) -> [Dog] in
+                return Decoders.decode(clazz: [Dog].self, source: source)
+            }
+            // Decoder for Dog
+            Decoders.addDecoder(clazz: Dog.self) { (source: AnyObject) -> Dog in
+                let sourceDictionary = source as! [NSObject:AnyObject]
+                let instance = Dog()
+                instance.className = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["className"])
+                instance.breed = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["breed"])
+                return instance
+            }
+
+
+            // Decoder for [FormatTest]
+            Decoders.addDecoder(clazz: [FormatTest].self) { (source: AnyObject) -> [FormatTest] in
+                return Decoders.decode(clazz: [FormatTest].self, source: source)
+            }
+            // Decoder for FormatTest
+            Decoders.addDecoder(clazz: FormatTest.self) { (source: AnyObject) -> FormatTest in
+                let sourceDictionary = source as! [NSObject:AnyObject]
+                let instance = FormatTest()
+                instance.integer = Decoders.decodeOptional(clazz: Int32.self, source: sourceDictionary["integer"])
+                instance._int32 = Decoders.decodeOptional(clazz: Int32.self, source: sourceDictionary["int32"])
+                instance._int64 = Decoders.decodeOptional(clazz: Int64.self, source: sourceDictionary["int64"])
+                instance.number = Decoders.decodeOptional(clazz: Double.self, source: sourceDictionary["number"])
+                instance._float = Decoders.decodeOptional(clazz: Float.self, source: sourceDictionary["float"])
+                instance._double = Decoders.decodeOptional(clazz: Double.self, source: sourceDictionary["double"])
+                instance._string = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["string"])
+                instance.byte = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["byte"])
+                instance.binary = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["binary"])
+                instance.date = Decoders.decodeOptional(clazz: NSDate.self, source: sourceDictionary["date"])
+                instance.dateTime = Decoders.decodeOptional(clazz: NSDate.self, source: sourceDictionary["dateTime"])
+                instance.password = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["password"])
+                return instance
+            }
+
+
+            // Decoder for [InlineResponse200]
             Decoders.addDecoder(clazz: [InlineResponse200].self) { (source: AnyObject) -> [InlineResponse200] in
                 return Decoders.decode(clazz: [InlineResponse200].self, source: source)
             }
-			// Decoder for InlineResponse200
+            // Decoder for InlineResponse200
             Decoders.addDecoder(clazz: InlineResponse200.self) { (source: AnyObject) -> InlineResponse200 in
                 let sourceDictionary = source as! [NSObject:AnyObject]
                 let instance = InlineResponse200()
@@ -160,39 +225,39 @@ class Decoders {
                 instance.status = InlineResponse200.Status(rawValue: (sourceDictionary["status"] as? String) ?? "") 
                 return instance
             }
-			
 
-			// Decoder for [Model200Response]
+
+            // Decoder for [Model200Response]
             Decoders.addDecoder(clazz: [Model200Response].self) { (source: AnyObject) -> [Model200Response] in
                 return Decoders.decode(clazz: [Model200Response].self, source: source)
             }
-			// Decoder for Model200Response
+            // Decoder for Model200Response
             Decoders.addDecoder(clazz: Model200Response.self) { (source: AnyObject) -> Model200Response in
                 let sourceDictionary = source as! [NSObject:AnyObject]
                 let instance = Model200Response()
                 instance.name = Decoders.decodeOptional(clazz: Int32.self, source: sourceDictionary["name"])
                 return instance
             }
-			
 
-			// Decoder for [ModelReturn]
+
+            // Decoder for [ModelReturn]
             Decoders.addDecoder(clazz: [ModelReturn].self) { (source: AnyObject) -> [ModelReturn] in
                 return Decoders.decode(clazz: [ModelReturn].self, source: source)
             }
-			// Decoder for ModelReturn
+            // Decoder for ModelReturn
             Decoders.addDecoder(clazz: ModelReturn.self) { (source: AnyObject) -> ModelReturn in
                 let sourceDictionary = source as! [NSObject:AnyObject]
                 let instance = ModelReturn()
                 instance._return = Decoders.decodeOptional(clazz: Int32.self, source: sourceDictionary["return"])
                 return instance
             }
-			
 
-			// Decoder for [Name]
+
+            // Decoder for [Name]
             Decoders.addDecoder(clazz: [Name].self) { (source: AnyObject) -> [Name] in
                 return Decoders.decode(clazz: [Name].self, source: source)
             }
-			// Decoder for Name
+            // Decoder for Name
             Decoders.addDecoder(clazz: Name.self) { (source: AnyObject) -> Name in
                 let sourceDictionary = source as! [NSObject:AnyObject]
                 let instance = Name()
@@ -200,13 +265,13 @@ class Decoders {
                 instance.snakeCase = Decoders.decodeOptional(clazz: Int32.self, source: sourceDictionary["snake_case"])
                 return instance
             }
-			
 
-			// Decoder for [Order]
+
+            // Decoder for [Order]
             Decoders.addDecoder(clazz: [Order].self) { (source: AnyObject) -> [Order] in
                 return Decoders.decode(clazz: [Order].self, source: source)
             }
-			// Decoder for Order
+            // Decoder for Order
             Decoders.addDecoder(clazz: Order.self) { (source: AnyObject) -> Order in
                 let sourceDictionary = source as! [NSObject:AnyObject]
                 let instance = Order()
@@ -218,13 +283,13 @@ class Decoders {
                 instance.complete = Decoders.decodeOptional(clazz: Bool.self, source: sourceDictionary["complete"])
                 return instance
             }
-			
 
-			// Decoder for [Pet]
+
+            // Decoder for [Pet]
             Decoders.addDecoder(clazz: [Pet].self) { (source: AnyObject) -> [Pet] in
                 return Decoders.decode(clazz: [Pet].self, source: source)
             }
-			// Decoder for Pet
+            // Decoder for Pet
             Decoders.addDecoder(clazz: Pet.self) { (source: AnyObject) -> Pet in
                 let sourceDictionary = source as! [NSObject:AnyObject]
                 let instance = Pet()
@@ -236,26 +301,26 @@ class Decoders {
                 instance.status = Pet.Status(rawValue: (sourceDictionary["status"] as? String) ?? "") 
                 return instance
             }
-			
 
-			// Decoder for [SpecialModelName]
+
+            // Decoder for [SpecialModelName]
             Decoders.addDecoder(clazz: [SpecialModelName].self) { (source: AnyObject) -> [SpecialModelName] in
                 return Decoders.decode(clazz: [SpecialModelName].self, source: source)
             }
-			// Decoder for SpecialModelName
+            // Decoder for SpecialModelName
             Decoders.addDecoder(clazz: SpecialModelName.self) { (source: AnyObject) -> SpecialModelName in
                 let sourceDictionary = source as! [NSObject:AnyObject]
                 let instance = SpecialModelName()
                 instance.specialPropertyName = Decoders.decodeOptional(clazz: Int64.self, source: sourceDictionary["$special[property.name]"])
                 return instance
             }
-			
 
-			// Decoder for [Tag]
+
+            // Decoder for [Tag]
             Decoders.addDecoder(clazz: [Tag].self) { (source: AnyObject) -> [Tag] in
                 return Decoders.decode(clazz: [Tag].self, source: source)
             }
-			// Decoder for Tag
+            // Decoder for Tag
             Decoders.addDecoder(clazz: Tag.self) { (source: AnyObject) -> Tag in
                 let sourceDictionary = source as! [NSObject:AnyObject]
                 let instance = Tag()
@@ -263,13 +328,13 @@ class Decoders {
                 instance.name = Decoders.decodeOptional(clazz: String.self, source: sourceDictionary["name"])
                 return instance
             }
-			
 
-			// Decoder for [User]
+
+            // Decoder for [User]
             Decoders.addDecoder(clazz: [User].self) { (source: AnyObject) -> [User] in
                 return Decoders.decode(clazz: [User].self, source: source)
             }
-			// Decoder for User
+            // Decoder for User
             Decoders.addDecoder(clazz: User.self) { (source: AnyObject) -> User in
                 let sourceDictionary = source as! [NSObject:AnyObject]
                 let instance = User()
@@ -283,7 +348,6 @@ class Decoders {
                 instance.userStatus = Decoders.decodeOptional(clazz: Int32.self, source: sourceDictionary["userStatus"])
                 return instance
             }
-			
         }
     }
 }
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Animal.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Animal.swift
new file mode 100644
index 00000000000..586b10f5931
--- /dev/null
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Animal.swift
@@ -0,0 +1,23 @@
+//
+// Animal.swift
+//
+// Generated by swagger-codegen
+// https://github.com/swagger-api/swagger-codegen
+//
+
+import Foundation
+
+
+public class Animal: JSONEncodable {
+    public var className: String?
+
+    public init() {}
+
+    // MARK: JSONEncodable
+    func encodeToJSON() -> AnyObject {
+        var nillableDictionary = [String:AnyObject?]()
+        nillableDictionary["className"] = self.className
+        let dictionary: [String:AnyObject] = APIHelper.rejectNil(nillableDictionary) ?? [:]
+        return dictionary
+    }
+}
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Cat.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Cat.swift
new file mode 100644
index 00000000000..bdf66b563d2
--- /dev/null
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Cat.swift
@@ -0,0 +1,25 @@
+//
+// Cat.swift
+//
+// Generated by swagger-codegen
+// https://github.com/swagger-api/swagger-codegen
+//
+
+import Foundation
+
+
+public class Cat: JSONEncodable {
+    public var className: String?
+    public var declawed: Bool?
+
+    public init() {}
+
+    // MARK: JSONEncodable
+    func encodeToJSON() -> AnyObject {
+        var nillableDictionary = [String:AnyObject?]()
+        nillableDictionary["className"] = self.className
+        nillableDictionary["declawed"] = self.declawed
+        let dictionary: [String:AnyObject] = APIHelper.rejectNil(nillableDictionary) ?? [:]
+        return dictionary
+    }
+}
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Category.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Category.swift
index 2f0ab835e8f..19f31d266ef 100644
--- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Category.swift
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Category.swift
@@ -9,10 +9,8 @@ import Foundation
 
 
 public class Category: JSONEncodable {
-
     public var id: Int64?
     public var name: String?
-    
 
     public init() {}
 
@@ -20,6 +18,7 @@ public class Category: JSONEncodable {
     func encodeToJSON() -> AnyObject {
         var nillableDictionary = [String:AnyObject?]()
         nillableDictionary["id"] = self.id?.encodeToJSON()
+        nillableDictionary["id"] = self.id?.encodeToJSON()
         nillableDictionary["name"] = self.name
         let dictionary: [String:AnyObject] = APIHelper.rejectNil(nillableDictionary) ?? [:]
         return dictionary
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Dog.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Dog.swift
new file mode 100644
index 00000000000..8a1fafdfc67
--- /dev/null
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Dog.swift
@@ -0,0 +1,25 @@
+//
+// Dog.swift
+//
+// Generated by swagger-codegen
+// https://github.com/swagger-api/swagger-codegen
+//
+
+import Foundation
+
+
+public class Dog: JSONEncodable {
+    public var className: String?
+    public var breed: String?
+
+    public init() {}
+
+    // MARK: JSONEncodable
+    func encodeToJSON() -> AnyObject {
+        var nillableDictionary = [String:AnyObject?]()
+        nillableDictionary["className"] = self.className
+        nillableDictionary["breed"] = self.breed
+        let dictionary: [String:AnyObject] = APIHelper.rejectNil(nillableDictionary) ?? [:]
+        return dictionary
+    }
+}
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/FormatTest.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/FormatTest.swift
new file mode 100644
index 00000000000..b84000125e3
--- /dev/null
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/FormatTest.swift
@@ -0,0 +1,46 @@
+//
+// FormatTest.swift
+//
+// Generated by swagger-codegen
+// https://github.com/swagger-api/swagger-codegen
+//
+
+import Foundation
+
+
+public class FormatTest: JSONEncodable {
+    public var integer: Int32?
+    public var _int32: Int32?
+    public var _int64: Int64?
+    public var number: Double?
+    public var _float: Float?
+    public var _double: Double?
+    public var _string: String?
+    public var byte: String?
+    public var binary: String?
+    public var date: NSDate?
+    public var dateTime: NSDate?
+    public var password: String?
+
+    public init() {}
+
+    // MARK: JSONEncodable
+    func encodeToJSON() -> AnyObject {
+        var nillableDictionary = [String:AnyObject?]()
+        nillableDictionary["integer"] = self.integer?.encodeToJSON()
+        nillableDictionary["int32"] = self._int32?.encodeToJSON()
+        nillableDictionary["int64"] = self._int64?.encodeToJSON()
+        nillableDictionary["int64"] = self._int64?.encodeToJSON()
+        nillableDictionary["number"] = self.number
+        nillableDictionary["float"] = self._float
+        nillableDictionary["double"] = self._double
+        nillableDictionary["string"] = self._string
+        nillableDictionary["byte"] = self.byte
+        nillableDictionary["binary"] = self.binary
+        nillableDictionary["date"] = self.date?.encodeToJSON()
+        nillableDictionary["dateTime"] = self.dateTime?.encodeToJSON()
+        nillableDictionary["password"] = self.password
+        let dictionary: [String:AnyObject] = APIHelper.rejectNil(nillableDictionary) ?? [:]
+        return dictionary
+    }
+}
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/InlineResponse200.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/InlineResponse200.swift
index fcf0679aea2..a9397e868ba 100644
--- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/InlineResponse200.swift
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/InlineResponse200.swift
@@ -9,13 +9,11 @@ import Foundation
 
 
 public class InlineResponse200: JSONEncodable {
-
     public enum Status: String { 
         case Available = "available"
         case Pending = "pending"
         case Sold = "sold"
     }
-    
     public var photoUrls: [String]?
     public var name: String?
     public var id: Int64?
@@ -23,7 +21,6 @@ public class InlineResponse200: JSONEncodable {
     public var tags: [Tag]?
     /** pet status in the store */
     public var status: Status?
-    
 
     public init() {}
 
@@ -33,6 +30,7 @@ public class InlineResponse200: JSONEncodable {
         nillableDictionary["photoUrls"] = self.photoUrls?.encodeToJSON()
         nillableDictionary["name"] = self.name
         nillableDictionary["id"] = self.id?.encodeToJSON()
+        nillableDictionary["id"] = self.id?.encodeToJSON()
         nillableDictionary["category"] = self.category
         nillableDictionary["tags"] = self.tags?.encodeToJSON()
         nillableDictionary["status"] = self.status?.rawValue
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Model200Response.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Model200Response.swift
index f929d282358..43cc68a5c2d 100644
--- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Model200Response.swift
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Model200Response.swift
@@ -8,10 +8,9 @@
 import Foundation
 
 
+/** Model for testing model name starting with number */
 public class Model200Response: JSONEncodable {
-
     public var name: Int32?
-    
 
     public init() {}
 
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/ModelReturn.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/ModelReturn.swift
index f3f16f2c13e..80e2ef13b24 100644
--- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/ModelReturn.swift
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/ModelReturn.swift
@@ -8,10 +8,9 @@
 import Foundation
 
 
+/** Model for testing reserved words */
 public class ModelReturn: JSONEncodable {
-
     public var _return: Int32?
-    
 
     public init() {}
 
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Name.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Name.swift
index 4b49c8325d5..a0e40281d45 100644
--- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Name.swift
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Name.swift
@@ -8,11 +8,10 @@
 import Foundation
 
 
+/** Model for testing model name same as property name */
 public class Name: JSONEncodable {
-
     public var name: Int32?
     public var snakeCase: Int32?
-    
 
     public init() {}
 
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Order.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Order.swift
index 03b977c88f7..4374d95ed47 100644
--- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Order.swift
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Order.swift
@@ -9,13 +9,11 @@ import Foundation
 
 
 public class Order: JSONEncodable {
-
     public enum Status: String { 
         case Placed = "placed"
         case Approved = "approved"
         case Delivered = "delivered"
     }
-    
     public var id: Int64?
     public var petId: Int64?
     public var quantity: Int32?
@@ -23,7 +21,6 @@ public class Order: JSONEncodable {
     /** Order Status */
     public var status: Status?
     public var complete: Bool?
-    
 
     public init() {}
 
@@ -31,6 +28,8 @@ public class Order: JSONEncodable {
     func encodeToJSON() -> AnyObject {
         var nillableDictionary = [String:AnyObject?]()
         nillableDictionary["id"] = self.id?.encodeToJSON()
+        nillableDictionary["id"] = self.id?.encodeToJSON()
+        nillableDictionary["petId"] = self.petId?.encodeToJSON()
         nillableDictionary["petId"] = self.petId?.encodeToJSON()
         nillableDictionary["quantity"] = self.quantity?.encodeToJSON()
         nillableDictionary["shipDate"] = self.shipDate?.encodeToJSON()
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Pet.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Pet.swift
index 5df44cfca96..8a467a5bf0b 100644
--- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Pet.swift
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Pet.swift
@@ -9,13 +9,11 @@ import Foundation
 
 
 public class Pet: JSONEncodable {
-
     public enum Status: String { 
         case Available = "available"
         case Pending = "pending"
         case Sold = "sold"
     }
-    
     public var id: Int64?
     public var category: Category?
     public var name: String?
@@ -23,7 +21,6 @@ public class Pet: JSONEncodable {
     public var tags: [Tag]?
     /** pet status in the store */
     public var status: Status?
-    
 
     public init() {}
 
@@ -31,6 +28,7 @@ public class Pet: JSONEncodable {
     func encodeToJSON() -> AnyObject {
         var nillableDictionary = [String:AnyObject?]()
         nillableDictionary["id"] = self.id?.encodeToJSON()
+        nillableDictionary["id"] = self.id?.encodeToJSON()
         nillableDictionary["category"] = self.category?.encodeToJSON()
         nillableDictionary["name"] = self.name
         nillableDictionary["photoUrls"] = self.photoUrls?.encodeToJSON()
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/SpecialModelName.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/SpecialModelName.swift
index 907be7f934a..cb92fbd2f78 100644
--- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/SpecialModelName.swift
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/SpecialModelName.swift
@@ -9,9 +9,7 @@ import Foundation
 
 
 public class SpecialModelName: JSONEncodable {
-
     public var specialPropertyName: Int64?
-    
 
     public init() {}
 
@@ -19,6 +17,7 @@ public class SpecialModelName: JSONEncodable {
     func encodeToJSON() -> AnyObject {
         var nillableDictionary = [String:AnyObject?]()
         nillableDictionary["$special[property.name]"] = self.specialPropertyName?.encodeToJSON()
+        nillableDictionary["$special[property.name]"] = self.specialPropertyName?.encodeToJSON()
         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
index ecff268828f..a3916f59b13 100644
--- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Tag.swift
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Tag.swift
@@ -9,10 +9,8 @@ import Foundation
 
 
 public class Tag: JSONEncodable {
-
     public var id: Int64?
     public var name: String?
-    
 
     public init() {}
 
@@ -20,6 +18,7 @@ public class Tag: JSONEncodable {
     func encodeToJSON() -> AnyObject {
         var nillableDictionary = [String:AnyObject?]()
         nillableDictionary["id"] = self.id?.encodeToJSON()
+        nillableDictionary["id"] = self.id?.encodeToJSON()
         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
index 70fee87f4d5..26e9c619927 100644
--- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/User.swift
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/User.swift
@@ -9,7 +9,6 @@ import Foundation
 
 
 public class User: JSONEncodable {
-
     public var id: Int64?
     public var username: String?
     public var firstName: String?
@@ -19,7 +18,6 @@ public class User: JSONEncodable {
     public var phone: String?
     /** User Status */
     public var userStatus: Int32?
-    
 
     public init() {}
 
@@ -27,6 +25,7 @@ public class User: JSONEncodable {
     func encodeToJSON() -> AnyObject {
         var nillableDictionary = [String:AnyObject?]()
         nillableDictionary["id"] = self.id?.encodeToJSON()
+        nillableDictionary["id"] = self.id?.encodeToJSON()
         nillableDictionary["username"] = self.username
         nillableDictionary["firstName"] = self.firstName
         nillableDictionary["lastName"] = self.lastName
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj b/samples/client/petstore/swift/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
index 0e841d33df3..fe35821d6e0 100644
--- a/samples/client/petstore/swift/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
+++ b/samples/client/petstore/swift/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
@@ -7,109 +7,113 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		0290D4A3795396ABBB81E632E5AADE3A /* UIActionSheet+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD570E28B63274E742E7D1FBBD55BB41 /* UIActionSheet+Promise.swift */; };
-		02D0672068E53F2D98CC67FBA5278022 /* UIView+AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDD82DB3E6D43BA9769FCA9B744CB5E /* UIView+AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		03790817CF6E76959C0F7E2D0734E9F6 /* after.swift in Sources */ = {isa = PBXBuildFile; fileRef = 275DA9A664C70DD40A4059090D1A00D4 /* after.swift */; };
 		03F494989CC1A8857B68A317D5D6860F /* Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DF5FC3AF99846209C5FCE55A2E12D9A /* Response.swift */; };
 		0681ADC8BAE2C3185F13487BAAB4D9DD /* Upload.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCE38472832BBCC541E646DA6C18EF9C /* Upload.swift */; };
-		08B247165C2A091EE24F79D73F8ABEC9 /* UIAlertView+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA854180C132DB5511D64C82535C5FDE /* UIAlertView+Promise.swift */; };
-		09C9710BEE85A253331C8E0994FBB2BF /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FC4BF94DC4B3D8B88FC160B00931B0EC /* QuartzCore.framework */; };
+		0B0F79070CD75DE3CF053E58B491A3AC /* UserAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD05F019D163F2D5FE7C8E64C1D2E299 /* UserAPI.swift */; };
 		0B34EB4425C08BB021C2D09F75C9C146 /* OMGHTTPURLRQ.h in Headers */ = {isa = PBXBuildFile; fileRef = 450166FEA2155A5821D97744A0127DF8 /* OMGHTTPURLRQ.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0BA72DC6AB26C72EE080F8A08CE41643 /* NSNotificationCenter+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = B93FB4BB16CFB41DCA35A8CFAD7A7FEF /* NSNotificationCenter+Promise.swift */; };
-		0D6DCC756D1B0B68ADB5F805D575BAB6 /* NSError+Cancellation.h in Headers */ = {isa = PBXBuildFile; fileRef = 045C1F608ADE57757E6732D721779F22 /* NSError+Cancellation.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0F816E94051557A7BA9BFA5B6B4A32A5 /* Order.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE5E0F8BA6AB1430D31588F5EB170889 /* Order.swift */; };
-		0FFA3D017278D8EB24A9AC4780E3AFEC /* OMGHTTPURLRQ.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3530BF15E14D1F6D7134EE67377D5C8C /* OMGHTTPURLRQ.framework */; };
-		1372840E154B63D17AACD1257C3E0520 /* NSNotificationCenter+AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = 3616971BAEF40302B7F2F8B1007C0B2B /* NSNotificationCenter+AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		167B939D70FE9AADBA03ABBBBA588B4B /* SpecialModelName.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7F371E5E2A26613C4DE253F4D7A3F56 /* SpecialModelName.swift */; };
-		19DAC977B6B3CBDC69EE2150BD0C1EF6 /* UIView+AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = 2F0F4EDC2236E1C270DC2014181D6506 /* UIView+AnyPromise.m */; };
-		1B099FB3AA9A6794A3039899A6734205 /* Name.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F98C30F79A0AB5920FB4CDBB7413E5C /* Name.swift */; };
-		222C92305B7AC5BB8E2ABAD182F50026 /* Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D23C407A7CDBFD244D6115899F9D45D /* Promise.swift */; };
-		2676E85B9644D55E25A31D3CE61A5726 /* CALayer+AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = 27E0FE41D771BE8BE3F0D4F1DAD0B179 /* CALayer+AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		291E2518A9E470C2E9CE1B69C088C16F /* State.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DC63EB77B3791891517B98CAA115DE8 /* State.swift */; };
+		0BB1E79782E3BE258C30A65A20C85FC1 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FC4BF94DC4B3D8B88FC160B00931B0EC /* QuartzCore.framework */; };
+		10E93502CF9CED0B6341DB95B658F2F9 /* Model200Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C24509ECAD94A91B30D87D8B2DEEB9B /* Model200Response.swift */; };
+		14FD108A5B931460A799BDCB874A99C3 /* SpecialModelName.swift in Sources */ = {isa = PBXBuildFile; fileRef = DED58811444E6D32A1F7B372F034DB7A /* SpecialModelName.swift */; };
+		1A4D55F76DCB3489302BC425F4DB1C04 /* when.m in Sources */ = {isa = PBXBuildFile; fileRef = 143BC30E5DDAF52A3D9578F507EC6A41 /* when.m */; };
+		1DB7E23C2A2A8D4B5CE046135E4540C6 /* PromiseKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BFFA6FD621E9ED341AA89AEAC1604D7 /* PromiseKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		2308448E8874D3DAA33A1AEFEFCFBA2D /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2BAE461B3A62164A09480E8967D29E64 /* Extensions.swift */; };
 		2C5450AC69398958CF6F7539EF7D99E5 /* Alamofire-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 30CE7341A995EF6812D71771E74CF7F7 /* Alamofire-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		335F10113F178E8D2984BE0602A0DEED /* Tag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 780827122613E6D246695ADFAA7B28B6 /* Tag.swift */; };
+		2DF2D3E610EB6F19375570C0EBA9E77F /* after.m in Sources */ = {isa = PBXBuildFile; fileRef = B868468092D7B2489B889A50981C9247 /* after.m */; };
+		30F9F020F5B35577080063E71CDAB08C /* OMGHTTPURLRQ.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3530BF15E14D1F6D7134EE67377D5C8C /* OMGHTTPURLRQ.framework */; };
+		33326318BF830A838DA62D54ADAA5ECA /* Cat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D172F6D749B7735D04B495330AB7FE3 /* Cat.swift */; };
 		35F6B35131F89EA23246C6508199FB05 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB15A61DB7ABCB74565286162157C5A0 /* Foundation.framework */; };
-		36CDD7A6638E10B9107C74D9B75079F1 /* NSURLConnection+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 412985229DA7A4DF9E129B7E8F0C09BB /* NSURLConnection+Promise.swift */; };
-		37027676CEABF1BF753684A06C2DCDDB /* URLDataPromise.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7CE161ED0CF68954A63F30528ACAD9B /* URLDataPromise.swift */; };
+		38FE2977C973FA258977E86E1E964E02 /* AnyPromise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5973BC143AE488C12FFB1E83E71F0C45 /* AnyPromise.swift */; };
+		39E7AFE23097B4BC393D43A44093FB63 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB15A61DB7ABCB74565286162157C5A0 /* Foundation.framework */; };
 		3A8D316D4266A3309D0A98ED74F8A13A /* OMGUserAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 87BC7910B8D7D31310A07C32438A8C67 /* OMGUserAgent.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		3D2B170AA3737444F26B0E07E1F5FEF1 /* Category.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D0925CA00A7877078F60FAD44E2DD0F /* Category.swift */; };
-		405F6EBE4BBAAC270AF1B97AFC5B0C16 /* NSURLConnection+AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = A7F0DAACAC89A93B940BBE54E6A87E9F /* NSURLConnection+AnyPromise.m */; };
-		42A66FBE567A7F5B2136FC56BFF4874A /* UIAlertView+AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = F075F63EFE77F7B59FF77CBA95B9AADF /* UIAlertView+AnyPromise.m */; };
-		435BD7136E0E174C6A8811D6C88DEAF2 /* NSObject+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6EB54C331FED437583A5F01EB2757D1 /* NSObject+Promise.swift */; };
+		41C531C4CEDCAE196A6F92FEAE66CCF3 /* StoreAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C7FF1C1E487B6795C5F6734CCA49DF3 /* StoreAPI.swift */; };
+		445F515F4FAB3537878E1377562BBBA7 /* NSNotificationCenter+AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = 4798BAC01B0E3F07E3BBBB07BA57F2D7 /* NSNotificationCenter+AnyPromise.m */; };
+		4827FED90242878355B47A6D34BAABCA /* APIs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 323E5DCC342B03D7AE59F37523D2626A /* APIs.swift */; };
 		48CB8E7E16443CA771E4DCFB3E0709A2 /* OMGHTTPURLRQ.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D579267FC1F163C8F04B444DAEFED0D /* OMGHTTPURLRQ.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
-		4CE2B026C746F263F6B95534A35E76C0 /* afterlife.swift in Sources */ = {isa = PBXBuildFile; fileRef = C476B916B763E55E4161F0B30760C4E8 /* afterlife.swift */; };
 		4DE5FCC41D100B113B6645EA64410F16 /* ParameterEncoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FBD351D007CF4095C98C9DFD9D83D61 /* ParameterEncoding.swift */; };
-		4EAB3713B40959FB2E0CDEAC8BDE1116 /* when.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16730DAF3E51C161D8247E473F069E71 /* when.swift */; };
+		4E07AC40078EBB1C88ED8700859F5A1B /* APIHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E506C8F40F5AD602D83B383EAA7C0CD /* APIHelper.swift */; };
 		5192A7466019F9B3D7F1E987124E96BC /* OMGHTTPURLRQ-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = F7EBDD2EEED520E06ACB3538B3832049 /* OMGHTTPURLRQ-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		53FBECFDFCA1B755F2754C4DBC65E3D5 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A1DC80A0773C5A569348DC442EAFD1D /* UIKit.framework */; };
 		5480169E42C456C49BE59E273D7E0115 /* OMGFormURLEncode.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ADA0B6B6B00CB0E818AA8CBC311677 /* OMGFormURLEncode.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		57FB6BF21435F091D48B97DBD36E8C7B /* InlineResponse200.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94FB3F3CEFBA56B306D034B69144C68E /* InlineResponse200.swift */; };
-		5849F4EAAAD24A116F0E0E948623AEC0 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB15A61DB7ABCB74565286162157C5A0 /* Foundation.framework */; };
-		5EADA3CE22BF3B74E759F948DE7A66F1 /* UIViewController+AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = AA24C5EC82CF437D8D1FFFAB68975408 /* UIViewController+AnyPromise.m */; };
-		63F6FFAB2BCCD07FD3DF44086E11C8B0 /* ObjectReturn.swift in Sources */ = {isa = PBXBuildFile; fileRef = A58E34C4DDB909B2CA900747C6691A5A /* ObjectReturn.swift */; };
-		64739E341A52DFA48F4169E4322E7486 /* PetstoreClient-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 9F681D2C508D1BA8F62893120D9343A4 /* PetstoreClient-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		5E46AC6FA35723E095C2EB6ED23C0510 /* PromiseKit-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 9042667D08D783E45394FE8B97EE6468 /* PromiseKit-dummy.m */; };
+		5EECE3F98893B2D4E03DC027C57C21F3 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A60B64E388679F589CB959AA5FC4787 /* Models.swift */; };
+		5FDCAFE73B791C4A4B863C9D65F6CF7B /* UIAlertView+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA854180C132DB5511D64C82535C5FDE /* UIAlertView+Promise.swift */; };
+		623677B20997F5EC0F6CA695CADD410B /* ObjectReturn.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3CC2D1A2A451C0A3C4DBD6D7E117C01 /* ObjectReturn.swift */; };
+		63AF5DF795F5D610768B4AF53C7E9976 /* UIActionSheet+AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = 6846D22C9F0CCBC48DF833E309A8E84F /* UIActionSheet+AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		655C3826275A76D04835F2336AC87A91 /* UIAlertView+AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = F075F63EFE77F7B59FF77CBA95B9AADF /* UIAlertView+AnyPromise.m */; };
+		660435DF96CE68B3A3E078030C5F54FA /* UIView+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3CDA0958D6247505ECD9098D662EA74 /* UIView+Promise.swift */; };
+		66B8591A8CCC9760D933506B71A13962 /* UIViewController+AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BA017E288BB42E06EBEE9C6E6993EAF /* UIViewController+AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		6CB84A616D7B4D189A4E94BD37621575 /* OMGUserAgent.m in Sources */ = {isa = PBXBuildFile; fileRef = E11BFB27B43B742CB5D6086C4233A909 /* OMGUserAgent.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
 		6D264CCBD7DAC0A530076FB1A847EEC7 /* Pods-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 894E5DA93A9F359521A89826BE6DA777 /* Pods-dummy.m */; };
-		6EA827E0ECB8F7CC49F8B4C92A1D93FA /* CALayer+AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = 04A22F2595054D39018E03961CA7283A /* CALayer+AnyPromise.m */; };
 		6F63943B0E954F701F32BC7A1F4C2FEC /* OMGFormURLEncode.m in Sources */ = {isa = PBXBuildFile; fileRef = 25614E715DDC170DAFB0DF50C5503E33 /* OMGFormURLEncode.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
-		76171B607A443BE97E1DBBF6575CD558 /* after.m in Sources */ = {isa = PBXBuildFile; fileRef = B868468092D7B2489B889A50981C9247 /* after.m */; };
-		76FAA23C0A28ECF0BBF6A5C14203F414 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = A360D2EE0575D36C8C8459BCB8325D9A /* Models.swift */; };
-		77F020B749274FC61FD1D5EA3FBBBE18 /* PromiseKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A112EF8BB3933C1C1E42F11B3DD3B02A /* PromiseKit.framework */; };
+		7120EA2BF0D3942FF9CE0EDABBF86BA1 /* NSURLConnection+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 412985229DA7A4DF9E129B7E8F0C09BB /* NSURLConnection+Promise.swift */; };
+		72B2C8A6E81C1E99E6093BE3BDBDE554 /* join.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84319E048FE6DD89B905FA3A81005C5F /* join.swift */; };
+		752EACD07B4F948C1F24E0583C5DA165 /* NSNotificationCenter+AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = 3616971BAEF40302B7F2F8B1007C0B2B /* NSNotificationCenter+AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		7BCBC4FD2E385CAFC5F3949FFFFE2095 /* NSError+Cancellation.h in Headers */ = {isa = PBXBuildFile; fileRef = 045C1F608ADE57757E6732D721779F22 /* NSError+Cancellation.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		7C87E63D6733AC0FE083373A5FAF86CB /* Category.swift in Sources */ = {isa = PBXBuildFile; fileRef = 71B762588C78E0A95319F5BB534965BE /* Category.swift */; };
+		7CE6DE14AB43CB51B4D5C5BA4293C47B /* join.m in Sources */ = {isa = PBXBuildFile; fileRef = 6AD59903FAA8315AD0036AC459FFB97F /* join.m */; };
+		7D38A3624822DA504D0FBD9F4EA485BA /* UIViewController+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D459D0AB2361B48F81C4D14C6D0DAA /* UIViewController+Promise.swift */; };
+		7DAC8F56FC00F6400AC3BF3AF79ACAFD /* ModelReturn.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17CBD3DEAD30C207791B4B1A5AD66991 /* ModelReturn.swift */; };
 		80F496237530D382A045A29654D8C11C /* ServerTrustPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 400A6910E83F606BCD67DC11FA706697 /* ServerTrustPolicy.swift */; };
+		81970BD13A497C0962CBEA922C1DAB3E /* race.swift in Sources */ = {isa = PBXBuildFile; fileRef = 980FD13F87B44BFD90F8AC129BEB2E61 /* race.swift */; };
 		82971968CBDAB224212EEB4607C9FB8D /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53F8B2513042BD6DB957E8063EF895BD /* Result.swift */; };
-		82B5B0FF21A9A28284AE7F1124199D3F /* UIActionSheet+AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = 9774D31336C85248A115B569E7D95283 /* UIActionSheet+AnyPromise.m */; };
+		82BEAE7085889DB1A860FE690273EA7E /* PMKAlertController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C731FBFCC690050C6C08E5AC9D9DC724 /* PMKAlertController.swift */; };
 		8399DBEE3E2D98EB1F466132E476F4D9 /* MultipartFormData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F14E17B4D6BDF8BD3E384BE6528F744 /* MultipartFormData.swift */; };
-		886AC602EE7FCFDCD2DCD470CCB41721 /* PetstoreClient-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 46A8E0328DC896E0893B565FE8742167 /* PetstoreClient-dummy.m */; };
-		8ABFD5E4F7621D554DBB12C6472A8313 /* PetAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A44CBCE721F71F03C7758DB3F36CDFF /* PetAPI.swift */; };
-		91DF85663A3771DCD35D0FF07135959B /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84A386C655413763AEE8133A102DF2C8 /* Extensions.swift */; };
-		9254814FE352958B5270E874E5CCD394 /* NSURLSession+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 535DF88FC12304114DEF55E4003421B2 /* NSURLSession+Promise.swift */; };
-		964EA2E9AA68D7D587ED15143FEC4BE5 /* Promise+Properties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E0DBDE561A6C2E7AC7A24160F8A5F28 /* Promise+Properties.swift */; };
+		8809E3D6CC478B4AC9FA6C2389A5447F /* NSObject+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6EB54C331FED437583A5F01EB2757D1 /* NSObject+Promise.swift */; };
+		8955A9B8A34594437C8D27C4C55BFC9E /* FormatTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93B41BBA87E8FD7BD3513CD49733EB30 /* FormatTest.swift */; };
+		895CB65D12461DA4EA243ACE8346D21F /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = D513E5F3C28C7B452E79AE279B71813D /* User.swift */; };
+		8C749DAB8EA0585A7A5769F38CB33CBC /* NSURLConnection+AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = A7F0DAACAC89A93B940BBE54E6A87E9F /* NSURLConnection+AnyPromise.m */; };
+		92EEF6DC60C3CA25AA3997D2652A28F9 /* PetstoreClient-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 46A8E0328DC896E0893B565FE8742167 /* PetstoreClient-dummy.m */; };
 		96D99D0C2472535A169DED65CB231CD7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB15A61DB7ABCB74565286162157C5A0 /* Foundation.framework */; };
-		97A9635E99E7EB0F33260600E1AC82F6 /* StoreAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = A27DF5A602B1BB474A141C895934F712 /* StoreAPI.swift */; };
-		99710CDCDDFF9ED74B8E01EB8E4BF563 /* UIView+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3CDA0958D6247505ECD9098D662EA74 /* UIView+Promise.swift */; };
-		9DA852770BE32039F2C21096F27872A0 /* ModelReturn.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEA71A34D3031D95E61F1082A5BEEB7A /* ModelReturn.swift */; };
-		A2A8512E15D1A4B6DBD515D6144EC083 /* Error.swift in Sources */ = {isa = PBXBuildFile; fileRef = 558DFECE2C740177CA6357DA71A1DFBB /* Error.swift */; };
+		97BDDBBB6BA36B90E98FCD53B9AE171A /* UIAlertView+AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = 92D340D66F03F31237B70F23FE9B00D0 /* UIAlertView+AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		994580EAAB3547FFCA0E969378A7AC2E /* Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D23C407A7CDBFD244D6115899F9D45D /* Promise.swift */; };
+		995CE773471ADA3D5FEB52DF624174C6 /* CALayer+AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = 27E0FE41D771BE8BE3F0D4F1DAD0B179 /* CALayer+AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		9D7DE077DBB18ADD8C4272A59BEB323A /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1D1571AB15108DF6F9C4FE2064E3C43 /* Alamofire.framework */; };
+		9E7DA5C2386E5EA1D57B8C9A38D0A509 /* dispatch_promise.m in Sources */ = {isa = PBXBuildFile; fileRef = A92242715FB4C0608F8DCEBF8F3791E2 /* dispatch_promise.m */; };
 		A2C172FE407C0BC3478ADCA91A6C9CEC /* Manager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D51C929AC51E34493AA757180C09C3B /* Manager.swift */; };
 		A3505FA2FB3067D53847AD288AC04F03 /* Download.swift in Sources */ = {isa = PBXBuildFile; fileRef = A04177B09D9596450D827FE49A36C4C4 /* Download.swift */; };
-		AB06DA1AC0FA3BDF50BAAEBBD06AB46E /* Model200Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = A02D16E80C10DF32F2A88A66B83D7DD9 /* Model200Response.swift */; };
-		AC30241BA84931703B312A09DD64C648 /* Umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A8906F6D6920DF197965D1740A7E283 /* Umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A5EBC0528F4371B43BFA5A2293089BB5 /* dispatch_promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 392FA21A33296B88F790D62A4FAA4E4E /* dispatch_promise.swift */; };
+		AA38773839F0E81980834A7A374BA9DC /* InlineResponse200.swift in Sources */ = {isa = PBXBuildFile; fileRef = 176079DAA9CD16ADABA2C18C289C529D /* InlineResponse200.swift */; };
+		AC6DCF4BF95F44A46CF6BC9230AD6604 /* UIActionSheet+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD570E28B63274E742E7D1FBBD55BB41 /* UIActionSheet+Promise.swift */; };
+		B0AB13A8C68D6972CEDF64FB39D38CB4 /* after.swift in Sources */ = {isa = PBXBuildFile; fileRef = 275DA9A664C70DD40A4059090D1A00D4 /* after.swift */; };
 		B0FB4B01682814B9E3D32F9DC4A5E762 /* Alamofire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B476A57549D7994745E17A6DE5BE745 /* Alamofire.swift */; };
-		B0FB5055748E072728CA7129C3CAA3C6 /* APIs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7220AB25575F15EB89521DFE33F4B764 /* APIs.swift */; };
-		B4FAA3F0ED04F0506E66FCD7141AD989 /* APIHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4B4E403BC5209472D6DA0EEF82A8BD9 /* APIHelper.swift */; };
+		B26D78FFEBAA030D8E8D44B67888C4C2 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB15A61DB7ABCB74565286162157C5A0 /* Foundation.framework */; };
+		B2C0216914777E4B58E1827D854886C2 /* URLDataPromise.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7CE161ED0CF68954A63F30528ACAD9B /* URLDataPromise.swift */; };
 		B6D2DC3E3DA44CD382B9B425F40E11C1 /* Alamofire-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 139346EB669CBE2DE8FE506E14A2BA9C /* Alamofire-dummy.m */; };
-		B72EE02E33CE31F594630D54EEEF9A15 /* hang.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B6A98D6DAF474045210F5A74FF1C3C /* hang.m */; };
-		B908D3F77F293FC72B20EEB48208F5C6 /* race.swift in Sources */ = {isa = PBXBuildFile; fileRef = 980FD13F87B44BFD90F8AC129BEB2E61 /* race.swift */; };
-		BF2A197091B6FC0646CFA61A5FBE66AF /* when.m in Sources */ = {isa = PBXBuildFile; fileRef = 143BC30E5DDAF52A3D9578F507EC6A41 /* when.m */; };
-		BFA18BBF784D749FE8BFA654088F3630 /* join.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84319E048FE6DD89B905FA3A81005C5F /* join.swift */; };
-		C04283A3B7479C8EDE2B95F4DDEE2C2C /* UIViewController+AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BA017E288BB42E06EBEE9C6E6993EAF /* UIViewController+AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		C4688FFE2C4E161516878B521EF54FBE /* AlamofireImplementations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B25BD9A4F08A3124D223BDB55576886 /* AlamofireImplementations.swift */; };
+		B9096C0EE89EC783BDDC77E1F07314E4 /* Tag.swift in Sources */ = {isa = PBXBuildFile; fileRef = C716D7A2A32272C40DFA0AAC76DC0E1E /* Tag.swift */; };
+		BC9F5678D442E5AA1B14083554B7B1C8 /* CALayer+AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = 04A22F2595054D39018E03961CA7283A /* CALayer+AnyPromise.m */; };
+		BCCC0421EE641F782CA295FBD240E2E1 /* NSURLSession+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 535DF88FC12304114DEF55E4003421B2 /* NSURLSession+Promise.swift */; };
+		BEE4B5067218AB107DDECC8B09569EFC /* AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B7E90A568681E000EF3CB0917584F3C /* AnyPromise.m */; };
+		C5EEED0AFF5E2C5AAE2A646689B73DA3 /* UIViewController+AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = AA24C5EC82CF437D8D1FFFAB68975408 /* UIViewController+AnyPromise.m */; };
 		C75519F0450166A6F28126ECC7664E9C /* Validation.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA1AD92813B887E2D017D051B8C0E3D2 /* Validation.swift */; };
-		C95D8B9276E75DA8F6DECCDCE147C781 /* join.m in Sources */ = {isa = PBXBuildFile; fileRef = 6AD59903FAA8315AD0036AC459FFB97F /* join.m */; };
-		C96CB79BD56A7931541FC22617A2D613 /* UIAlertView+AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = 92D340D66F03F31237B70F23FE9B00D0 /* UIAlertView+AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		CCA3921F36A6B36DC1F993112BEF0602 /* NSURLConnection+AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = BAE48ACA10E8895BB8BF5CE8C0846B4B /* NSURLConnection+AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		CA0AABE1706F8B94DC37330AB2BC062C /* Umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A8906F6D6920DF197965D1740A7E283 /* Umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		CB4E6EA27EA59B8851C744CA7D98A2BA /* PromiseKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A112EF8BB3933C1C1E42F11B3DD3B02A /* PromiseKit.framework */; };
+		CE7DAD64CE27C4B98432BDB1CB0E21C7 /* Dog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6AEDC82569B65EDA2A3D12E1F9B8A2D8 /* Dog.swift */; };
+		D1E26E1C25F870E9A0AEC9240E589D75 /* Name.swift in Sources */ = {isa = PBXBuildFile; fileRef = C295084120B300E8BDB7B91981B104FC /* Name.swift */; };
 		D1E8B31EFCBDE00F108E739AD69425C0 /* Pods-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BCC458FDD5F692BBB2BFC64BB5701FC /* Pods-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D21B7325B3642887BFBE977E021F2D26 /* ResponseSerialization.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD558DDCDDA1B46951548B02C34277EF /* ResponseSerialization.swift */; };
+		D258F1E893340393ADABCB02B9FBA206 /* AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F19945EE403F7B29D8B1939EA6D579A /* AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		D2C7190FC2A0F2868EB7C89F5CFA526B /* State.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DC63EB77B3791891517B98CAA115DE8 /* State.swift */; };
 		D358A828E68E152D06FC8E35533BF00B /* OMGHTTPURLRQ-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F36B65CF990C57DC527824ED0BA1915 /* OMGHTTPURLRQ-dummy.m */; };
-		D46A1F4211ACD4C9EF7726AFAD2609EA /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 71972929AF72164C887BB8F5F1059089 /* User.swift */; };
-		D55A97CF31106A21298F731FC890BCA1 /* UIActionSheet+AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = 6846D22C9F0CCBC48DF833E309A8E84F /* UIActionSheet+AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		D39F4FBEE42A57E59471B2A0997FE4CF /* hang.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B6A98D6DAF474045210F5A74FF1C3C /* hang.m */; };
+		D57DA5AC37CE3CEA92958C9528F80FD9 /* UIActionSheet+AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = 9774D31336C85248A115B569E7D95283 /* UIActionSheet+AnyPromise.m */; };
 		D75CA395D510E08C404E55F5BDAE55CE /* Error.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A9CB35983E4859DFFBAD8840196A094 /* Error.swift */; };
-		D78AD94D0DBA6A1CC4E6673D2F14C832 /* NSNotificationCenter+AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = 4798BAC01B0E3F07E3BBBB07BA57F2D7 /* NSNotificationCenter+AnyPromise.m */; };
-		D854F67FD7486C6D25CA841C7D2D5030 /* AnyPromise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5973BC143AE488C12FFB1E83E71F0C45 /* AnyPromise.swift */; };
+		D839A38DEEDDB887F186714D75E73431 /* Promise+Properties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E0DBDE561A6C2E7AC7A24160F8A5F28 /* Promise+Properties.swift */; };
+		DC710F75309F7DFEA3C5AB01E9288681 /* AlamofireImplementations.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAA644003A8DF304D35F77FE04B8AB17 /* AlamofireImplementations.swift */; };
+		DCFE64070EE0BB77557935AD2A4ABF62 /* when.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16730DAF3E51C161D8247E473F069E71 /* when.swift */; };
 		DD8D067A7F742F39B87FA04CE12DD118 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB15A61DB7ABCB74565286162157C5A0 /* Foundation.framework */; };
-		DF8DB782B7C2F5EEC7F29E2E2A5F8154 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB15A61DB7ABCB74565286162157C5A0 /* Foundation.framework */; };
-		E6810077387057466534FD27AA294211 /* UIViewController+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D459D0AB2361B48F81C4D14C6D0DAA /* UIViewController+Promise.swift */; };
-		E6B182F5E233FB9F529BEFEAD3D02ACF /* AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F19945EE403F7B29D8B1939EA6D579A /* AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		E6FDE3505ED7CEF6B87500A5C52B7938 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1D1571AB15108DF6F9C4FE2064E3C43 /* Alamofire.framework */; };
-		E8DDC87F287107068FF40443CF059433 /* dispatch_promise.m in Sources */ = {isa = PBXBuildFile; fileRef = A92242715FB4C0608F8DCEBF8F3791E2 /* dispatch_promise.m */; };
-		E93C3C3AABF32094F0D673E3EC3B2C20 /* dispatch_promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 392FA21A33296B88F790D62A4FAA4E4E /* dispatch_promise.swift */; };
-		EC5B36837863572EC400633CD2FFAF94 /* PromiseKit-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 9042667D08D783E45394FE8B97EE6468 /* PromiseKit-dummy.m */; };
-		F049FFBDC929BB045C2AEDF0ECABE513 /* AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B7E90A568681E000EF3CB0917584F3C /* AnyPromise.m */; };
-		F70B5EF0A4B94F8FF906073882DCDB78 /* UserAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 094C870CE73CCEC940F4DA86D7FE0C30 /* UserAPI.swift */; };
-		F8C6EBC22D97E301AA4EA4D04B3FC860 /* Pet.swift in Sources */ = {isa = PBXBuildFile; fileRef = C909E10C22B35220020268EF2BF27E18 /* Pet.swift */; };
-		F8DAC10D25E6E36B83261AC032A77F1A /* PromiseKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BFFA6FD621E9ED341AA89AEAC1604D7 /* PromiseKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		FA78EA5177275F71FD7F2C52F6B7518D /* PMKAlertController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C731FBFCC690050C6C08E5AC9D9DC724 /* PMKAlertController.swift */; };
+		E1EB5507436EFBD58AF7B9FF051A5AC4 /* afterlife.swift in Sources */ = {isa = PBXBuildFile; fileRef = C476B916B763E55E4161F0B30760C4E8 /* afterlife.swift */; };
+		E3AB1EE3B8DECE5D55D9EB64B0D05E93 /* Pet.swift in Sources */ = {isa = PBXBuildFile; fileRef = A29C027BA870C5E7975BF50087CAE384 /* Pet.swift */; };
+		E62ABEDB4D7B179589B75C8423C5BF9B /* NSURLConnection+AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = BAE48ACA10E8895BB8BF5CE8C0846B4B /* NSURLConnection+AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		E74976C9C4A5EF60B0A9CA1285693DDF /* UIView+AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDD82DB3E6D43BA9769FCA9B744CB5E /* UIView+AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		EB0C1A986BDF161D01919BCCCAE40D7E /* Animal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 076251AD10B5F4E8880F4C350E1D9D5A /* Animal.swift */; };
+		F0E47CCDA10383F8489C3839FD0DF755 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A1DC80A0773C5A569348DC442EAFD1D /* UIKit.framework */; };
+		F1E37BB11F68A6A76DF44B230F965E05 /* PetstoreClient-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 9F681D2C508D1BA8F62893120D9343A4 /* PetstoreClient-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		F3D3D4088EDA3359CC0E5EBA9B683959 /* PetAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F2773E2F96E394825BE86FA45E48132 /* PetAPI.swift */; };
+		F4448E76D51EBACC2B20CDFE3D2D90D7 /* Order.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91579AC4E335E76904DB4DB54228CC42 /* Order.swift */; };
+		F4C2BD51185019A010DA83458B007F81 /* NSNotificationCenter+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = B93FB4BB16CFB41DCA35A8CFAD7A7FEF /* NSNotificationCenter+Promise.swift */; };
+		F4E24EB57CB59F112060100A4B9E5D10 /* Error.swift in Sources */ = {isa = PBXBuildFile; fileRef = 558DFECE2C740177CA6357DA71A1DFBB /* Error.swift */; };
 		FC14480CECE872865A9C6E584F886DA3 /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 133C5287CFDCB3B67578A7B1221E132C /* Request.swift */; };
 		FEF0D7653948988B804226129471C1EC /* Stream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A8F373B23E0F7FB68B0BA71D92D1C60 /* Stream.swift */; };
+		FF5CD62C722D6A68AD65462B56D7CB72 /* UIView+AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = 2F0F4EDC2236E1C270DC2014181D6506 /* UIView+AnyPromise.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -117,23 +121,23 @@
 			isa = PBXContainerItemProxy;
 			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = E1B34E9A45508C6EDDA7F25D88C85434;
+			remoteGlobalIDString = 57958C5706F810052A634C1714567A9F;
 			remoteInfo = PetstoreClient;
 		};
-		098BDC6B6850C9E726FB5016BB254FC7 /* PBXContainerItemProxy */ = {
+		23252B1F29F10BD972ECD7BA34F20EA8 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 190ACD3A51BC90B85EADB13E9CDD207B;
+			remoteInfo = OMGHTTPURLRQ;
+		};
+		56AF0748FFC13AD34ECC967C04930EF8 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = 432ECC54282C84882B482CCB4CF227FC;
 			remoteInfo = Alamofire;
 		};
-		11BAC0C3DDD46F7C7EA2DE10681BBE09 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = A348BE32D0894EA7204BDCB3F0DF636F;
-			remoteInfo = PromiseKit;
-		};
 		769630CDAAA8C24AA5B4C81A85C45AC8 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
@@ -152,24 +156,25 @@
 			isa = PBXContainerItemProxy;
 			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = A348BE32D0894EA7204BDCB3F0DF636F;
+			remoteGlobalIDString = D9A01D449983C8E3EF61C0CA4A7D8F59;
 			remoteInfo = PromiseKit;
 		};
-		BAB3DC0D4AB6EA5B20F7BA63A3F779EC /* PBXContainerItemProxy */ = {
+		EEB067570D28F14A138B737F596BCB1A /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 190ACD3A51BC90B85EADB13E9CDD207B;
-			remoteInfo = OMGHTTPURLRQ;
+			remoteGlobalIDString = D9A01D449983C8E3EF61C0CA4A7D8F59;
+			remoteInfo = PromiseKit;
 		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
 		045C1F608ADE57757E6732D721779F22 /* NSError+Cancellation.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSError+Cancellation.h"; path = "Sources/NSError+Cancellation.h"; sourceTree = "<group>"; };
 		04A22F2595054D39018E03961CA7283A /* CALayer+AnyPromise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "CALayer+AnyPromise.m"; path = "Categories/QuartzCore/CALayer+AnyPromise.m"; sourceTree = "<group>"; };
-		094C870CE73CCEC940F4DA86D7FE0C30 /* UserAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UserAPI.swift; sourceTree = "<group>"; };
+		076251AD10B5F4E8880F4C350E1D9D5A /* Animal.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Animal.swift; sourceTree = "<group>"; };
 		0A8906F6D6920DF197965D1740A7E283 /* Umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Umbrella.h; path = Sources/Umbrella.h; sourceTree = "<group>"; };
 		0BA017E288BB42E06EBEE9C6E6993EAF /* UIViewController+AnyPromise.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIViewController+AnyPromise.h"; path = "Categories/UIKit/UIViewController+AnyPromise.h"; sourceTree = "<group>"; };
+		0C24509ECAD94A91B30D87D8B2DEEB9B /* Model200Response.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Model200Response.swift; sourceTree = "<group>"; };
 		0F36B65CF990C57DC527824ED0BA1915 /* OMGHTTPURLRQ-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "OMGHTTPURLRQ-dummy.m"; sourceTree = "<group>"; };
 		122D5005A81832479161CD1D223C573A /* PromiseKit-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PromiseKit-prefix.pch"; sourceTree = "<group>"; };
 		133C5287CFDCB3B67578A7B1221E132C /* Request.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Request.swift; path = Source/Request.swift; sourceTree = "<group>"; };
@@ -178,20 +183,23 @@
 		143BC30E5DDAF52A3D9578F507EC6A41 /* when.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = when.m; path = Sources/when.m; sourceTree = "<group>"; };
 		16730DAF3E51C161D8247E473F069E71 /* when.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = when.swift; path = Sources/when.swift; sourceTree = "<group>"; };
 		16D7C901D915C251DEBA27AC1EF57E34 /* OMGHTTPURLRQ.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = OMGHTTPURLRQ.xcconfig; sourceTree = "<group>"; };
-		1A44CBCE721F71F03C7758DB3F36CDFF /* PetAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PetAPI.swift; sourceTree = "<group>"; };
+		176079DAA9CD16ADABA2C18C289C529D /* InlineResponse200.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = InlineResponse200.swift; sourceTree = "<group>"; };
+		17CBD3DEAD30C207791B4B1A5AD66991 /* ModelReturn.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ModelReturn.swift; sourceTree = "<group>"; };
 		1B7E90A568681E000EF3CB0917584F3C /* AnyPromise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AnyPromise.m; path = Sources/AnyPromise.m; sourceTree = "<group>"; };
+		1C7FF1C1E487B6795C5F6734CCA49DF3 /* StoreAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = StoreAPI.swift; sourceTree = "<group>"; };
 		1F19945EE403F7B29D8B1939EA6D579A /* AnyPromise.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AnyPromise.h; path = Sources/AnyPromise.h; sourceTree = "<group>"; };
 		1FBD351D007CF4095C98C9DFD9D83D61 /* ParameterEncoding.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ParameterEncoding.swift; path = Source/ParameterEncoding.swift; sourceTree = "<group>"; };
 		24C79ED4B5226F263307B22E96E88F9F /* OMGHTTPURLRQ.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = OMGHTTPURLRQ.modulemap; sourceTree = "<group>"; };
 		25614E715DDC170DAFB0DF50C5503E33 /* OMGFormURLEncode.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = OMGFormURLEncode.m; path = Sources/OMGFormURLEncode.m; sourceTree = "<group>"; };
 		275DA9A664C70DD40A4059090D1A00D4 /* after.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = after.swift; path = Sources/after.swift; sourceTree = "<group>"; };
 		27E0FE41D771BE8BE3F0D4F1DAD0B179 /* CALayer+AnyPromise.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "CALayer+AnyPromise.h"; path = "Categories/QuartzCore/CALayer+AnyPromise.h"; sourceTree = "<group>"; };
-		2B25BD9A4F08A3124D223BDB55576886 /* AlamofireImplementations.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AlamofireImplementations.swift; sourceTree = "<group>"; };
+		2BAE461B3A62164A09480E8967D29E64 /* Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
 		2BCC458FDD5F692BBB2BFC64BB5701FC /* Pods-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-umbrella.h"; sourceTree = "<group>"; };
 		2D51C929AC51E34493AA757180C09C3B /* Manager.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Manager.swift; path = Source/Manager.swift; sourceTree = "<group>"; };
+		2E506C8F40F5AD602D83B383EAA7C0CD /* APIHelper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = APIHelper.swift; sourceTree = "<group>"; };
 		2F0F4EDC2236E1C270DC2014181D6506 /* UIView+AnyPromise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIView+AnyPromise.m"; path = "Categories/UIKit/UIView+AnyPromise.m"; sourceTree = "<group>"; };
-		2F98C30F79A0AB5920FB4CDBB7413E5C /* Name.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Name.swift; sourceTree = "<group>"; };
 		30CE7341A995EF6812D71771E74CF7F7 /* Alamofire-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Alamofire-umbrella.h"; sourceTree = "<group>"; };
+		323E5DCC342B03D7AE59F37523D2626A /* APIs.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = APIs.swift; sourceTree = "<group>"; };
 		3530BF15E14D1F6D7134EE67377D5C8C /* OMGHTTPURLRQ.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OMGHTTPURLRQ.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		3616971BAEF40302B7F2F8B1007C0B2B /* NSNotificationCenter+AnyPromise.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSNotificationCenter+AnyPromise.h"; path = "Categories/Foundation/NSNotificationCenter+AnyPromise.h"; sourceTree = "<group>"; };
 		392FA21A33296B88F790D62A4FAA4E4E /* dispatch_promise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = dispatch_promise.swift; path = Sources/dispatch_promise.swift; sourceTree = "<group>"; };
@@ -214,16 +222,14 @@
 		5DF5FC3AF99846209C5FCE55A2E12D9A /* Response.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Response.swift; path = Source/Response.swift; sourceTree = "<group>"; };
 		5F14E17B4D6BDF8BD3E384BE6528F744 /* MultipartFormData.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MultipartFormData.swift; path = Source/MultipartFormData.swift; sourceTree = "<group>"; };
 		6846D22C9F0CCBC48DF833E309A8E84F /* UIActionSheet+AnyPromise.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIActionSheet+AnyPromise.h"; path = "Categories/UIKit/UIActionSheet+AnyPromise.h"; sourceTree = "<group>"; };
+		6A60B64E388679F589CB959AA5FC4787 /* Models.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Models.swift; sourceTree = "<group>"; };
 		6AD59903FAA8315AD0036AC459FFB97F /* join.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = join.m; path = Sources/join.m; sourceTree = "<group>"; };
-		6D0925CA00A7877078F60FAD44E2DD0F /* Category.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Category.swift; sourceTree = "<group>"; };
-		71972929AF72164C887BB8F5F1059089 /* User.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
-		7220AB25575F15EB89521DFE33F4B764 /* APIs.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = APIs.swift; sourceTree = "<group>"; };
-		780827122613E6D246695ADFAA7B28B6 /* Tag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Tag.swift; sourceTree = "<group>"; };
+		6AEDC82569B65EDA2A3D12E1F9B8A2D8 /* Dog.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Dog.swift; sourceTree = "<group>"; };
+		71B762588C78E0A95319F5BB534965BE /* Category.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Category.swift; sourceTree = "<group>"; };
 		792D14AC86CD98AA9C31373287E0F353 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		79A9DEDC89FE8336BF5FEDAAF75BF7FC /* Pods.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = Pods.modulemap; sourceTree = "<group>"; };
 		7E0DBDE561A6C2E7AC7A24160F8A5F28 /* Promise+Properties.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Promise+Properties.swift"; path = "Sources/Promise+Properties.swift"; sourceTree = "<group>"; };
 		84319E048FE6DD89B905FA3A81005C5F /* join.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = join.swift; path = Sources/join.swift; sourceTree = "<group>"; };
-		84A386C655413763AEE8133A102DF2C8 /* Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
 		8749F40CC17CE0C26C36B0F431A9C8F0 /* Alamofire.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = Alamofire.modulemap; sourceTree = "<group>"; };
 		87B213035BAC5F75386F62D3C75D2342 /* Pods-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-acknowledgements.plist"; sourceTree = "<group>"; };
 		87BC7910B8D7D31310A07C32438A8C67 /* OMGUserAgent.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = OMGUserAgent.h; path = Sources/OMGUserAgent.h; sourceTree = "<group>"; };
@@ -233,25 +239,26 @@
 		8B476A57549D7994745E17A6DE5BE745 /* Alamofire.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Alamofire.swift; path = Source/Alamofire.swift; sourceTree = "<group>"; };
 		8DC63EB77B3791891517B98CAA115DE8 /* State.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = State.swift; path = Sources/State.swift; sourceTree = "<group>"; };
 		9042667D08D783E45394FE8B97EE6468 /* PromiseKit-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "PromiseKit-dummy.m"; sourceTree = "<group>"; };
+		91579AC4E335E76904DB4DB54228CC42 /* Order.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Order.swift; sourceTree = "<group>"; };
 		92D340D66F03F31237B70F23FE9B00D0 /* UIAlertView+AnyPromise.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIAlertView+AnyPromise.h"; path = "Categories/UIKit/UIAlertView+AnyPromise.h"; sourceTree = "<group>"; };
-		94FB3F3CEFBA56B306D034B69144C68E /* InlineResponse200.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = InlineResponse200.swift; sourceTree = "<group>"; };
+		93B41BBA87E8FD7BD3513CD49733EB30 /* FormatTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FormatTest.swift; sourceTree = "<group>"; };
 		9774D31336C85248A115B569E7D95283 /* UIActionSheet+AnyPromise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIActionSheet+AnyPromise.m"; path = "Categories/UIKit/UIActionSheet+AnyPromise.m"; sourceTree = "<group>"; };
 		977577C045EDA9D9D1F46E2598D19FC7 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Pods.debug.xcconfig; sourceTree = "<group>"; };
 		980FD13F87B44BFD90F8AC129BEB2E61 /* race.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = race.swift; path = Sources/race.swift; sourceTree = "<group>"; };
+		9D172F6D749B7735D04B495330AB7FE3 /* Cat.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Cat.swift; sourceTree = "<group>"; };
 		9D579267FC1F163C8F04B444DAEFED0D /* OMGHTTPURLRQ.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = OMGHTTPURLRQ.m; path = Sources/OMGHTTPURLRQ.m; sourceTree = "<group>"; };
+		9F2773E2F96E394825BE86FA45E48132 /* PetAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PetAPI.swift; sourceTree = "<group>"; };
 		9F681D2C508D1BA8F62893120D9343A4 /* PetstoreClient-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-umbrella.h"; sourceTree = "<group>"; };
-		A02D16E80C10DF32F2A88A66B83D7DD9 /* Model200Response.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Model200Response.swift; sourceTree = "<group>"; };
 		A04177B09D9596450D827FE49A36C4C4 /* Download.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Download.swift; path = Source/Download.swift; sourceTree = "<group>"; };
 		A112EF8BB3933C1C1E42F11B3DD3B02A /* PromiseKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PromiseKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		A1D1571AB15108DF6F9C4FE2064E3C43 /* Alamofire.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Alamofire.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		A27DF5A602B1BB474A141C895934F712 /* StoreAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = StoreAPI.swift; sourceTree = "<group>"; };
-		A360D2EE0575D36C8C8459BCB8325D9A /* Models.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Models.swift; sourceTree = "<group>"; };
-		A4B4E403BC5209472D6DA0EEF82A8BD9 /* APIHelper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = APIHelper.swift; sourceTree = "<group>"; };
-		A58E34C4DDB909B2CA900747C6691A5A /* ObjectReturn.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ObjectReturn.swift; sourceTree = "<group>"; };
+		A29C027BA870C5E7975BF50087CAE384 /* Pet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Pet.swift; sourceTree = "<group>"; };
+		A3CC2D1A2A451C0A3C4DBD6D7E117C01 /* ObjectReturn.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ObjectReturn.swift; sourceTree = "<group>"; };
 		A7F0DAACAC89A93B940BBE54E6A87E9F /* NSURLConnection+AnyPromise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSURLConnection+AnyPromise.m"; path = "Categories/Foundation/NSURLConnection+AnyPromise.m"; sourceTree = "<group>"; };
 		A92242715FB4C0608F8DCEBF8F3791E2 /* dispatch_promise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = dispatch_promise.m; path = Sources/dispatch_promise.m; sourceTree = "<group>"; };
 		AA24C5EC82CF437D8D1FFFAB68975408 /* UIViewController+AnyPromise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIViewController+AnyPromise.m"; path = "Categories/UIKit/UIViewController+AnyPromise.m"; sourceTree = "<group>"; };
 		AB4DA378490493502B34B20D4B12325B /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		AD05F019D163F2D5FE7C8E64C1D2E299 /* UserAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UserAPI.swift; sourceTree = "<group>"; };
 		B3A144887C8B13FD888B76AB096B0CA1 /* PetstoreClient-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-prefix.pch"; sourceTree = "<group>"; };
 		B868468092D7B2489B889A50981C9247 /* after.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = after.m; path = Sources/after.m; sourceTree = "<group>"; };
 		B93FB4BB16CFB41DCA35A8CFAD7A7FEF /* NSNotificationCenter+Promise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "NSNotificationCenter+Promise.swift"; path = "Categories/Foundation/NSNotificationCenter+Promise.swift"; sourceTree = "<group>"; };
@@ -259,23 +266,26 @@
 		BA6428E9F66FD5A23C0A2E06ED26CD2F /* Podfile */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		BAE48ACA10E8895BB8BF5CE8C0846B4B /* NSURLConnection+AnyPromise.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSURLConnection+AnyPromise.h"; path = "Categories/Foundation/NSURLConnection+AnyPromise.h"; sourceTree = "<group>"; };
 		BCDD82DB3E6D43BA9769FCA9B744CB5E /* UIView+AnyPromise.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIView+AnyPromise.h"; path = "Categories/UIKit/UIView+AnyPromise.h"; sourceTree = "<group>"; };
-		BEA71A34D3031D95E61F1082A5BEEB7A /* ModelReturn.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ModelReturn.swift; sourceTree = "<group>"; };
+		C295084120B300E8BDB7B91981B104FC /* Name.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Name.swift; sourceTree = "<group>"; };
 		C476B916B763E55E4161F0B30760C4E8 /* afterlife.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = afterlife.swift; path = Categories/Foundation/afterlife.swift; sourceTree = "<group>"; };
+		C716D7A2A32272C40DFA0AAC76DC0E1E /* Tag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Tag.swift; sourceTree = "<group>"; };
 		C731FBFCC690050C6C08E5AC9D9DC724 /* PMKAlertController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PMKAlertController.swift; path = Categories/UIKit/PMKAlertController.swift; sourceTree = "<group>"; };
-		C909E10C22B35220020268EF2BF27E18 /* Pet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Pet.swift; sourceTree = "<group>"; };
 		CA1AD92813B887E2D017D051B8C0E3D2 /* Validation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Validation.swift; path = Source/Validation.swift; sourceTree = "<group>"; };
 		CA854180C132DB5511D64C82535C5FDE /* UIAlertView+Promise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "UIAlertView+Promise.swift"; path = "Categories/UIKit/UIAlertView+Promise.swift"; sourceTree = "<group>"; };
+		CAA644003A8DF304D35F77FE04B8AB17 /* AlamofireImplementations.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AlamofireImplementations.swift; sourceTree = "<group>"; };
 		CBC0F7C552B739C909B650A0F42F7F38 /* Pods-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-resources.sh"; sourceTree = "<group>"; };
 		CC49FF2A84C0E0E9349747D94036B728 /* PromiseKit.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = PromiseKit.xcconfig; sourceTree = "<group>"; };
 		CCE38472832BBCC541E646DA6C18EF9C /* Upload.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Upload.swift; path = Source/Upload.swift; sourceTree = "<group>"; };
 		CDC4DD7DB9F4C34A288BECA73BC13B57 /* PromiseKit.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = PromiseKit.modulemap; sourceTree = "<group>"; };
 		D0405803033A2A777B8E4DFA0C1800ED /* Pods-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-acknowledgements.markdown"; sourceTree = "<group>"; };
 		D4248CF20178C57CEFEFAAF453C0DC75 /* PromiseKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PromiseKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		D513E5F3C28C7B452E79AE279B71813D /* User.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
 		D6D459D0AB2361B48F81C4D14C6D0DAA /* UIViewController+Promise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "UIViewController+Promise.swift"; path = "Categories/UIKit/UIViewController+Promise.swift"; sourceTree = "<group>"; };
 		D6EB54C331FED437583A5F01EB2757D1 /* NSObject+Promise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "NSObject+Promise.swift"; path = "Categories/Foundation/NSObject+Promise.swift"; sourceTree = "<group>"; };
 		D931A99C6B5A8E0F69C818C6ECC3C44F /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		DA312349A49333542E6F4B36B329960E /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Pods.release.xcconfig; sourceTree = "<group>"; };
 		DADAB10704E49D6B9E18F59F995BB88F /* PetstoreClient.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = PetstoreClient.xcconfig; sourceTree = "<group>"; };
+		DED58811444E6D32A1F7B372F034DB7A /* SpecialModelName.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SpecialModelName.swift; sourceTree = "<group>"; };
 		E11BFB27B43B742CB5D6086C4233A909 /* OMGUserAgent.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = OMGUserAgent.m; path = Sources/OMGUserAgent.m; sourceTree = "<group>"; };
 		E160B50E4D11692AA38E74C897D69C61 /* PetstoreClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PetstoreClient.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		E3CDA0958D6247505ECD9098D662EA74 /* UIView+Promise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "UIView+Promise.swift"; path = "Categories/UIKit/UIView+Promise.swift"; sourceTree = "<group>"; };
@@ -284,12 +294,10 @@
 		E7F21354943D9F42A70697D5A5EF72E9 /* Pods-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-frameworks.sh"; sourceTree = "<group>"; };
 		E8446514FBAD26C0E18F24A5715AEF67 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		EBC4140FCBB5B4D3A955B1608C165C04 /* Alamofire.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Alamofire.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		EE5E0F8BA6AB1430D31588F5EB170889 /* Order.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Order.swift; sourceTree = "<group>"; };
 		F075F63EFE77F7B59FF77CBA95B9AADF /* UIAlertView+AnyPromise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIAlertView+AnyPromise.m"; path = "Categories/UIKit/UIAlertView+AnyPromise.m"; sourceTree = "<group>"; };
 		F0D4E00A8974E74325E9E53D456F9AD4 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		F4B6A98D6DAF474045210F5A74FF1C3C /* hang.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = hang.m; path = Sources/hang.m; sourceTree = "<group>"; };
 		F7EBDD2EEED520E06ACB3538B3832049 /* OMGHTTPURLRQ-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "OMGHTTPURLRQ-umbrella.h"; sourceTree = "<group>"; };
-		F7F371E5E2A26613C4DE253F4D7A3F56 /* SpecialModelName.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SpecialModelName.swift; sourceTree = "<group>"; };
 		FB15A61DB7ABCB74565286162157C5A0 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
 		FC4BF94DC4B3D8B88FC160B00931B0EC /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk/System/Library/Frameworks/QuartzCore.framework; sourceTree = DEVELOPER_DIR; };
 		FD558DDCDDA1B46951548B02C34277EF /* ResponseSerialization.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ResponseSerialization.swift; path = Source/ResponseSerialization.swift; sourceTree = "<group>"; };
@@ -297,13 +305,13 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-		4B81AD7DF193F182592D3F3510F50796 /* Frameworks */ = {
+		783E7A91F3C3404EDF234C828FCA6543 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E6FDE3505ED7CEF6B87500A5C52B7938 /* Alamofire.framework in Frameworks */,
-				DF8DB782B7C2F5EEC7F29E2E2A5F8154 /* Foundation.framework in Frameworks */,
-				77F020B749274FC61FD1D5EA3FBBBE18 /* PromiseKit.framework in Frameworks */,
+				9D7DE077DBB18ADD8C4272A59BEB323A /* Alamofire.framework in Frameworks */,
+				B26D78FFEBAA030D8E8D44B67888C4C2 /* Foundation.framework in Frameworks */,
+				CB4E6EA27EA59B8851C744CA7D98A2BA /* PromiseKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -323,14 +331,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		C5452032741F5F809522C754A4393C4A /* Frameworks */ = {
+		DBF65F787DDFE72646CDC44CF9E22784 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5849F4EAAAD24A116F0E0E948623AEC0 /* Foundation.framework in Frameworks */,
-				0FFA3D017278D8EB24A9AC4780E3AFEC /* OMGHTTPURLRQ.framework in Frameworks */,
-				09C9710BEE85A253331C8E0994FBB2BF /* QuartzCore.framework in Frameworks */,
-				53FBECFDFCA1B755F2754C4DBC65E3D5 /* UIKit.framework in Frameworks */,
+				39E7AFE23097B4BC393D43A44093FB63 /* Foundation.framework in Frameworks */,
+				30F9F020F5B35577080063E71CDAB08C /* OMGHTTPURLRQ.framework in Frameworks */,
+				0BB1E79782E3BE258C30A65A20C85FC1 /* QuartzCore.framework in Frameworks */,
+				F0E47CCDA10383F8489C3839FD0DF755 /* UIKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -354,6 +362,28 @@
 			name = UserAgent;
 			sourceTree = "<group>";
 		};
+		18E0A354B63748476BE2595538327E6C /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				076251AD10B5F4E8880F4C350E1D9D5A /* Animal.swift */,
+				9D172F6D749B7735D04B495330AB7FE3 /* Cat.swift */,
+				71B762588C78E0A95319F5BB534965BE /* Category.swift */,
+				6AEDC82569B65EDA2A3D12E1F9B8A2D8 /* Dog.swift */,
+				93B41BBA87E8FD7BD3513CD49733EB30 /* FormatTest.swift */,
+				176079DAA9CD16ADABA2C18C289C529D /* InlineResponse200.swift */,
+				0C24509ECAD94A91B30D87D8B2DEEB9B /* Model200Response.swift */,
+				17CBD3DEAD30C207791B4B1A5AD66991 /* ModelReturn.swift */,
+				C295084120B300E8BDB7B91981B104FC /* Name.swift */,
+				A3CC2D1A2A451C0A3C4DBD6D7E117C01 /* ObjectReturn.swift */,
+				91579AC4E335E76904DB4DB54228CC42 /* Order.swift */,
+				A29C027BA870C5E7975BF50087CAE384 /* Pet.swift */,
+				DED58811444E6D32A1F7B372F034DB7A /* SpecialModelName.swift */,
+				C716D7A2A32272C40DFA0AAC76DC0E1E /* Tag.swift */,
+				D513E5F3C28C7B452E79AE279B71813D /* User.swift */,
+			);
+			path = Models;
+			sourceTree = "<group>";
+		};
 		1D2330E920AD5F6E4655BE449D006A77 /* Support Files */ = {
 			isa = PBXGroup;
 			children = (
@@ -376,20 +406,6 @@
 			name = "Development Pods";
 			sourceTree = "<group>";
 		};
-		2B28CE488E7531BE86FAB354C15AD30E /* Swaggers */ = {
-			isa = PBXGroup;
-			children = (
-				2B25BD9A4F08A3124D223BDB55576886 /* AlamofireImplementations.swift */,
-				A4B4E403BC5209472D6DA0EEF82A8BD9 /* APIHelper.swift */,
-				7220AB25575F15EB89521DFE33F4B764 /* APIs.swift */,
-				84A386C655413763AEE8133A102DF2C8 /* Extensions.swift */,
-				A360D2EE0575D36C8C8459BCB8325D9A /* Models.swift */,
-				ADCA66FBD4BDE0A0E2B51D3E13DCA949 /* APIs */,
-				8781DE8648430F3693508310D0B40CA0 /* Models */,
-			);
-			path = Swaggers;
-			sourceTree = "<group>";
-		};
 		75D98FF52E597A11900E131B6C4E1ADA /* Pods */ = {
 			isa = PBXGroup;
 			children = (
@@ -469,24 +485,6 @@
 			name = QuartzCore;
 			sourceTree = "<group>";
 		};
-		8781DE8648430F3693508310D0B40CA0 /* Models */ = {
-			isa = PBXGroup;
-			children = (
-				6D0925CA00A7877078F60FAD44E2DD0F /* Category.swift */,
-				94FB3F3CEFBA56B306D034B69144C68E /* InlineResponse200.swift */,
-				A02D16E80C10DF32F2A88A66B83D7DD9 /* Model200Response.swift */,
-				BEA71A34D3031D95E61F1082A5BEEB7A /* ModelReturn.swift */,
-				2F98C30F79A0AB5920FB4CDBB7413E5C /* Name.swift */,
-				A58E34C4DDB909B2CA900747C6691A5A /* ObjectReturn.swift */,
-				EE5E0F8BA6AB1430D31588F5EB170889 /* Order.swift */,
-				C909E10C22B35220020268EF2BF27E18 /* Pet.swift */,
-				F7F371E5E2A26613C4DE253F4D7A3F56 /* SpecialModelName.swift */,
-				780827122613E6D246695ADFAA7B28B6 /* Tag.swift */,
-				71972929AF72164C887BB8F5F1059089 /* User.swift */,
-			);
-			path = Models;
-			sourceTree = "<group>";
-		};
 		8EA2A359F1831ACBB15BAAEA04D6FB95 /* UIKit */ = {
 			isa = PBXGroup;
 			children = (
@@ -578,21 +576,11 @@
 		AD94092456F8ABCB18F74CAC75AD85DE /* Classes */ = {
 			isa = PBXGroup;
 			children = (
-				2B28CE488E7531BE86FAB354C15AD30E /* Swaggers */,
+				DFFDD7A6740B9120EF97F5F72A59157D /* Swaggers */,
 			);
 			path = Classes;
 			sourceTree = "<group>";
 		};
-		ADCA66FBD4BDE0A0E2B51D3E13DCA949 /* APIs */ = {
-			isa = PBXGroup;
-			children = (
-				1A44CBCE721F71F03C7758DB3F36CDFF /* PetAPI.swift */,
-				A27DF5A602B1BB474A141C895934F712 /* StoreAPI.swift */,
-				094C870CE73CCEC940F4DA86D7FE0C30 /* UserAPI.swift */,
-			);
-			path = APIs;
-			sourceTree = "<group>";
-		};
 		B7B80995527643776607AFFA75B91E24 /* Targets Support Files */ = {
 			isa = PBXGroup;
 			children = (
@@ -629,6 +617,16 @@
 			name = CorePromise;
 			sourceTree = "<group>";
 		};
+		CA9F1413BA9B41923CFFA1AAB2765441 /* APIs */ = {
+			isa = PBXGroup;
+			children = (
+				9F2773E2F96E394825BE86FA45E48132 /* PetAPI.swift */,
+				1C7FF1C1E487B6795C5F6734CCA49DF3 /* StoreAPI.swift */,
+				AD05F019D163F2D5FE7C8E64C1D2E299 /* UserAPI.swift */,
+			);
+			path = APIs;
+			sourceTree = "<group>";
+		};
 		CF22FA3EE19C3EC42FEBA1247EB70D85 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
@@ -663,6 +661,20 @@
 			path = PromiseKit;
 			sourceTree = "<group>";
 		};
+		DFFDD7A6740B9120EF97F5F72A59157D /* Swaggers */ = {
+			isa = PBXGroup;
+			children = (
+				CAA644003A8DF304D35F77FE04B8AB17 /* AlamofireImplementations.swift */,
+				2E506C8F40F5AD602D83B383EAA7C0CD /* APIHelper.swift */,
+				323E5DCC342B03D7AE59F37523D2626A /* APIs.swift */,
+				2BAE461B3A62164A09480E8967D29E64 /* Extensions.swift */,
+				6A60B64E388679F589CB959AA5FC4787 /* Models.swift */,
+				CA9F1413BA9B41923CFFA1AAB2765441 /* APIs */,
+				18E0A354B63748476BE2595538327E6C /* Models */,
+			);
+			path = Swaggers;
+			sourceTree = "<group>";
+		};
 		E73D9BF152C59F341559DE62A3143721 /* PetstoreClient */ = {
 			isa = PBXGroup;
 			children = (
@@ -713,6 +725,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		661BAF8916A434EEB8B0CDCC39DF19C2 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				F1E37BB11F68A6A76DF44B230F965E05 /* PetstoreClient-umbrella.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		7E1332ABD911123D7A873D6D87E2F182 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -732,29 +752,21 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		A11C62D33B885E6DA9FECD0493A47746 /* Headers */ = {
+		CC349308BCECD7B68C93EB3091B72E61 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E6B182F5E233FB9F529BEFEAD3D02ACF /* AnyPromise.h in Headers */,
-				2676E85B9644D55E25A31D3CE61A5726 /* CALayer+AnyPromise.h in Headers */,
-				0D6DCC756D1B0B68ADB5F805D575BAB6 /* NSError+Cancellation.h in Headers */,
-				1372840E154B63D17AACD1257C3E0520 /* NSNotificationCenter+AnyPromise.h in Headers */,
-				CCA3921F36A6B36DC1F993112BEF0602 /* NSURLConnection+AnyPromise.h in Headers */,
-				F8DAC10D25E6E36B83261AC032A77F1A /* PromiseKit.h in Headers */,
-				D55A97CF31106A21298F731FC890BCA1 /* UIActionSheet+AnyPromise.h in Headers */,
-				C96CB79BD56A7931541FC22617A2D613 /* UIAlertView+AnyPromise.h in Headers */,
-				02D0672068E53F2D98CC67FBA5278022 /* UIView+AnyPromise.h in Headers */,
-				C04283A3B7479C8EDE2B95F4DDEE2C2C /* UIViewController+AnyPromise.h in Headers */,
-				AC30241BA84931703B312A09DD64C648 /* Umbrella.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		BE7D2FA2E9F1656CC6B0266B63C0D938 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				64739E341A52DFA48F4169E4322E7486 /* PetstoreClient-umbrella.h in Headers */,
+				D258F1E893340393ADABCB02B9FBA206 /* AnyPromise.h in Headers */,
+				995CE773471ADA3D5FEB52DF624174C6 /* CALayer+AnyPromise.h in Headers */,
+				7BCBC4FD2E385CAFC5F3949FFFFE2095 /* NSError+Cancellation.h in Headers */,
+				752EACD07B4F948C1F24E0583C5DA165 /* NSNotificationCenter+AnyPromise.h in Headers */,
+				E62ABEDB4D7B179589B75C8423C5BF9B /* NSURLConnection+AnyPromise.h in Headers */,
+				1DB7E23C2A2A8D4B5CE046135E4540C6 /* PromiseKit.h in Headers */,
+				63AF5DF795F5D610768B4AF53C7E9976 /* UIActionSheet+AnyPromise.h in Headers */,
+				97BDDBBB6BA36B90E98FCD53B9AE171A /* UIAlertView+AnyPromise.h in Headers */,
+				E74976C9C4A5EF60B0A9CA1285693DDF /* UIView+AnyPromise.h in Headers */,
+				66B8591A8CCC9760D933506B71A13962 /* UIViewController+AnyPromise.h in Headers */,
+				CA0AABE1706F8B94DC37330AB2BC062C /* Umbrella.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -795,6 +807,25 @@
 			productReference = EBC4140FCBB5B4D3A955B1608C165C04 /* Alamofire.framework */;
 			productType = "com.apple.product-type.framework";
 		};
+		57958C5706F810052A634C1714567A9F /* PetstoreClient */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = C36F9DFB9BBE472AD46194868C8F885B /* Build configuration list for PBXNativeTarget "PetstoreClient" */;
+			buildPhases = (
+				85A7E0C7933D1BC0EB062F281D1F19AD /* Sources */,
+				783E7A91F3C3404EDF234C828FCA6543 /* Frameworks */,
+				661BAF8916A434EEB8B0CDCC39DF19C2 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				F6093ED00F5D11A44F55549F1A4C778F /* PBXTargetDependency */,
+				38BE3993D1A8CA768731BA0465C21F17 /* PBXTargetDependency */,
+			);
+			name = PetstoreClient;
+			productName = PetstoreClient;
+			productReference = E160B50E4D11692AA38E74C897D69C61 /* PetstoreClient.framework */;
+			productType = "com.apple.product-type.framework";
+		};
 		7A5DBD588D2CC1C0CB1C42D4ED613FE4 /* Pods */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 8CB3C5DF3F4B6413A6F2D003B58CCF32 /* Build configuration list for PBXNativeTarget "Pods" */;
@@ -816,43 +847,24 @@
 			productReference = D931A99C6B5A8E0F69C818C6ECC3C44F /* Pods.framework */;
 			productType = "com.apple.product-type.framework";
 		};
-		A348BE32D0894EA7204BDCB3F0DF636F /* PromiseKit */ = {
+		D9A01D449983C8E3EF61C0CA4A7D8F59 /* PromiseKit */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 8567709BC3BD98E81A0E9B5AD85D011F /* Build configuration list for PBXNativeTarget "PromiseKit" */;
+			buildConfigurationList = FCAE2E57B1A9453B9D35EF9071C4C581 /* Build configuration list for PBXNativeTarget "PromiseKit" */;
 			buildPhases = (
-				FCE6B9AB03DB341C5159F1510AAA9722 /* Sources */,
-				C5452032741F5F809522C754A4393C4A /* Frameworks */,
-				A11C62D33B885E6DA9FECD0493A47746 /* Headers */,
+				E0A9A1079F8923D78CC7F6D7F87CD779 /* Sources */,
+				DBF65F787DDFE72646CDC44CF9E22784 /* Frameworks */,
+				CC349308BCECD7B68C93EB3091B72E61 /* Headers */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				DDA10AB05EE4CD847D1133226B79818E /* PBXTargetDependency */,
+				A48A5E27A5C878B373F0FE7365829141 /* PBXTargetDependency */,
 			);
 			name = PromiseKit;
 			productName = PromiseKit;
 			productReference = D4248CF20178C57CEFEFAAF453C0DC75 /* PromiseKit.framework */;
 			productType = "com.apple.product-type.framework";
 		};
-		E1B34E9A45508C6EDDA7F25D88C85434 /* PetstoreClient */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 715B91C131A5E33AED9768BD75742013 /* Build configuration list for PBXNativeTarget "PetstoreClient" */;
-			buildPhases = (
-				A6723A33627D0A815D42193CACD7E74A /* Sources */,
-				4B81AD7DF193F182592D3F3510F50796 /* Frameworks */,
-				BE7D2FA2E9F1656CC6B0266B63C0D938 /* Headers */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				0D6B2D0CAE4FAFE97E7D7D0EC2C6DCE0 /* PBXTargetDependency */,
-				A102D2D546E8C75239F44407687481EE /* PBXTargetDependency */,
-			);
-			name = PetstoreClient;
-			productName = PetstoreClient;
-			productReference = E160B50E4D11692AA38E74C897D69C61 /* PetstoreClient.framework */;
-			productType = "com.apple.product-type.framework";
-		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
@@ -876,9 +888,9 @@
 			targets = (
 				432ECC54282C84882B482CCB4CF227FC /* Alamofire */,
 				190ACD3A51BC90B85EADB13E9CDD207B /* OMGHTTPURLRQ */,
-				E1B34E9A45508C6EDDA7F25D88C85434 /* PetstoreClient */,
+				57958C5706F810052A634C1714567A9F /* PetstoreClient */,
 				7A5DBD588D2CC1C0CB1C42D4ED613FE4 /* Pods */,
-				A348BE32D0894EA7204BDCB3F0DF636F /* PromiseKit */,
+				D9A01D449983C8E3EF61C0CA4A7D8F59 /* PromiseKit */,
 			);
 		};
 /* End PBXProject section */
@@ -895,6 +907,37 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		85A7E0C7933D1BC0EB062F281D1F19AD /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				DC710F75309F7DFEA3C5AB01E9288681 /* AlamofireImplementations.swift in Sources */,
+				EB0C1A986BDF161D01919BCCCAE40D7E /* Animal.swift in Sources */,
+				4E07AC40078EBB1C88ED8700859F5A1B /* APIHelper.swift in Sources */,
+				4827FED90242878355B47A6D34BAABCA /* APIs.swift in Sources */,
+				33326318BF830A838DA62D54ADAA5ECA /* Cat.swift in Sources */,
+				7C87E63D6733AC0FE083373A5FAF86CB /* Category.swift in Sources */,
+				CE7DAD64CE27C4B98432BDB1CB0E21C7 /* Dog.swift in Sources */,
+				2308448E8874D3DAA33A1AEFEFCFBA2D /* Extensions.swift in Sources */,
+				8955A9B8A34594437C8D27C4C55BFC9E /* FormatTest.swift in Sources */,
+				AA38773839F0E81980834A7A374BA9DC /* InlineResponse200.swift in Sources */,
+				10E93502CF9CED0B6341DB95B658F2F9 /* Model200Response.swift in Sources */,
+				7DAC8F56FC00F6400AC3BF3AF79ACAFD /* ModelReturn.swift in Sources */,
+				5EECE3F98893B2D4E03DC027C57C21F3 /* Models.swift in Sources */,
+				D1E26E1C25F870E9A0AEC9240E589D75 /* Name.swift in Sources */,
+				623677B20997F5EC0F6CA695CADD410B /* ObjectReturn.swift in Sources */,
+				F4448E76D51EBACC2B20CDFE3D2D90D7 /* Order.swift in Sources */,
+				E3AB1EE3B8DECE5D55D9EB64B0D05E93 /* Pet.swift in Sources */,
+				F3D3D4088EDA3359CC0E5EBA9B683959 /* PetAPI.swift in Sources */,
+				92EEF6DC60C3CA25AA3997D2652A28F9 /* PetstoreClient-dummy.m in Sources */,
+				14FD108A5B931460A799BDCB874A99C3 /* SpecialModelName.swift in Sources */,
+				41C531C4CEDCAE196A6F92FEAE66CCF3 /* StoreAPI.swift in Sources */,
+				B9096C0EE89EC783BDDC77E1F07314E4 /* Tag.swift in Sources */,
+				895CB65D12461DA4EA243ACE8346D21F /* User.swift in Sources */,
+				0B0F79070CD75DE3CF053E58B491A3AC /* UserAPI.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		91F4D6732A1613C9660866E34445A67B /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -903,30 +946,45 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		A6723A33627D0A815D42193CACD7E74A /* Sources */ = {
+		E0A9A1079F8923D78CC7F6D7F87CD779 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C4688FFE2C4E161516878B521EF54FBE /* AlamofireImplementations.swift in Sources */,
-				B4FAA3F0ED04F0506E66FCD7141AD989 /* APIHelper.swift in Sources */,
-				B0FB5055748E072728CA7129C3CAA3C6 /* APIs.swift in Sources */,
-				3D2B170AA3737444F26B0E07E1F5FEF1 /* Category.swift in Sources */,
-				91DF85663A3771DCD35D0FF07135959B /* Extensions.swift in Sources */,
-				57FB6BF21435F091D48B97DBD36E8C7B /* InlineResponse200.swift in Sources */,
-				AB06DA1AC0FA3BDF50BAAEBBD06AB46E /* Model200Response.swift in Sources */,
-				9DA852770BE32039F2C21096F27872A0 /* ModelReturn.swift in Sources */,
-				76FAA23C0A28ECF0BBF6A5C14203F414 /* Models.swift in Sources */,
-				1B099FB3AA9A6794A3039899A6734205 /* Name.swift in Sources */,
-				63F6FFAB2BCCD07FD3DF44086E11C8B0 /* ObjectReturn.swift in Sources */,
-				0F816E94051557A7BA9BFA5B6B4A32A5 /* Order.swift in Sources */,
-				F8C6EBC22D97E301AA4EA4D04B3FC860 /* Pet.swift in Sources */,
-				8ABFD5E4F7621D554DBB12C6472A8313 /* PetAPI.swift in Sources */,
-				886AC602EE7FCFDCD2DCD470CCB41721 /* PetstoreClient-dummy.m in Sources */,
-				167B939D70FE9AADBA03ABBBBA588B4B /* SpecialModelName.swift in Sources */,
-				97A9635E99E7EB0F33260600E1AC82F6 /* StoreAPI.swift in Sources */,
-				335F10113F178E8D2984BE0602A0DEED /* Tag.swift in Sources */,
-				D46A1F4211ACD4C9EF7726AFAD2609EA /* User.swift in Sources */,
-				F70B5EF0A4B94F8FF906073882DCDB78 /* UserAPI.swift in Sources */,
+				2DF2D3E610EB6F19375570C0EBA9E77F /* after.m in Sources */,
+				B0AB13A8C68D6972CEDF64FB39D38CB4 /* after.swift in Sources */,
+				E1EB5507436EFBD58AF7B9FF051A5AC4 /* afterlife.swift in Sources */,
+				BEE4B5067218AB107DDECC8B09569EFC /* AnyPromise.m in Sources */,
+				38FE2977C973FA258977E86E1E964E02 /* AnyPromise.swift in Sources */,
+				BC9F5678D442E5AA1B14083554B7B1C8 /* CALayer+AnyPromise.m in Sources */,
+				9E7DA5C2386E5EA1D57B8C9A38D0A509 /* dispatch_promise.m in Sources */,
+				A5EBC0528F4371B43BFA5A2293089BB5 /* dispatch_promise.swift in Sources */,
+				F4E24EB57CB59F112060100A4B9E5D10 /* Error.swift in Sources */,
+				D39F4FBEE42A57E59471B2A0997FE4CF /* hang.m in Sources */,
+				7CE6DE14AB43CB51B4D5C5BA4293C47B /* join.m in Sources */,
+				72B2C8A6E81C1E99E6093BE3BDBDE554 /* join.swift in Sources */,
+				445F515F4FAB3537878E1377562BBBA7 /* NSNotificationCenter+AnyPromise.m in Sources */,
+				F4C2BD51185019A010DA83458B007F81 /* NSNotificationCenter+Promise.swift in Sources */,
+				8809E3D6CC478B4AC9FA6C2389A5447F /* NSObject+Promise.swift in Sources */,
+				8C749DAB8EA0585A7A5769F38CB33CBC /* NSURLConnection+AnyPromise.m in Sources */,
+				7120EA2BF0D3942FF9CE0EDABBF86BA1 /* NSURLConnection+Promise.swift in Sources */,
+				BCCC0421EE641F782CA295FBD240E2E1 /* NSURLSession+Promise.swift in Sources */,
+				82BEAE7085889DB1A860FE690273EA7E /* PMKAlertController.swift in Sources */,
+				D839A38DEEDDB887F186714D75E73431 /* Promise+Properties.swift in Sources */,
+				994580EAAB3547FFCA0E969378A7AC2E /* Promise.swift in Sources */,
+				5E46AC6FA35723E095C2EB6ED23C0510 /* PromiseKit-dummy.m in Sources */,
+				81970BD13A497C0962CBEA922C1DAB3E /* race.swift in Sources */,
+				D2C7190FC2A0F2868EB7C89F5CFA526B /* State.swift in Sources */,
+				D57DA5AC37CE3CEA92958C9528F80FD9 /* UIActionSheet+AnyPromise.m in Sources */,
+				AC6DCF4BF95F44A46CF6BC9230AD6604 /* UIActionSheet+Promise.swift in Sources */,
+				655C3826275A76D04835F2336AC87A91 /* UIAlertView+AnyPromise.m in Sources */,
+				5FDCAFE73B791C4A4B863C9D65F6CF7B /* UIAlertView+Promise.swift in Sources */,
+				FF5CD62C722D6A68AD65462B56D7CB72 /* UIView+AnyPromise.m in Sources */,
+				660435DF96CE68B3A3E078030C5F54FA /* UIView+Promise.swift in Sources */,
+				C5EEED0AFF5E2C5AAE2A646689B73DA3 /* UIViewController+AnyPromise.m in Sources */,
+				7D38A3624822DA504D0FBD9F4EA485BA /* UIViewController+Promise.swift in Sources */,
+				B2C0216914777E4B58E1827D854886C2 /* URLDataPromise.swift in Sources */,
+				1A4D55F76DCB3489302BC425F4DB1C04 /* when.m in Sources */,
+				DCFE64070EE0BB77557935AD2A4ABF62 /* when.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -952,67 +1010,25 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		FCE6B9AB03DB341C5159F1510AAA9722 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				76171B607A443BE97E1DBBF6575CD558 /* after.m in Sources */,
-				03790817CF6E76959C0F7E2D0734E9F6 /* after.swift in Sources */,
-				4CE2B026C746F263F6B95534A35E76C0 /* afterlife.swift in Sources */,
-				F049FFBDC929BB045C2AEDF0ECABE513 /* AnyPromise.m in Sources */,
-				D854F67FD7486C6D25CA841C7D2D5030 /* AnyPromise.swift in Sources */,
-				6EA827E0ECB8F7CC49F8B4C92A1D93FA /* CALayer+AnyPromise.m in Sources */,
-				E8DDC87F287107068FF40443CF059433 /* dispatch_promise.m in Sources */,
-				E93C3C3AABF32094F0D673E3EC3B2C20 /* dispatch_promise.swift in Sources */,
-				A2A8512E15D1A4B6DBD515D6144EC083 /* Error.swift in Sources */,
-				B72EE02E33CE31F594630D54EEEF9A15 /* hang.m in Sources */,
-				C95D8B9276E75DA8F6DECCDCE147C781 /* join.m in Sources */,
-				BFA18BBF784D749FE8BFA654088F3630 /* join.swift in Sources */,
-				D78AD94D0DBA6A1CC4E6673D2F14C832 /* NSNotificationCenter+AnyPromise.m in Sources */,
-				0BA72DC6AB26C72EE080F8A08CE41643 /* NSNotificationCenter+Promise.swift in Sources */,
-				435BD7136E0E174C6A8811D6C88DEAF2 /* NSObject+Promise.swift in Sources */,
-				405F6EBE4BBAAC270AF1B97AFC5B0C16 /* NSURLConnection+AnyPromise.m in Sources */,
-				36CDD7A6638E10B9107C74D9B75079F1 /* NSURLConnection+Promise.swift in Sources */,
-				9254814FE352958B5270E874E5CCD394 /* NSURLSession+Promise.swift in Sources */,
-				FA78EA5177275F71FD7F2C52F6B7518D /* PMKAlertController.swift in Sources */,
-				964EA2E9AA68D7D587ED15143FEC4BE5 /* Promise+Properties.swift in Sources */,
-				222C92305B7AC5BB8E2ABAD182F50026 /* Promise.swift in Sources */,
-				EC5B36837863572EC400633CD2FFAF94 /* PromiseKit-dummy.m in Sources */,
-				B908D3F77F293FC72B20EEB48208F5C6 /* race.swift in Sources */,
-				291E2518A9E470C2E9CE1B69C088C16F /* State.swift in Sources */,
-				82B5B0FF21A9A28284AE7F1124199D3F /* UIActionSheet+AnyPromise.m in Sources */,
-				0290D4A3795396ABBB81E632E5AADE3A /* UIActionSheet+Promise.swift in Sources */,
-				42A66FBE567A7F5B2136FC56BFF4874A /* UIAlertView+AnyPromise.m in Sources */,
-				08B247165C2A091EE24F79D73F8ABEC9 /* UIAlertView+Promise.swift in Sources */,
-				19DAC977B6B3CBDC69EE2150BD0C1EF6 /* UIView+AnyPromise.m in Sources */,
-				99710CDCDDFF9ED74B8E01EB8E4BF563 /* UIView+Promise.swift in Sources */,
-				5EADA3CE22BF3B74E759F948DE7A66F1 /* UIViewController+AnyPromise.m in Sources */,
-				E6810077387057466534FD27AA294211 /* UIViewController+Promise.swift in Sources */,
-				37027676CEABF1BF753684A06C2DCDDB /* URLDataPromise.swift in Sources */,
-				BF2A197091B6FC0646CFA61A5FBE66AF /* when.m in Sources */,
-				4EAB3713B40959FB2E0CDEAC8BDE1116 /* when.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		0D6B2D0CAE4FAFE97E7D7D0EC2C6DCE0 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = Alamofire;
-			target = 432ECC54282C84882B482CCB4CF227FC /* Alamofire */;
-			targetProxy = 098BDC6B6850C9E726FB5016BB254FC7 /* PBXContainerItemProxy */;
-		};
 		2673248EF608AB8375FABCFDA8141072 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = PetstoreClient;
-			target = E1B34E9A45508C6EDDA7F25D88C85434 /* PetstoreClient */;
+			target = 57958C5706F810052A634C1714567A9F /* PetstoreClient */;
 			targetProxy = 014385BD85FA83B60A03ADE9E8844F33 /* PBXContainerItemProxy */;
 		};
+		38BE3993D1A8CA768731BA0465C21F17 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = PromiseKit;
+			target = D9A01D449983C8E3EF61C0CA4A7D8F59 /* PromiseKit */;
+			targetProxy = EEB067570D28F14A138B737F596BCB1A /* PBXContainerItemProxy */;
+		};
 		5433AD51A3DC696530C96B8A7D78ED7D /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = PromiseKit;
-			target = A348BE32D0894EA7204BDCB3F0DF636F /* PromiseKit */;
+			target = D9A01D449983C8E3EF61C0CA4A7D8F59 /* PromiseKit */;
 			targetProxy = B5FB8931CDF8801206EDD2FEF94793BF /* PBXContainerItemProxy */;
 		};
 		64142DAEC5D96F7E876BBE00917C0E9D /* PBXTargetDependency */ = {
@@ -1021,17 +1037,17 @@
 			target = 432ECC54282C84882B482CCB4CF227FC /* Alamofire */;
 			targetProxy = 769630CDAAA8C24AA5B4C81A85C45AC8 /* PBXContainerItemProxy */;
 		};
-		A102D2D546E8C75239F44407687481EE /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = PromiseKit;
-			target = A348BE32D0894EA7204BDCB3F0DF636F /* PromiseKit */;
-			targetProxy = 11BAC0C3DDD46F7C7EA2DE10681BBE09 /* PBXContainerItemProxy */;
-		};
-		DDA10AB05EE4CD847D1133226B79818E /* PBXTargetDependency */ = {
+		A48A5E27A5C878B373F0FE7365829141 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = OMGHTTPURLRQ;
 			target = 190ACD3A51BC90B85EADB13E9CDD207B /* OMGHTTPURLRQ */;
-			targetProxy = BAB3DC0D4AB6EA5B20F7BA63A3F779EC /* PBXContainerItemProxy */;
+			targetProxy = 23252B1F29F10BD972ECD7BA34F20EA8 /* PBXContainerItemProxy */;
+		};
+		F6093ED00F5D11A44F55549F1A4C778F /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = Alamofire;
+			target = 432ECC54282C84882B482CCB4CF227FC /* Alamofire */;
+			targetProxy = 56AF0748FFC13AD34ECC967C04930EF8 /* PBXContainerItemProxy */;
 		};
 		F74DEE1C89F05CC835997330B0E3B7C1 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
@@ -1128,33 +1144,6 @@
 			};
 			name = Debug;
 		};
-		3BDAD538EAD1230A7FDC1A3BD8F3005E /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = DADAB10704E49D6B9E18F59F995BB88F /* PetstoreClient.xcconfig */;
-			buildSettings = {
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_PREFIX_HEADER = "Target Support Files/PetstoreClient/PetstoreClient-prefix.pch";
-				INFOPLIST_FILE = "Target Support Files/PetstoreClient/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MODULEMAP_FILE = "Target Support Files/PetstoreClient/PetstoreClient.modulemap";
-				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_NAME = PetstoreClient;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Release;
-		};
 		4D5CD4E08FD8D405881C59A5535E6CE8 /* Release */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 16D7C901D915C251DEBA27AC1EF57E34 /* OMGHTTPURLRQ.xcconfig */;
@@ -1182,7 +1171,34 @@
 			};
 			name = Release;
 		};
-		79AE81D89452EFFAB0143A9C7CD108DC /* Release */ = {
+		6FD241CD58AB51A79661DD6FAEA92DBD /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DADAB10704E49D6B9E18F59F995BB88F /* PetstoreClient.xcconfig */;
+			buildSettings = {
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_PREFIX_HEADER = "Target Support Files/PetstoreClient/PetstoreClient-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/PetstoreClient/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/PetstoreClient/PetstoreClient.modulemap";
+				MTL_ENABLE_DEBUG_INFO = NO;
+				PRODUCT_NAME = PetstoreClient;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		80A78EC79E146B38BA17527C9588FE35 /* Release */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = CC49FF2A84C0E0E9349747D94036B728 /* PromiseKit.xcconfig */;
 			buildSettings = {
@@ -1275,35 +1291,7 @@
 			};
 			name = Debug;
 		};
-		B11D8789540F26AC42B990A7825BC01A /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = DADAB10704E49D6B9E18F59F995BB88F /* PetstoreClient.xcconfig */;
-			buildSettings = {
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_PREFIX_HEADER = "Target Support Files/PetstoreClient/PetstoreClient-prefix.pch";
-				INFOPLIST_FILE = "Target Support Files/PetstoreClient/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MODULEMAP_FILE = "Target Support Files/PetstoreClient/PetstoreClient.modulemap";
-				MTL_ENABLE_DEBUG_INFO = YES;
-				PRODUCT_NAME = PetstoreClient;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Debug;
-		};
-		BBB0CFD9A19744A94202BA4ADC92A507 /* Debug */ = {
+		AE41315F8FBD1AB94C4250498DEAAFE5 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = CC49FF2A84C0E0E9349747D94036B728 /* PromiseKit.xcconfig */;
 			buildSettings = {
@@ -1331,6 +1319,34 @@
 			};
 			name = Debug;
 		};
+		BA9437D357EA08C2BE7C3B5F7555E7E7 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DADAB10704E49D6B9E18F59F995BB88F /* PetstoreClient.xcconfig */;
+			buildSettings = {
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_PREFIX_HEADER = "Target Support Files/PetstoreClient/PetstoreClient-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/PetstoreClient/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/PetstoreClient/PetstoreClient.modulemap";
+				MTL_ENABLE_DEBUG_INFO = YES;
+				PRODUCT_NAME = PetstoreClient;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
 		C5A18280E9321A9268D1C80B7DA43967 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -1416,24 +1432,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		715B91C131A5E33AED9768BD75742013 /* Build configuration list for PBXNativeTarget "PetstoreClient" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				B11D8789540F26AC42B990A7825BC01A /* Debug */,
-				3BDAD538EAD1230A7FDC1A3BD8F3005E /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		8567709BC3BD98E81A0E9B5AD85D011F /* Build configuration list for PBXNativeTarget "PromiseKit" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				BBB0CFD9A19744A94202BA4ADC92A507 /* Debug */,
-				79AE81D89452EFFAB0143A9C7CD108DC /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		8B2B2DA2F7F80D41B1FDB5FACFA4B3DE /* Build configuration list for PBXNativeTarget "Alamofire" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -1452,6 +1450,24 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		C36F9DFB9BBE472AD46194868C8F885B /* Build configuration list for PBXNativeTarget "PetstoreClient" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				BA9437D357EA08C2BE7C3B5F7555E7E7 /* Debug */,
+				6FD241CD58AB51A79661DD6FAEA92DBD /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		FCAE2E57B1A9453B9D35EF9071C4C581 /* Build configuration list for PBXNativeTarget "PromiseKit" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				AE41315F8FBD1AB94C4250498DEAAFE5 /* Debug */,
+				80A78EC79E146B38BA17527C9588FE35 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 /* End XCConfigurationList section */
 	};
 	rootObject = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
diff --git a/samples/client/petstore/tizen/client/SamiApiResponse.cpp b/samples/client/petstore/tizen/client/SamiApiResponse.cpp
new file mode 100644
index 00000000000..9df400fff84
--- /dev/null
+++ b/samples/client/petstore/tizen/client/SamiApiResponse.cpp
@@ -0,0 +1,203 @@
+
+#include "SamiApiResponse.h"
+#include <FLocales.h>
+
+using namespace Tizen::Base;
+using namespace Tizen::System;
+using namespace Tizen::Base::Utility;
+using namespace Tizen::Base::Collection;
+using namespace Tizen::Web::Json;
+using namespace Tizen::Locales;
+
+
+namespace Swagger {
+
+SamiApiResponse::SamiApiResponse() {
+    init();
+}
+
+SamiApiResponse::~SamiApiResponse() {
+    this->cleanup();
+}
+
+void
+SamiApiResponse::init() {
+    pCode = null;
+pType = null;
+pMessage = null;
+}
+
+void
+SamiApiResponse::cleanup() {
+    if(pCode != null) {
+        
+        delete pCode;
+        pCode = null;
+    }
+if(pType != null) {
+        
+        delete pType;
+        pType = null;
+    }
+if(pMessage != null) {
+        
+        delete pMessage;
+        pMessage = null;
+    }
+}
+
+
+SamiApiResponse*
+SamiApiResponse::fromJson(String* json) {
+    this->cleanup();
+    String str(json->GetPointer());
+    int length = str.GetLength();
+
+    ByteBuffer buffer;
+    buffer.Construct(length);
+
+    for (int i = 0; i < length; ++i) {
+       byte b = str[i];
+       buffer.SetByte(b);
+    }
+
+    IJsonValue* pJson = JsonParser::ParseN(buffer);
+    fromJsonObject(pJson);
+    if (pJson->GetType() == JSON_TYPE_OBJECT) {
+       JsonObject* pObject = static_cast< JsonObject* >(pJson);
+       pObject->RemoveAll(true);
+    }
+    else if (pJson->GetType() == JSON_TYPE_ARRAY) {
+       JsonArray* pArray = static_cast< JsonArray* >(pJson);
+       pArray->RemoveAll(true);
+    }
+    delete pJson;
+    return this;
+}
+
+
+void
+SamiApiResponse::fromJsonObject(IJsonValue* pJson) {
+    JsonObject* pJsonObject = static_cast< JsonObject* >(pJson);
+
+    if(pJsonObject != null) {
+        JsonString* pCodeKey = new JsonString(L"code");
+        IJsonValue* pCodeVal = null;
+        pJsonObject->GetValue(pCodeKey, pCodeVal);
+        if(pCodeVal != null) {
+            
+            pCode = new Integer();
+            jsonToValue(pCode, pCodeVal, L"Integer", L"Integer");
+        }
+        delete pCodeKey;
+JsonString* pTypeKey = new JsonString(L"type");
+        IJsonValue* pTypeVal = null;
+        pJsonObject->GetValue(pTypeKey, pTypeVal);
+        if(pTypeVal != null) {
+            
+            pType = new String();
+            jsonToValue(pType, pTypeVal, L"String", L"String");
+        }
+        delete pTypeKey;
+JsonString* pMessageKey = new JsonString(L"message");
+        IJsonValue* pMessageVal = null;
+        pJsonObject->GetValue(pMessageKey, pMessageVal);
+        if(pMessageVal != null) {
+            
+            pMessage = new String();
+            jsonToValue(pMessage, pMessageVal, L"String", L"String");
+        }
+        delete pMessageKey;
+    }
+}
+
+SamiApiResponse::SamiApiResponse(String* json) {
+    init();
+    String str(json->GetPointer());
+    int length = str.GetLength();
+
+    ByteBuffer buffer;
+    buffer.Construct(length);
+
+    for (int i = 0; i < length; ++i) {
+       byte b = str[i];
+       buffer.SetByte(b);
+    }
+
+    IJsonValue* pJson = JsonParser::ParseN(buffer);
+    fromJsonObject(pJson);
+    if (pJson->GetType() == JSON_TYPE_OBJECT) {
+       JsonObject* pObject = static_cast< JsonObject* >(pJson);
+       pObject->RemoveAll(true);
+    }
+    else if (pJson->GetType() == JSON_TYPE_ARRAY) {
+       JsonArray* pArray = static_cast< JsonArray* >(pJson);
+       pArray->RemoveAll(true);
+    }
+    delete pJson;
+}
+
+String
+SamiApiResponse::asJson ()
+{
+    JsonObject* pJsonObject = asJsonObject();
+
+    char *pComposeBuf = new char[256];
+    JsonWriter::Compose(pJsonObject, pComposeBuf, 256);
+    String s = String(pComposeBuf);
+
+    delete pComposeBuf;
+    pJsonObject->RemoveAll(true);
+    delete pJsonObject;
+
+    return s;
+}
+
+JsonObject*
+SamiApiResponse::asJsonObject() {
+    JsonObject *pJsonObject = new JsonObject();
+    pJsonObject->Construct();
+
+    JsonString *pCodeKey = new JsonString(L"code");
+    pJsonObject->Add(pCodeKey, toJson(getPCode(), "Integer", ""));
+
+    JsonString *pTypeKey = new JsonString(L"type");
+    pJsonObject->Add(pTypeKey, toJson(getPType(), "String", ""));
+
+    JsonString *pMessageKey = new JsonString(L"message");
+    pJsonObject->Add(pMessageKey, toJson(getPMessage(), "String", ""));
+
+    return pJsonObject;
+}
+
+Integer*
+SamiApiResponse::getPCode() {
+    return pCode;
+}
+void
+SamiApiResponse::setPCode(Integer* pCode) {
+    this->pCode = pCode;
+}
+
+String*
+SamiApiResponse::getPType() {
+    return pType;
+}
+void
+SamiApiResponse::setPType(String* pType) {
+    this->pType = pType;
+}
+
+String*
+SamiApiResponse::getPMessage() {
+    return pMessage;
+}
+void
+SamiApiResponse::setPMessage(String* pMessage) {
+    this->pMessage = pMessage;
+}
+
+
+
+} /* namespace Swagger */
+
diff --git a/samples/client/petstore/tizen/client/SamiApiResponse.h b/samples/client/petstore/tizen/client/SamiApiResponse.h
new file mode 100644
index 00000000000..96964cc59bb
--- /dev/null
+++ b/samples/client/petstore/tizen/client/SamiApiResponse.h
@@ -0,0 +1,59 @@
+/*
+ * SamiApiResponse.h
+ * 
+ * 
+ */
+
+#ifndef SamiApiResponse_H_
+#define SamiApiResponse_H_
+
+#include <FApp.h>
+#include <FBase.h>
+#include <FSystem.h>
+#include <FWebJson.h>
+#include "SamiHelpers.h"
+#include "SamiObject.h"
+
+using namespace Tizen::Web::Json;
+
+
+using Tizen::Base::Integer;
+using Tizen::Base::String;
+
+
+namespace Swagger {
+
+class SamiApiResponse: public SamiObject {
+public:
+    SamiApiResponse();
+    SamiApiResponse(String* json);
+    virtual ~SamiApiResponse();
+
+    void init();
+
+    void cleanup();
+
+    String asJson ();
+
+    JsonObject* asJsonObject();
+
+    void fromJsonObject(IJsonValue* json);
+
+    SamiApiResponse* fromJson(String* obj);
+
+    Integer* getPCode();
+    void setPCode(Integer* pCode);
+    String* getPType();
+    void setPType(String* pType);
+    String* getPMessage();
+    void setPMessage(String* pMessage);
+
+private:
+    Integer* pCode;
+String* pType;
+String* pMessage;
+};
+
+} /* namespace Swagger */
+
+#endif /* SamiApiResponse_H_ */
diff --git a/samples/client/petstore/tizen/client/SamiCategory.cpp b/samples/client/petstore/tizen/client/SamiCategory.cpp
index 185b1f9d895..e0573f5a8f4 100644
--- a/samples/client/petstore/tizen/client/SamiCategory.cpp
+++ b/samples/client/petstore/tizen/client/SamiCategory.cpp
@@ -23,8 +23,7 @@ SamiCategory::~SamiCategory() {
 void
 SamiCategory::init() {
     pId = null;
-    pName = null;
-    
+pName = null;
 }
 
 void
@@ -34,12 +33,11 @@ SamiCategory::cleanup() {
         delete pId;
         pId = null;
     }
-    if(pName != null) {
+if(pName != null) {
         
         delete pName;
         pName = null;
     }
-    
 }
 
 
@@ -86,7 +84,7 @@ SamiCategory::fromJsonObject(IJsonValue* pJson) {
             jsonToValue(pId, pIdVal, L"Long", L"Long");
         }
         delete pIdKey;
-        JsonString* pNameKey = new JsonString(L"name");
+JsonString* pNameKey = new JsonString(L"name");
         IJsonValue* pNameVal = null;
         pJsonObject->GetValue(pNameKey, pNameVal);
         if(pNameVal != null) {
@@ -95,7 +93,6 @@ SamiCategory::fromJsonObject(IJsonValue* pJson) {
             jsonToValue(pName, pNameVal, L"String", L"String");
         }
         delete pNameKey;
-        
     }
 }
 
@@ -146,15 +143,12 @@ SamiCategory::asJsonObject() {
     JsonObject *pJsonObject = new JsonObject();
     pJsonObject->Construct();
 
-    
     JsonString *pIdKey = new JsonString(L"id");
     pJsonObject->Add(pIdKey, toJson(getPId(), "Long", ""));
 
-    
     JsonString *pNameKey = new JsonString(L"name");
     pJsonObject->Add(pNameKey, toJson(getPName(), "String", ""));
 
-    
     return pJsonObject;
 }
 
diff --git a/samples/client/petstore/tizen/client/SamiCategory.h b/samples/client/petstore/tizen/client/SamiCategory.h
index a361ea047fa..d647616809d 100644
--- a/samples/client/petstore/tizen/client/SamiCategory.h
+++ b/samples/client/petstore/tizen/client/SamiCategory.h
@@ -41,18 +41,14 @@ public:
 
     SamiCategory* fromJson(String* obj);
 
-    
     Long* getPId();
     void setPId(Long* pId);
-    
     String* getPName();
     void setPName(String* pName);
-    
 
 private:
     Long* pId;
-    String* pName;
-    
+String* pName;
 };
 
 } /* namespace Swagger */
diff --git a/samples/client/petstore/tizen/client/SamiModelFactory.h b/samples/client/petstore/tizen/client/SamiModelFactory.h
index a2e1ab0e0de..29f0e691494 100644
--- a/samples/client/petstore/tizen/client/SamiModelFactory.h
+++ b/samples/client/petstore/tizen/client/SamiModelFactory.h
@@ -3,29 +3,33 @@
 
 #include "SamiObject.h"
 
-#include "SamiUser.h"
+#include "SamiApiResponse.h"
 #include "SamiCategory.h"
+#include "SamiOrder.h"
 #include "SamiPet.h"
 #include "SamiTag.h"
-#include "SamiOrder.h"
+#include "SamiUser.h"
 
 namespace Swagger {
   void*
   create(String type) {
-    if(type.Equals(L"SamiUser", true)) {
-      return new SamiUser();
+    if(type.Equals(L"SamiApiResponse", true)) {
+      return new SamiApiResponse();
     }
     if(type.Equals(L"SamiCategory", true)) {
       return new SamiCategory();
     }
+    if(type.Equals(L"SamiOrder", true)) {
+      return new SamiOrder();
+    }
     if(type.Equals(L"SamiPet", true)) {
       return new SamiPet();
     }
     if(type.Equals(L"SamiTag", true)) {
       return new SamiTag();
     }
-    if(type.Equals(L"SamiOrder", true)) {
-      return new SamiOrder();
+    if(type.Equals(L"SamiUser", true)) {
+      return new SamiUser();
     }
     
     if(type.Equals(L"String", true)) {
diff --git a/samples/client/petstore/tizen/client/SamiOrder.cpp b/samples/client/petstore/tizen/client/SamiOrder.cpp
index a319e88e616..c2ba4b2bfff 100644
--- a/samples/client/petstore/tizen/client/SamiOrder.cpp
+++ b/samples/client/petstore/tizen/client/SamiOrder.cpp
@@ -23,12 +23,11 @@ SamiOrder::~SamiOrder() {
 void
 SamiOrder::init() {
     pId = null;
-    pPetId = null;
-    pQuantity = null;
-    pShipDate = null;
-    pStatus = null;
-    pComplete = null;
-    
+pPetId = null;
+pQuantity = null;
+pShipDate = null;
+pStatus = null;
+pComplete = null;
 }
 
 void
@@ -38,32 +37,31 @@ SamiOrder::cleanup() {
         delete pId;
         pId = null;
     }
-    if(pPetId != null) {
+if(pPetId != null) {
         
         delete pPetId;
         pPetId = null;
     }
-    if(pQuantity != null) {
+if(pQuantity != null) {
         
         delete pQuantity;
         pQuantity = null;
     }
-    if(pShipDate != null) {
+if(pShipDate != null) {
         
         delete pShipDate;
         pShipDate = null;
     }
-    if(pStatus != null) {
+if(pStatus != null) {
         
         delete pStatus;
         pStatus = null;
     }
-    if(pComplete != null) {
+if(pComplete != null) {
         
         delete pComplete;
         pComplete = null;
     }
-    
 }
 
 
@@ -110,7 +108,7 @@ SamiOrder::fromJsonObject(IJsonValue* pJson) {
             jsonToValue(pId, pIdVal, L"Long", L"Long");
         }
         delete pIdKey;
-        JsonString* pPetIdKey = new JsonString(L"petId");
+JsonString* pPetIdKey = new JsonString(L"petId");
         IJsonValue* pPetIdVal = null;
         pJsonObject->GetValue(pPetIdKey, pPetIdVal);
         if(pPetIdVal != null) {
@@ -119,7 +117,7 @@ SamiOrder::fromJsonObject(IJsonValue* pJson) {
             jsonToValue(pPetId, pPetIdVal, L"Long", L"Long");
         }
         delete pPetIdKey;
-        JsonString* pQuantityKey = new JsonString(L"quantity");
+JsonString* pQuantityKey = new JsonString(L"quantity");
         IJsonValue* pQuantityVal = null;
         pJsonObject->GetValue(pQuantityKey, pQuantityVal);
         if(pQuantityVal != null) {
@@ -128,7 +126,7 @@ SamiOrder::fromJsonObject(IJsonValue* pJson) {
             jsonToValue(pQuantity, pQuantityVal, L"Integer", L"Integer");
         }
         delete pQuantityKey;
-        JsonString* pShipDateKey = new JsonString(L"shipDate");
+JsonString* pShipDateKey = new JsonString(L"shipDate");
         IJsonValue* pShipDateVal = null;
         pJsonObject->GetValue(pShipDateKey, pShipDateVal);
         if(pShipDateVal != null) {
@@ -137,7 +135,7 @@ SamiOrder::fromJsonObject(IJsonValue* pJson) {
             jsonToValue(pShipDate, pShipDateVal, L"DateTime", L"DateTime");
         }
         delete pShipDateKey;
-        JsonString* pStatusKey = new JsonString(L"status");
+JsonString* pStatusKey = new JsonString(L"status");
         IJsonValue* pStatusVal = null;
         pJsonObject->GetValue(pStatusKey, pStatusVal);
         if(pStatusVal != null) {
@@ -146,7 +144,7 @@ SamiOrder::fromJsonObject(IJsonValue* pJson) {
             jsonToValue(pStatus, pStatusVal, L"String", L"String");
         }
         delete pStatusKey;
-        JsonString* pCompleteKey = new JsonString(L"complete");
+JsonString* pCompleteKey = new JsonString(L"complete");
         IJsonValue* pCompleteVal = null;
         pJsonObject->GetValue(pCompleteKey, pCompleteVal);
         if(pCompleteVal != null) {
@@ -155,7 +153,6 @@ SamiOrder::fromJsonObject(IJsonValue* pJson) {
             jsonToValue(pComplete, pCompleteVal, L"Boolean", L"Boolean");
         }
         delete pCompleteKey;
-        
     }
 }
 
@@ -206,31 +203,24 @@ SamiOrder::asJsonObject() {
     JsonObject *pJsonObject = new JsonObject();
     pJsonObject->Construct();
 
-    
     JsonString *pIdKey = new JsonString(L"id");
     pJsonObject->Add(pIdKey, toJson(getPId(), "Long", ""));
 
-    
     JsonString *pPetIdKey = new JsonString(L"petId");
     pJsonObject->Add(pPetIdKey, toJson(getPPetId(), "Long", ""));
 
-    
     JsonString *pQuantityKey = new JsonString(L"quantity");
     pJsonObject->Add(pQuantityKey, toJson(getPQuantity(), "Integer", ""));
 
-    
     JsonString *pShipDateKey = new JsonString(L"shipDate");
     pJsonObject->Add(pShipDateKey, toJson(getPShipDate(), "DateTime", ""));
 
-    
     JsonString *pStatusKey = new JsonString(L"status");
     pJsonObject->Add(pStatusKey, toJson(getPStatus(), "String", ""));
 
-    
     JsonString *pCompleteKey = new JsonString(L"complete");
     pJsonObject->Add(pCompleteKey, toJson(getPComplete(), "Boolean", ""));
 
-    
     return pJsonObject;
 }
 
diff --git a/samples/client/petstore/tizen/client/SamiOrder.h b/samples/client/petstore/tizen/client/SamiOrder.h
index 08b79cc195c..c8719ce14ee 100644
--- a/samples/client/petstore/tizen/client/SamiOrder.h
+++ b/samples/client/petstore/tizen/client/SamiOrder.h
@@ -17,11 +17,11 @@
 using namespace Tizen::Web::Json;
 
 
-using Tizen::Base::Long;
-using Tizen::Base::DateTime;
-using Tizen::Base::String;
 using Tizen::Base::Boolean;
+using Tizen::Base::DateTime;
 using Tizen::Base::Integer;
+using Tizen::Base::Long;
+using Tizen::Base::String;
 
 
 namespace Swagger {
@@ -44,34 +44,26 @@ public:
 
     SamiOrder* fromJson(String* obj);
 
-    
     Long* getPId();
     void setPId(Long* pId);
-    
     Long* getPPetId();
     void setPPetId(Long* pPetId);
-    
     Integer* getPQuantity();
     void setPQuantity(Integer* pQuantity);
-    
     DateTime* getPShipDate();
     void setPShipDate(DateTime* pShipDate);
-    
     String* getPStatus();
     void setPStatus(String* pStatus);
-    
     Boolean* getPComplete();
     void setPComplete(Boolean* pComplete);
-    
 
 private:
     Long* pId;
-    Long* pPetId;
-    Integer* pQuantity;
-    DateTime* pShipDate;
-    String* pStatus;
-    Boolean* pComplete;
-    
+Long* pPetId;
+Integer* pQuantity;
+DateTime* pShipDate;
+String* pStatus;
+Boolean* pComplete;
 };
 
 } /* namespace Swagger */
diff --git a/samples/client/petstore/tizen/client/SamiPet.cpp b/samples/client/petstore/tizen/client/SamiPet.cpp
index ecf63f060a4..16417a43866 100644
--- a/samples/client/petstore/tizen/client/SamiPet.cpp
+++ b/samples/client/petstore/tizen/client/SamiPet.cpp
@@ -23,12 +23,11 @@ SamiPet::~SamiPet() {
 void
 SamiPet::init() {
     pId = null;
-    pCategory = null;
-    pName = null;
-    pPhotoUrls = null;
-    pTags = null;
-    pStatus = null;
-    
+pCategory = null;
+pName = null;
+pPhotoUrls = null;
+pTags = null;
+pStatus = null;
 }
 
 void
@@ -38,32 +37,31 @@ SamiPet::cleanup() {
         delete pId;
         pId = null;
     }
-    if(pCategory != null) {
+if(pCategory != null) {
         
         delete pCategory;
         pCategory = null;
     }
-    if(pName != null) {
+if(pName != null) {
         
         delete pName;
         pName = null;
     }
-    if(pPhotoUrls != null) {
+if(pPhotoUrls != null) {
         pPhotoUrls->RemoveAll(true);
         delete pPhotoUrls;
         pPhotoUrls = null;
     }
-    if(pTags != null) {
+if(pTags != null) {
         pTags->RemoveAll(true);
         delete pTags;
         pTags = null;
     }
-    if(pStatus != null) {
+if(pStatus != null) {
         
         delete pStatus;
         pStatus = null;
     }
-    
 }
 
 
@@ -110,7 +108,7 @@ SamiPet::fromJsonObject(IJsonValue* pJson) {
             jsonToValue(pId, pIdVal, L"Long", L"Long");
         }
         delete pIdKey;
-        JsonString* pCategoryKey = new JsonString(L"category");
+JsonString* pCategoryKey = new JsonString(L"category");
         IJsonValue* pCategoryVal = null;
         pJsonObject->GetValue(pCategoryKey, pCategoryVal);
         if(pCategoryVal != null) {
@@ -119,7 +117,7 @@ SamiPet::fromJsonObject(IJsonValue* pJson) {
             jsonToValue(pCategory, pCategoryVal, L"SamiCategory", L"SamiCategory");
         }
         delete pCategoryKey;
-        JsonString* pNameKey = new JsonString(L"name");
+JsonString* pNameKey = new JsonString(L"name");
         IJsonValue* pNameVal = null;
         pJsonObject->GetValue(pNameKey, pNameVal);
         if(pNameVal != null) {
@@ -128,7 +126,7 @@ SamiPet::fromJsonObject(IJsonValue* pJson) {
             jsonToValue(pName, pNameVal, L"String", L"String");
         }
         delete pNameKey;
-        JsonString* pPhotoUrlsKey = new JsonString(L"photoUrls");
+JsonString* pPhotoUrlsKey = new JsonString(L"photoUrls");
         IJsonValue* pPhotoUrlsVal = null;
         pJsonObject->GetValue(pPhotoUrlsKey, pPhotoUrlsVal);
         if(pPhotoUrlsVal != null) {
@@ -137,7 +135,7 @@ SamiPet::fromJsonObject(IJsonValue* pJson) {
             jsonToValue(pPhotoUrls, pPhotoUrlsVal, L"IList", L"String");
         }
         delete pPhotoUrlsKey;
-        JsonString* pTagsKey = new JsonString(L"tags");
+JsonString* pTagsKey = new JsonString(L"tags");
         IJsonValue* pTagsVal = null;
         pJsonObject->GetValue(pTagsKey, pTagsVal);
         if(pTagsVal != null) {
@@ -146,7 +144,7 @@ SamiPet::fromJsonObject(IJsonValue* pJson) {
             jsonToValue(pTags, pTagsVal, L"IList", L"SamiTag");
         }
         delete pTagsKey;
-        JsonString* pStatusKey = new JsonString(L"status");
+JsonString* pStatusKey = new JsonString(L"status");
         IJsonValue* pStatusVal = null;
         pJsonObject->GetValue(pStatusKey, pStatusVal);
         if(pStatusVal != null) {
@@ -155,7 +153,6 @@ SamiPet::fromJsonObject(IJsonValue* pJson) {
             jsonToValue(pStatus, pStatusVal, L"String", L"String");
         }
         delete pStatusKey;
-        
     }
 }
 
@@ -206,31 +203,24 @@ SamiPet::asJsonObject() {
     JsonObject *pJsonObject = new JsonObject();
     pJsonObject->Construct();
 
-    
     JsonString *pIdKey = new JsonString(L"id");
     pJsonObject->Add(pIdKey, toJson(getPId(), "Long", ""));
 
-    
     JsonString *pCategoryKey = new JsonString(L"category");
     pJsonObject->Add(pCategoryKey, toJson(getPCategory(), "SamiCategory", ""));
 
-    
     JsonString *pNameKey = new JsonString(L"name");
     pJsonObject->Add(pNameKey, toJson(getPName(), "String", ""));
 
-    
     JsonString *pPhotoUrlsKey = new JsonString(L"photoUrls");
     pJsonObject->Add(pPhotoUrlsKey, toJson(getPPhotoUrls(), "String", "array"));
 
-    
     JsonString *pTagsKey = new JsonString(L"tags");
     pJsonObject->Add(pTagsKey, toJson(getPTags(), "SamiTag", "array"));
 
-    
     JsonString *pStatusKey = new JsonString(L"status");
     pJsonObject->Add(pStatusKey, toJson(getPStatus(), "String", ""));
 
-    
     return pJsonObject;
 }
 
diff --git a/samples/client/petstore/tizen/client/SamiPet.h b/samples/client/petstore/tizen/client/SamiPet.h
index a1658248436..3a22ea3a58d 100644
--- a/samples/client/petstore/tizen/client/SamiPet.h
+++ b/samples/client/petstore/tizen/client/SamiPet.h
@@ -18,10 +18,10 @@ using namespace Tizen::Web::Json;
 
 
 #include "SamiCategory.h"
-using Tizen::Base::Long;
-using Tizen::Base::String;
 #include "SamiTag.h"
 using Tizen::Base::Collection::IList;
+using Tizen::Base::Long;
+using Tizen::Base::String;
 
 
 namespace Swagger {
@@ -44,34 +44,26 @@ public:
 
     SamiPet* fromJson(String* obj);
 
-    
     Long* getPId();
     void setPId(Long* pId);
-    
     SamiCategory* getPCategory();
     void setPCategory(SamiCategory* pCategory);
-    
     String* getPName();
     void setPName(String* pName);
-    
     IList* getPPhotoUrls();
     void setPPhotoUrls(IList* pPhotoUrls);
-    
     IList* getPTags();
     void setPTags(IList* pTags);
-    
     String* getPStatus();
     void setPStatus(String* pStatus);
-    
 
 private:
     Long* pId;
-    SamiCategory* pCategory;
-    String* pName;
-    IList* pPhotoUrls;
-    IList* pTags;
-    String* pStatus;
-    
+SamiCategory* pCategory;
+String* pName;
+IList* pPhotoUrls;
+IList* pTags;
+String* pStatus;
 };
 
 } /* namespace Swagger */
diff --git a/samples/client/petstore/tizen/client/SamiPetApi.cpp b/samples/client/petstore/tizen/client/SamiPetApi.cpp
index 787e79964c2..9f1b330ce83 100644
--- a/samples/client/petstore/tizen/client/SamiPetApi.cpp
+++ b/samples/client/petstore/tizen/client/SamiPetApi.cpp
@@ -16,55 +16,6 @@ SamiPetApi::~SamiPetApi() {
 
 }
 
-void
-updatePetProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) {
-  int code = pHttpResponse->GetHttpStatusCode();
-
-  if(code >= 200 && code < 300) {
-    handler(null, null);
-  }
-  else {
-    SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText()));
-    
-    handler(error, null);
-  }
-}
-
-void 
-SamiPetApi::updatePetWithCompletion(SamiPet* body, void(*success)(SamiError*)) {
-  client = new SamiApiClient();
-
-  client->success(&updatePetProcessor, (void(*)(void*, SamiError*))success);
-  HashMap* headerParams = new HashMap(SingleObjectDeleter);
-  headerParams->Construct();
-
-  
-
-  HashMap* queryParams = new HashMap(SingleObjectDeleter);
-  queryParams->Construct();
-
-  
-
-  String* mBody = null;
-
-  
-  
-  
-  if(body != null) {
-    mBody = new String(body->asJson());
-    headerParams->Add(new String("Content-Type"), new String("application/json"));
-  }
-  
-  
-
-  String url(L"/pet");
-
-  
-
-  client->execute(SamiPetApi::getBasePath(), url, "PUT", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json");
-  
-}
-
 void
 addPetProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) {
   int code = pHttpResponse->GetHttpStatusCode();
@@ -88,29 +39,64 @@ SamiPetApi::addPetWithCompletion(SamiPet* body, void(*success)(SamiError*)) {
   headerParams->Construct();
 
   
+  HashMap* queryParams = new HashMap(SingleObjectDeleter);
+  queryParams->Construct();
+
+  
+  String* mBody = null;
+
+  if(body != null) {
+    mBody = new String(body->asJson());
+    headerParams->Add(new String("Content-Type"), new String("application/json"));
+  }
+
+  String url(L"/pet");
+
+
+  client->execute(SamiPetApi::getBasePath(), url, "POST", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json");
+  
+}
+
+void
+deletePetProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) {
+  int code = pHttpResponse->GetHttpStatusCode();
+
+  if(code >= 200 && code < 300) {
+    handler(null, null);
+  }
+  else {
+    SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText()));
+    
+    handler(error, null);
+  }
+}
+
+void 
+SamiPetApi::deletePetWithCompletion(Long* petId, String* apiKey, void(*success)(SamiError*)) {
+  client = new SamiApiClient();
+
+  client->success(&deletePetProcessor, (void(*)(void*, SamiError*))success);
+  HashMap* headerParams = new HashMap(SingleObjectDeleter);
+  headerParams->Construct();
+
+  
+    headerParams->Add(new String("api_key"), apiKey);
 
   HashMap* queryParams = new HashMap(SingleObjectDeleter);
   queryParams->Construct();
 
   
-
   String* mBody = null;
 
-  
-  
-  
-  if(body != null) {
-    mBody = new String(body->asJson());
-    headerParams->Add(new String("Content-Type"), new String("application/json"));
-  }
-  
-  
 
-  String url(L"/pet");
+  String url(L"/pet/{petId}");
 
-  
+  String s_petId(L"{");
+  s_petId.Append(L"petId");
+  s_petId.Append(L"}");
+  url.Replace(s_petId, stringify(petId, L"Long*"));
 
-  client->execute(SamiPetApi::getBasePath(), url, "POST", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json");
+  client->execute(SamiPetApi::getBasePath(), url, "DELETE", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json");
   
 }
 
@@ -158,7 +144,6 @@ SamiPetApi::findPetsByStatusWithCompletion(IList* status, void (* success)(IList
   headerParams->Construct();
 
   
-
   HashMap* queryParams = new HashMap(SingleObjectDeleter);
   queryParams->Construct();
 
@@ -169,15 +154,11 @@ SamiPetApi::findPetsByStatusWithCompletion(IList* status, void (* success)(IList
     queryParams->Add(new String("status"), new String(itemAt));
   }
   
-  
-
   String* mBody = null;
 
-  
 
   String url(L"/pet/findByStatus");
 
-  
 
   client->execute(SamiPetApi::getBasePath(), url, "GET", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json");
   return null;
@@ -227,7 +208,6 @@ SamiPetApi::findPetsByTagsWithCompletion(IList* tags, void (* success)(IList*, S
   headerParams->Construct();
 
   
-
   HashMap* queryParams = new HashMap(SingleObjectDeleter);
   queryParams->Construct();
 
@@ -238,15 +218,11 @@ SamiPetApi::findPetsByTagsWithCompletion(IList* tags, void (* success)(IList*, S
     queryParams->Add(new String("tags"), new String(itemAt));
   }
   
-  
-
   String* mBody = null;
 
-  
 
   String url(L"/pet/findByTags");
 
-  
 
   client->execute(SamiPetApi::getBasePath(), url, "GET", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json");
   return null;
@@ -296,29 +272,65 @@ SamiPetApi::getPetByIdWithCompletion(Long* petId, void (* success)(SamiPet*, Sam
   headerParams->Construct();
 
   
-
   HashMap* queryParams = new HashMap(SingleObjectDeleter);
   queryParams->Construct();
 
   
-
   String* mBody = null;
 
-  
 
   String url(L"/pet/{petId}");
 
-  
   String s_petId(L"{");
   s_petId.Append(L"petId");
   s_petId.Append(L"}");
   url.Replace(s_petId, stringify(petId, L"Long*"));
-  
 
   client->execute(SamiPetApi::getBasePath(), url, "GET", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json");
   return null;
 }
 
+void
+updatePetProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) {
+  int code = pHttpResponse->GetHttpStatusCode();
+
+  if(code >= 200 && code < 300) {
+    handler(null, null);
+  }
+  else {
+    SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText()));
+    
+    handler(error, null);
+  }
+}
+
+void 
+SamiPetApi::updatePetWithCompletion(SamiPet* body, void(*success)(SamiError*)) {
+  client = new SamiApiClient();
+
+  client->success(&updatePetProcessor, (void(*)(void*, SamiError*))success);
+  HashMap* headerParams = new HashMap(SingleObjectDeleter);
+  headerParams->Construct();
+
+  
+  HashMap* queryParams = new HashMap(SingleObjectDeleter);
+  queryParams->Construct();
+
+  
+  String* mBody = null;
+
+  if(body != null) {
+    mBody = new String(body->asJson());
+    headerParams->Add(new String("Content-Type"), new String("application/json"));
+  }
+
+  String url(L"/pet");
+
+
+  client->execute(SamiPetApi::getBasePath(), url, "PUT", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json");
+  
+}
+
 void
 updatePetWithFormProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) {
   int code = pHttpResponse->GetHttpStatusCode();
@@ -334,7 +346,7 @@ updatePetWithFormProcessor(HttpResponse* pHttpResponse, void (* handler)(void*,
 }
 
 void 
-SamiPetApi::updatePetWithFormWithCompletion(String* petId, String* name, String* status, void(*success)(SamiError*)) {
+SamiPetApi::updatePetWithFormWithCompletion(Long* petId, String* name, String* status, void(*success)(SamiError*)) {
   client = new SamiApiClient();
 
   client->success(&updatePetWithFormProcessor, (void(*)(void*, SamiError*))success);
@@ -342,75 +354,21 @@ SamiPetApi::updatePetWithFormWithCompletion(String* petId, String* name, String*
   headerParams->Construct();
 
   
-
   HashMap* queryParams = new HashMap(SingleObjectDeleter);
   queryParams->Construct();
 
   
-
   String* mBody = null;
 
-  
 
   String url(L"/pet/{petId}");
 
-  
-  String s_petId(L"{");
-  s_petId.Append(L"petId");
-  s_petId.Append(L"}");
-  url.Replace(s_petId, stringify(petId, L"String*"));
-  
-
-  client->execute(SamiPetApi::getBasePath(), url, "POST", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json");
-  
-}
-
-void
-deletePetProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) {
-  int code = pHttpResponse->GetHttpStatusCode();
-
-  if(code >= 200 && code < 300) {
-    handler(null, null);
-  }
-  else {
-    SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText()));
-    
-    handler(error, null);
-  }
-}
-
-void 
-SamiPetApi::deletePetWithCompletion(Long* petId, String* apiKey, void(*success)(SamiError*)) {
-  client = new SamiApiClient();
-
-  client->success(&deletePetProcessor, (void(*)(void*, SamiError*))success);
-  HashMap* headerParams = new HashMap(SingleObjectDeleter);
-  headerParams->Construct();
-
-  
-    headerParams->Add(new String("api_key"), apiKey);
-  
-  
-
-  HashMap* queryParams = new HashMap(SingleObjectDeleter);
-  queryParams->Construct();
-
-  
-
-  String* mBody = null;
-
-  
-
-  String url(L"/pet/{petId}");
-
-  
   String s_petId(L"{");
   s_petId.Append(L"petId");
   s_petId.Append(L"}");
   url.Replace(s_petId, stringify(petId, L"Long*"));
-  
 
-  client->execute(SamiPetApi::getBasePath(), url, "DELETE", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json");
+  client->execute(SamiPetApi::getBasePath(), url, "POST", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json");
   
 }
 
@@ -419,17 +377,38 @@ uploadFileProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiErr
   int code = pHttpResponse->GetHttpStatusCode();
 
   if(code >= 200 && code < 300) {
-    handler(null, null);
+    ByteBuffer* pBuffer = pHttpResponse->ReadBodyN();
+    IJsonValue* pJson = JsonParser::ParseN(*pBuffer);
+
+    SamiApiResponse* out = new SamiApiResponse();
+    jsonToValue(out, pJson, L"SamiApiResponse*", L"SamiApiResponse");
+
+    if (pJson) {
+      if (pJson->GetType() == JSON_TYPE_OBJECT) {
+         JsonObject* pObject = static_cast< JsonObject* >(pJson);
+         pObject->RemoveAll(true);
+      }
+      else if (pJson->GetType() == JSON_TYPE_ARRAY) {
+         JsonArray* pArray = static_cast< JsonArray* >(pJson);
+         pArray->RemoveAll(true);
+      }
+      handler(out, null);
+    }
+    else {
+      SamiError* error = new SamiError(0, new String(L"No parsable response received"));
+      handler(null, error);
+    }
+    
   }
   else {
     SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText()));
+    handler(null, error);
     
-    handler(error, null);
   }
 }
 
-void 
-SamiPetApi::uploadFileWithCompletion(Long* petId, String* additionalMetadata, SamiFile* file, void(*success)(SamiError*)) {
+SamiApiResponse* 
+SamiPetApi::uploadFileWithCompletion(Long* petId, String* additionalMetadata, SamiFile* file, void (* success)(SamiApiResponse*, SamiError*)) {
   client = new SamiApiClient();
 
   client->success(&uploadFileProcessor, (void(*)(void*, SamiError*))success);
@@ -437,27 +416,22 @@ SamiPetApi::uploadFileWithCompletion(Long* petId, String* additionalMetadata, Sa
   headerParams->Construct();
 
   
-
   HashMap* queryParams = new HashMap(SingleObjectDeleter);
   queryParams->Construct();
 
   
-
   String* mBody = null;
 
-  
 
   String url(L"/pet/{petId}/uploadImage");
 
-  
   String s_petId(L"{");
   s_petId.Append(L"petId");
   s_petId.Append(L"}");
   url.Replace(s_petId, stringify(petId, L"Long*"));
-  
 
   client->execute(SamiPetApi::getBasePath(), url, "POST", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json");
-  
+  return null;
 }
 
 
diff --git a/samples/client/petstore/tizen/client/SamiPetApi.h b/samples/client/petstore/tizen/client/SamiPetApi.h
index a0fc01f08f5..0b5fae406a7 100644
--- a/samples/client/petstore/tizen/client/SamiPetApi.h
+++ b/samples/client/petstore/tizen/client/SamiPetApi.h
@@ -6,9 +6,10 @@
 #include "SamiError.h"
 
 #include "SamiPet.h"
-using Tizen::Base::String;
 using Tizen::Base::Long;
+using Tizen::Base::String;
 #include "SamiFile.h"
+#include "SamiApiResponse.h"
 
 using namespace Tizen::Net::Http;
 
@@ -19,31 +20,22 @@ public:
   SamiPetApi();
   virtual ~SamiPetApi();
 
-  
-  void 
-  updatePetWithCompletion(SamiPet* body, void(* handler)(SamiError*));
-  
   void 
   addPetWithCompletion(SamiPet* body, void(* handler)(SamiError*));
-  
-  IList* 
-  findPetsByStatusWithCompletion(IList* status, void (* handler)(IList*, SamiError*));
-  
-  IList* 
-  findPetsByTagsWithCompletion(IList* tags, void (* handler)(IList*, SamiError*));
-  
-  SamiPet* 
-  getPetByIdWithCompletion(Long* petId, void (* handler)(SamiPet*, SamiError*));
-  
-  void 
-  updatePetWithFormWithCompletion(String* petId, String* name, String* status, void(* handler)(SamiError*));
-  
   void 
   deletePetWithCompletion(Long* petId, String* apiKey, void(* handler)(SamiError*));
-  
+  IList* 
+  findPetsByStatusWithCompletion(IList* status, void (* handler)(IList*, SamiError*));
+  IList* 
+  findPetsByTagsWithCompletion(IList* tags, void (* handler)(IList*, SamiError*));
+  SamiPet* 
+  getPetByIdWithCompletion(Long* petId, void (* handler)(SamiPet*, SamiError*));
   void 
-  uploadFileWithCompletion(Long* petId, String* additionalMetadata, SamiFile* file, void(* handler)(SamiError*));
-  
+  updatePetWithCompletion(SamiPet* body, void(* handler)(SamiError*));
+  void 
+  updatePetWithFormWithCompletion(Long* petId, String* name, String* status, void(* handler)(SamiError*));
+  SamiApiResponse* 
+  uploadFileWithCompletion(Long* petId, String* additionalMetadata, SamiFile* file, void (* handler)(SamiApiResponse*, SamiError*));
   static String getBasePath() {
     return L"http://petstore.swagger.io/v2";
   }
diff --git a/samples/client/petstore/tizen/client/SamiStoreApi.cpp b/samples/client/petstore/tizen/client/SamiStoreApi.cpp
index c567896c48d..47ed2ec0196 100644
--- a/samples/client/petstore/tizen/client/SamiStoreApi.cpp
+++ b/samples/client/petstore/tizen/client/SamiStoreApi.cpp
@@ -16,6 +16,47 @@ SamiStoreApi::~SamiStoreApi() {
 
 }
 
+void
+deleteOrderProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) {
+  int code = pHttpResponse->GetHttpStatusCode();
+
+  if(code >= 200 && code < 300) {
+    handler(null, null);
+  }
+  else {
+    SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText()));
+    
+    handler(error, null);
+  }
+}
+
+void 
+SamiStoreApi::deleteOrderWithCompletion(String* orderId, void(*success)(SamiError*)) {
+  client = new SamiApiClient();
+
+  client->success(&deleteOrderProcessor, (void(*)(void*, SamiError*))success);
+  HashMap* headerParams = new HashMap(SingleObjectDeleter);
+  headerParams->Construct();
+
+  
+  HashMap* queryParams = new HashMap(SingleObjectDeleter);
+  queryParams->Construct();
+
+  
+  String* mBody = null;
+
+
+  String url(L"/store/order/{orderId}");
+
+  String s_orderId(L"{");
+  s_orderId.Append(L"orderId");
+  s_orderId.Append(L"}");
+  url.Replace(s_orderId, stringify(orderId, L"String*"));
+
+  client->execute(SamiStoreApi::getBasePath(), url, "DELETE", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json");
+  
+}
+
 void
 getInventoryProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) {
   int code = pHttpResponse->GetHttpStatusCode();
@@ -60,19 +101,77 @@ SamiStoreApi::getInventoryWithCompletion( void (* success)(HashMap*, SamiError*)
   headerParams->Construct();
 
   
-
   HashMap* queryParams = new HashMap(SingleObjectDeleter);
   queryParams->Construct();
 
   
-
   String* mBody = null;
 
-  
 
   String url(L"/store/inventory");
 
+
+  client->execute(SamiStoreApi::getBasePath(), url, "GET", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json");
+  return null;
+}
+
+void
+getOrderByIdProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) {
+  int code = pHttpResponse->GetHttpStatusCode();
+
+  if(code >= 200 && code < 300) {
+    ByteBuffer* pBuffer = pHttpResponse->ReadBodyN();
+    IJsonValue* pJson = JsonParser::ParseN(*pBuffer);
+
+    SamiOrder* out = new SamiOrder();
+    jsonToValue(out, pJson, L"SamiOrder*", L"SamiOrder");
+
+    if (pJson) {
+      if (pJson->GetType() == JSON_TYPE_OBJECT) {
+         JsonObject* pObject = static_cast< JsonObject* >(pJson);
+         pObject->RemoveAll(true);
+      }
+      else if (pJson->GetType() == JSON_TYPE_ARRAY) {
+         JsonArray* pArray = static_cast< JsonArray* >(pJson);
+         pArray->RemoveAll(true);
+      }
+      handler(out, null);
+    }
+    else {
+      SamiError* error = new SamiError(0, new String(L"No parsable response received"));
+      handler(null, error);
+    }
+    
+  }
+  else {
+    SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText()));
+    handler(null, error);
+    
+  }
+}
+
+SamiOrder* 
+SamiStoreApi::getOrderByIdWithCompletion(Long* orderId, void (* success)(SamiOrder*, SamiError*)) {
+  client = new SamiApiClient();
+
+  client->success(&getOrderByIdProcessor, (void(*)(void*, SamiError*))success);
+  HashMap* headerParams = new HashMap(SingleObjectDeleter);
+  headerParams->Construct();
+
   
+  HashMap* queryParams = new HashMap(SingleObjectDeleter);
+  queryParams->Construct();
+
+  
+  String* mBody = null;
+
+
+  String url(L"/store/order/{orderId}");
+
+  String s_orderId(L"{");
+  s_orderId.Append(L"orderId");
+  s_orderId.Append(L"}");
+  url.Replace(s_orderId, stringify(orderId, L"Long*"));
 
   client->execute(SamiStoreApi::getBasePath(), url, "GET", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json");
   return null;
@@ -122,144 +221,23 @@ SamiStoreApi::placeOrderWithCompletion(SamiOrder* body, void (* success)(SamiOrd
   headerParams->Construct();
 
   
-
   HashMap* queryParams = new HashMap(SingleObjectDeleter);
   queryParams->Construct();
 
   
-
   String* mBody = null;
 
-  
-  
-  
   if(body != null) {
     mBody = new String(body->asJson());
     headerParams->Add(new String("Content-Type"), new String("application/json"));
   }
-  
-  
 
   String url(L"/store/order");
 
-  
 
   client->execute(SamiStoreApi::getBasePath(), url, "POST", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json");
   return null;
 }
 
-void
-getOrderByIdProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) {
-  int code = pHttpResponse->GetHttpStatusCode();
-
-  if(code >= 200 && code < 300) {
-    ByteBuffer* pBuffer = pHttpResponse->ReadBodyN();
-    IJsonValue* pJson = JsonParser::ParseN(*pBuffer);
-
-    SamiOrder* out = new SamiOrder();
-    jsonToValue(out, pJson, L"SamiOrder*", L"SamiOrder");
-
-    if (pJson) {
-      if (pJson->GetType() == JSON_TYPE_OBJECT) {
-         JsonObject* pObject = static_cast< JsonObject* >(pJson);
-         pObject->RemoveAll(true);
-      }
-      else if (pJson->GetType() == JSON_TYPE_ARRAY) {
-         JsonArray* pArray = static_cast< JsonArray* >(pJson);
-         pArray->RemoveAll(true);
-      }
-      handler(out, null);
-    }
-    else {
-      SamiError* error = new SamiError(0, new String(L"No parsable response received"));
-      handler(null, error);
-    }
-    
-  }
-  else {
-    SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText()));
-    handler(null, error);
-    
-  }
-}
-
-SamiOrder* 
-SamiStoreApi::getOrderByIdWithCompletion(String* orderId, void (* success)(SamiOrder*, SamiError*)) {
-  client = new SamiApiClient();
-
-  client->success(&getOrderByIdProcessor, (void(*)(void*, SamiError*))success);
-  HashMap* headerParams = new HashMap(SingleObjectDeleter);
-  headerParams->Construct();
-
-  
-
-  HashMap* queryParams = new HashMap(SingleObjectDeleter);
-  queryParams->Construct();
-
-  
-
-  String* mBody = null;
-
-  
-
-  String url(L"/store/order/{orderId}");
-
-  
-  String s_orderId(L"{");
-  s_orderId.Append(L"orderId");
-  s_orderId.Append(L"}");
-  url.Replace(s_orderId, stringify(orderId, L"String*"));
-  
-
-  client->execute(SamiStoreApi::getBasePath(), url, "GET", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json");
-  return null;
-}
-
-void
-deleteOrderProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) {
-  int code = pHttpResponse->GetHttpStatusCode();
-
-  if(code >= 200 && code < 300) {
-    handler(null, null);
-  }
-  else {
-    SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText()));
-    
-    handler(error, null);
-  }
-}
-
-void 
-SamiStoreApi::deleteOrderWithCompletion(String* orderId, void(*success)(SamiError*)) {
-  client = new SamiApiClient();
-
-  client->success(&deleteOrderProcessor, (void(*)(void*, SamiError*))success);
-  HashMap* headerParams = new HashMap(SingleObjectDeleter);
-  headerParams->Construct();
-
-  
-
-  HashMap* queryParams = new HashMap(SingleObjectDeleter);
-  queryParams->Construct();
-
-  
-
-  String* mBody = null;
-
-  
-
-  String url(L"/store/order/{orderId}");
-
-  
-  String s_orderId(L"{");
-  s_orderId.Append(L"orderId");
-  s_orderId.Append(L"}");
-  url.Replace(s_orderId, stringify(orderId, L"String*"));
-  
-
-  client->execute(SamiStoreApi::getBasePath(), url, "DELETE", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json");
-  
-}
-
 
 } /* namespace Swagger */
diff --git a/samples/client/petstore/tizen/client/SamiStoreApi.h b/samples/client/petstore/tizen/client/SamiStoreApi.h
index a36f4ba6ee9..574207a0b88 100644
--- a/samples/client/petstore/tizen/client/SamiStoreApi.h
+++ b/samples/client/petstore/tizen/client/SamiStoreApi.h
@@ -5,9 +5,10 @@
 #include "SamiApiClient.h"
 #include "SamiError.h"
 
+using Tizen::Base::String;
 using Tizen::Base::Integer;
 #include "SamiOrder.h"
-using Tizen::Base::String;
+using Tizen::Base::Long;
 
 using namespace Tizen::Net::Http;
 
@@ -18,19 +19,14 @@ public:
   SamiStoreApi();
   virtual ~SamiStoreApi();
 
-  
-  HashMap* 
-  getInventoryWithCompletion( void (* handler)(HashMap*, SamiError*));
-  
-  SamiOrder* 
-  placeOrderWithCompletion(SamiOrder* body, void (* handler)(SamiOrder*, SamiError*));
-  
-  SamiOrder* 
-  getOrderByIdWithCompletion(String* orderId, void (* handler)(SamiOrder*, SamiError*));
-  
   void 
   deleteOrderWithCompletion(String* orderId, void(* handler)(SamiError*));
-  
+  HashMap* 
+  getInventoryWithCompletion( void (* handler)(HashMap*, SamiError*));
+  SamiOrder* 
+  getOrderByIdWithCompletion(Long* orderId, void (* handler)(SamiOrder*, SamiError*));
+  SamiOrder* 
+  placeOrderWithCompletion(SamiOrder* body, void (* handler)(SamiOrder*, SamiError*));
   static String getBasePath() {
     return L"http://petstore.swagger.io/v2";
   }
diff --git a/samples/client/petstore/tizen/client/SamiTag.cpp b/samples/client/petstore/tizen/client/SamiTag.cpp
index d07b64a531d..d31e52cfebd 100644
--- a/samples/client/petstore/tizen/client/SamiTag.cpp
+++ b/samples/client/petstore/tizen/client/SamiTag.cpp
@@ -23,8 +23,7 @@ SamiTag::~SamiTag() {
 void
 SamiTag::init() {
     pId = null;
-    pName = null;
-    
+pName = null;
 }
 
 void
@@ -34,12 +33,11 @@ SamiTag::cleanup() {
         delete pId;
         pId = null;
     }
-    if(pName != null) {
+if(pName != null) {
         
         delete pName;
         pName = null;
     }
-    
 }
 
 
@@ -86,7 +84,7 @@ SamiTag::fromJsonObject(IJsonValue* pJson) {
             jsonToValue(pId, pIdVal, L"Long", L"Long");
         }
         delete pIdKey;
-        JsonString* pNameKey = new JsonString(L"name");
+JsonString* pNameKey = new JsonString(L"name");
         IJsonValue* pNameVal = null;
         pJsonObject->GetValue(pNameKey, pNameVal);
         if(pNameVal != null) {
@@ -95,7 +93,6 @@ SamiTag::fromJsonObject(IJsonValue* pJson) {
             jsonToValue(pName, pNameVal, L"String", L"String");
         }
         delete pNameKey;
-        
     }
 }
 
@@ -146,15 +143,12 @@ SamiTag::asJsonObject() {
     JsonObject *pJsonObject = new JsonObject();
     pJsonObject->Construct();
 
-    
     JsonString *pIdKey = new JsonString(L"id");
     pJsonObject->Add(pIdKey, toJson(getPId(), "Long", ""));
 
-    
     JsonString *pNameKey = new JsonString(L"name");
     pJsonObject->Add(pNameKey, toJson(getPName(), "String", ""));
 
-    
     return pJsonObject;
 }
 
diff --git a/samples/client/petstore/tizen/client/SamiTag.h b/samples/client/petstore/tizen/client/SamiTag.h
index 6521b0a6bed..d248df55cba 100644
--- a/samples/client/petstore/tizen/client/SamiTag.h
+++ b/samples/client/petstore/tizen/client/SamiTag.h
@@ -41,18 +41,14 @@ public:
 
     SamiTag* fromJson(String* obj);
 
-    
     Long* getPId();
     void setPId(Long* pId);
-    
     String* getPName();
     void setPName(String* pName);
-    
 
 private:
     Long* pId;
-    String* pName;
-    
+String* pName;
 };
 
 } /* namespace Swagger */
diff --git a/samples/client/petstore/tizen/client/SamiUser.cpp b/samples/client/petstore/tizen/client/SamiUser.cpp
index 916bec83d5a..3544b624f3e 100644
--- a/samples/client/petstore/tizen/client/SamiUser.cpp
+++ b/samples/client/petstore/tizen/client/SamiUser.cpp
@@ -23,14 +23,13 @@ SamiUser::~SamiUser() {
 void
 SamiUser::init() {
     pId = null;
-    pUsername = null;
-    pFirstName = null;
-    pLastName = null;
-    pEmail = null;
-    pPassword = null;
-    pPhone = null;
-    pUserStatus = null;
-    
+pUsername = null;
+pFirstName = null;
+pLastName = null;
+pEmail = null;
+pPassword = null;
+pPhone = null;
+pUserStatus = null;
 }
 
 void
@@ -40,42 +39,41 @@ SamiUser::cleanup() {
         delete pId;
         pId = null;
     }
-    if(pUsername != null) {
+if(pUsername != null) {
         
         delete pUsername;
         pUsername = null;
     }
-    if(pFirstName != null) {
+if(pFirstName != null) {
         
         delete pFirstName;
         pFirstName = null;
     }
-    if(pLastName != null) {
+if(pLastName != null) {
         
         delete pLastName;
         pLastName = null;
     }
-    if(pEmail != null) {
+if(pEmail != null) {
         
         delete pEmail;
         pEmail = null;
     }
-    if(pPassword != null) {
+if(pPassword != null) {
         
         delete pPassword;
         pPassword = null;
     }
-    if(pPhone != null) {
+if(pPhone != null) {
         
         delete pPhone;
         pPhone = null;
     }
-    if(pUserStatus != null) {
+if(pUserStatus != null) {
         
         delete pUserStatus;
         pUserStatus = null;
     }
-    
 }
 
 
@@ -122,7 +120,7 @@ SamiUser::fromJsonObject(IJsonValue* pJson) {
             jsonToValue(pId, pIdVal, L"Long", L"Long");
         }
         delete pIdKey;
-        JsonString* pUsernameKey = new JsonString(L"username");
+JsonString* pUsernameKey = new JsonString(L"username");
         IJsonValue* pUsernameVal = null;
         pJsonObject->GetValue(pUsernameKey, pUsernameVal);
         if(pUsernameVal != null) {
@@ -131,7 +129,7 @@ SamiUser::fromJsonObject(IJsonValue* pJson) {
             jsonToValue(pUsername, pUsernameVal, L"String", L"String");
         }
         delete pUsernameKey;
-        JsonString* pFirstNameKey = new JsonString(L"firstName");
+JsonString* pFirstNameKey = new JsonString(L"firstName");
         IJsonValue* pFirstNameVal = null;
         pJsonObject->GetValue(pFirstNameKey, pFirstNameVal);
         if(pFirstNameVal != null) {
@@ -140,7 +138,7 @@ SamiUser::fromJsonObject(IJsonValue* pJson) {
             jsonToValue(pFirstName, pFirstNameVal, L"String", L"String");
         }
         delete pFirstNameKey;
-        JsonString* pLastNameKey = new JsonString(L"lastName");
+JsonString* pLastNameKey = new JsonString(L"lastName");
         IJsonValue* pLastNameVal = null;
         pJsonObject->GetValue(pLastNameKey, pLastNameVal);
         if(pLastNameVal != null) {
@@ -149,7 +147,7 @@ SamiUser::fromJsonObject(IJsonValue* pJson) {
             jsonToValue(pLastName, pLastNameVal, L"String", L"String");
         }
         delete pLastNameKey;
-        JsonString* pEmailKey = new JsonString(L"email");
+JsonString* pEmailKey = new JsonString(L"email");
         IJsonValue* pEmailVal = null;
         pJsonObject->GetValue(pEmailKey, pEmailVal);
         if(pEmailVal != null) {
@@ -158,7 +156,7 @@ SamiUser::fromJsonObject(IJsonValue* pJson) {
             jsonToValue(pEmail, pEmailVal, L"String", L"String");
         }
         delete pEmailKey;
-        JsonString* pPasswordKey = new JsonString(L"password");
+JsonString* pPasswordKey = new JsonString(L"password");
         IJsonValue* pPasswordVal = null;
         pJsonObject->GetValue(pPasswordKey, pPasswordVal);
         if(pPasswordVal != null) {
@@ -167,7 +165,7 @@ SamiUser::fromJsonObject(IJsonValue* pJson) {
             jsonToValue(pPassword, pPasswordVal, L"String", L"String");
         }
         delete pPasswordKey;
-        JsonString* pPhoneKey = new JsonString(L"phone");
+JsonString* pPhoneKey = new JsonString(L"phone");
         IJsonValue* pPhoneVal = null;
         pJsonObject->GetValue(pPhoneKey, pPhoneVal);
         if(pPhoneVal != null) {
@@ -176,7 +174,7 @@ SamiUser::fromJsonObject(IJsonValue* pJson) {
             jsonToValue(pPhone, pPhoneVal, L"String", L"String");
         }
         delete pPhoneKey;
-        JsonString* pUserStatusKey = new JsonString(L"userStatus");
+JsonString* pUserStatusKey = new JsonString(L"userStatus");
         IJsonValue* pUserStatusVal = null;
         pJsonObject->GetValue(pUserStatusKey, pUserStatusVal);
         if(pUserStatusVal != null) {
@@ -185,7 +183,6 @@ SamiUser::fromJsonObject(IJsonValue* pJson) {
             jsonToValue(pUserStatus, pUserStatusVal, L"Integer", L"Integer");
         }
         delete pUserStatusKey;
-        
     }
 }
 
@@ -236,39 +233,30 @@ SamiUser::asJsonObject() {
     JsonObject *pJsonObject = new JsonObject();
     pJsonObject->Construct();
 
-    
     JsonString *pIdKey = new JsonString(L"id");
     pJsonObject->Add(pIdKey, toJson(getPId(), "Long", ""));
 
-    
     JsonString *pUsernameKey = new JsonString(L"username");
     pJsonObject->Add(pUsernameKey, toJson(getPUsername(), "String", ""));
 
-    
     JsonString *pFirstNameKey = new JsonString(L"firstName");
     pJsonObject->Add(pFirstNameKey, toJson(getPFirstName(), "String", ""));
 
-    
     JsonString *pLastNameKey = new JsonString(L"lastName");
     pJsonObject->Add(pLastNameKey, toJson(getPLastName(), "String", ""));
 
-    
     JsonString *pEmailKey = new JsonString(L"email");
     pJsonObject->Add(pEmailKey, toJson(getPEmail(), "String", ""));
 
-    
     JsonString *pPasswordKey = new JsonString(L"password");
     pJsonObject->Add(pPasswordKey, toJson(getPPassword(), "String", ""));
 
-    
     JsonString *pPhoneKey = new JsonString(L"phone");
     pJsonObject->Add(pPhoneKey, toJson(getPPhone(), "String", ""));
 
-    
     JsonString *pUserStatusKey = new JsonString(L"userStatus");
     pJsonObject->Add(pUserStatusKey, toJson(getPUserStatus(), "Integer", ""));
 
-    
     return pJsonObject;
 }
 
diff --git a/samples/client/petstore/tizen/client/SamiUser.h b/samples/client/petstore/tizen/client/SamiUser.h
index a874f9c6245..6c456ae1fa1 100644
--- a/samples/client/petstore/tizen/client/SamiUser.h
+++ b/samples/client/petstore/tizen/client/SamiUser.h
@@ -17,9 +17,9 @@
 using namespace Tizen::Web::Json;
 
 
+using Tizen::Base::Integer;
 using Tizen::Base::Long;
 using Tizen::Base::String;
-using Tizen::Base::Integer;
 
 
 namespace Swagger {
@@ -42,42 +42,32 @@ public:
 
     SamiUser* fromJson(String* obj);
 
-    
     Long* getPId();
     void setPId(Long* pId);
-    
     String* getPUsername();
     void setPUsername(String* pUsername);
-    
     String* getPFirstName();
     void setPFirstName(String* pFirstName);
-    
     String* getPLastName();
     void setPLastName(String* pLastName);
-    
     String* getPEmail();
     void setPEmail(String* pEmail);
-    
     String* getPPassword();
     void setPPassword(String* pPassword);
-    
     String* getPPhone();
     void setPPhone(String* pPhone);
-    
     Integer* getPUserStatus();
     void setPUserStatus(Integer* pUserStatus);
-    
 
 private:
     Long* pId;
-    String* pUsername;
-    String* pFirstName;
-    String* pLastName;
-    String* pEmail;
-    String* pPassword;
-    String* pPhone;
-    Integer* pUserStatus;
-    
+String* pUsername;
+String* pFirstName;
+String* pLastName;
+String* pEmail;
+String* pPassword;
+String* pPhone;
+Integer* pUserStatus;
 };
 
 } /* namespace Swagger */
diff --git a/samples/client/petstore/tizen/client/SamiUserApi.cpp b/samples/client/petstore/tizen/client/SamiUserApi.cpp
index 7010ed6bac7..9ebb2b02fe6 100644
--- a/samples/client/petstore/tizen/client/SamiUserApi.cpp
+++ b/samples/client/petstore/tizen/client/SamiUserApi.cpp
@@ -39,27 +39,19 @@ SamiUserApi::createUserWithCompletion(SamiUser* body, void(*success)(SamiError*)
   headerParams->Construct();
 
   
-
   HashMap* queryParams = new HashMap(SingleObjectDeleter);
   queryParams->Construct();
 
   
-
   String* mBody = null;
 
-  
-  
-  
   if(body != null) {
     mBody = new String(body->asJson());
     headerParams->Add(new String("Content-Type"), new String("application/json"));
   }
-  
-  
 
   String url(L"/user");
 
-  
 
   client->execute(SamiUserApi::getBasePath(), url, "POST", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json");
   
@@ -88,16 +80,12 @@ SamiUserApi::createUsersWithArrayInputWithCompletion(IList* body, void(*success)
   headerParams->Construct();
 
   
-
   HashMap* queryParams = new HashMap(SingleObjectDeleter);
   queryParams->Construct();
 
   
-
   String* mBody = null;
 
-  
-  
   if(body != null) {
     mBody = new String("");
     int sz = body->GetCount();
@@ -111,13 +99,9 @@ SamiUserApi::createUsersWithArrayInputWithCompletion(IList* body, void(*success)
     mBody->Append("]");
     headerParams->Add(new String("Content-Type"), new String("application/json"));
   }
-  
-  
-  
 
   String url(L"/user/createWithArray");
 
-  
 
   client->execute(SamiUserApi::getBasePath(), url, "POST", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json");
   
@@ -146,16 +130,12 @@ SamiUserApi::createUsersWithListInputWithCompletion(IList* body, void(*success)(
   headerParams->Construct();
 
   
-
   HashMap* queryParams = new HashMap(SingleObjectDeleter);
   queryParams->Construct();
 
   
-
   String* mBody = null;
 
-  
-  
   if(body != null) {
     mBody = new String("");
     int sz = body->GetCount();
@@ -169,88 +149,16 @@ SamiUserApi::createUsersWithListInputWithCompletion(IList* body, void(*success)(
     mBody->Append("]");
     headerParams->Add(new String("Content-Type"), new String("application/json"));
   }
-  
-  
-  
 
   String url(L"/user/createWithList");
 
-  
 
   client->execute(SamiUserApi::getBasePath(), url, "POST", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json");
   
 }
 
 void
-loginUserProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) {
-  int code = pHttpResponse->GetHttpStatusCode();
-
-  if(code >= 200 && code < 300) {
-    ByteBuffer* pBuffer = pHttpResponse->ReadBodyN();
-    IJsonValue* pJson = JsonParser::ParseN(*pBuffer);
-
-    String* out = new String();
-    jsonToValue(out, pJson, L"String*", L"String");
-
-    if (pJson) {
-      if (pJson->GetType() == JSON_TYPE_OBJECT) {
-         JsonObject* pObject = static_cast< JsonObject* >(pJson);
-         pObject->RemoveAll(true);
-      }
-      else if (pJson->GetType() == JSON_TYPE_ARRAY) {
-         JsonArray* pArray = static_cast< JsonArray* >(pJson);
-         pArray->RemoveAll(true);
-      }
-      handler(out, null);
-    }
-    else {
-      SamiError* error = new SamiError(0, new String(L"No parsable response received"));
-      handler(null, error);
-    }
-    
-  }
-  else {
-    SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText()));
-    handler(null, error);
-    
-  }
-}
-
-String* 
-SamiUserApi::loginUserWithCompletion(String* username, String* password, void (* success)(String*, SamiError*)) {
-  client = new SamiApiClient();
-
-  client->success(&loginUserProcessor, (void(*)(void*, SamiError*))success);
-  HashMap* headerParams = new HashMap(SingleObjectDeleter);
-  headerParams->Construct();
-
-  
-
-  HashMap* queryParams = new HashMap(SingleObjectDeleter);
-  queryParams->Construct();
-
-  
-    queryParams->Add(new String("username"), username);
-  
-  
-    queryParams->Add(new String("password"), password);
-  
-  
-
-  String* mBody = null;
-
-  
-
-  String url(L"/user/login");
-
-  
-
-  client->execute(SamiUserApi::getBasePath(), url, "GET", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json");
-  return null;
-}
-
-void
-logoutUserProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) {
+deleteUserProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) {
   int code = pHttpResponse->GetHttpStatusCode();
 
   if(code >= 200 && code < 300) {
@@ -264,29 +172,29 @@ logoutUserProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiErr
 }
 
 void 
-SamiUserApi::logoutUserWithCompletion( void(*success)(SamiError*)) {
+SamiUserApi::deleteUserWithCompletion(String* username, void(*success)(SamiError*)) {
   client = new SamiApiClient();
 
-  client->success(&logoutUserProcessor, (void(*)(void*, SamiError*))success);
+  client->success(&deleteUserProcessor, (void(*)(void*, SamiError*))success);
   HashMap* headerParams = new HashMap(SingleObjectDeleter);
   headerParams->Construct();
 
   
-
   HashMap* queryParams = new HashMap(SingleObjectDeleter);
   queryParams->Construct();
 
   
-
   String* mBody = null;
 
-  
 
-  String url(L"/user/logout");
+  String url(L"/user/{username}");
 
-  
+  String s_username(L"{");
+  s_username.Append(L"username");
+  s_username.Append(L"}");
+  url.Replace(s_username, stringify(username, L"String*"));
 
-  client->execute(SamiUserApi::getBasePath(), url, "GET", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json");
+  client->execute(SamiUserApi::getBasePath(), url, "DELETE", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json");
   
 }
 
@@ -334,29 +242,123 @@ SamiUserApi::getUserByNameWithCompletion(String* username, void (* success)(Sami
   headerParams->Construct();
 
   
-
   HashMap* queryParams = new HashMap(SingleObjectDeleter);
   queryParams->Construct();
 
   
-
   String* mBody = null;
 
-  
 
   String url(L"/user/{username}");
 
-  
   String s_username(L"{");
   s_username.Append(L"username");
   s_username.Append(L"}");
   url.Replace(s_username, stringify(username, L"String*"));
-  
 
   client->execute(SamiUserApi::getBasePath(), url, "GET", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json");
   return null;
 }
 
+void
+loginUserProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) {
+  int code = pHttpResponse->GetHttpStatusCode();
+
+  if(code >= 200 && code < 300) {
+    ByteBuffer* pBuffer = pHttpResponse->ReadBodyN();
+    IJsonValue* pJson = JsonParser::ParseN(*pBuffer);
+
+    String* out = new String();
+    jsonToValue(out, pJson, L"String*", L"String");
+
+    if (pJson) {
+      if (pJson->GetType() == JSON_TYPE_OBJECT) {
+         JsonObject* pObject = static_cast< JsonObject* >(pJson);
+         pObject->RemoveAll(true);
+      }
+      else if (pJson->GetType() == JSON_TYPE_ARRAY) {
+         JsonArray* pArray = static_cast< JsonArray* >(pJson);
+         pArray->RemoveAll(true);
+      }
+      handler(out, null);
+    }
+    else {
+      SamiError* error = new SamiError(0, new String(L"No parsable response received"));
+      handler(null, error);
+    }
+    
+  }
+  else {
+    SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText()));
+    handler(null, error);
+    
+  }
+}
+
+String* 
+SamiUserApi::loginUserWithCompletion(String* username, String* password, void (* success)(String*, SamiError*)) {
+  client = new SamiApiClient();
+
+  client->success(&loginUserProcessor, (void(*)(void*, SamiError*))success);
+  HashMap* headerParams = new HashMap(SingleObjectDeleter);
+  headerParams->Construct();
+
+  
+  HashMap* queryParams = new HashMap(SingleObjectDeleter);
+  queryParams->Construct();
+
+  
+    queryParams->Add(new String("username"), username);
+
+    queryParams->Add(new String("password"), password);
+
+  String* mBody = null;
+
+
+  String url(L"/user/login");
+
+
+  client->execute(SamiUserApi::getBasePath(), url, "GET", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json");
+  return null;
+}
+
+void
+logoutUserProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) {
+  int code = pHttpResponse->GetHttpStatusCode();
+
+  if(code >= 200 && code < 300) {
+    handler(null, null);
+  }
+  else {
+    SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText()));
+    
+    handler(error, null);
+  }
+}
+
+void 
+SamiUserApi::logoutUserWithCompletion( void(*success)(SamiError*)) {
+  client = new SamiApiClient();
+
+  client->success(&logoutUserProcessor, (void(*)(void*, SamiError*))success);
+  HashMap* headerParams = new HashMap(SingleObjectDeleter);
+  headerParams->Construct();
+
+  
+  HashMap* queryParams = new HashMap(SingleObjectDeleter);
+  queryParams->Construct();
+
+  
+  String* mBody = null;
+
+
+  String url(L"/user/logout");
+
+
+  client->execute(SamiUserApi::getBasePath(), url, "GET", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json");
+  
+}
+
 void
 updateUserProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) {
   int code = pHttpResponse->GetHttpStatusCode();
@@ -380,82 +382,27 @@ SamiUserApi::updateUserWithCompletion(String* username, SamiUser* body, void(*su
   headerParams->Construct();
 
   
-
   HashMap* queryParams = new HashMap(SingleObjectDeleter);
   queryParams->Construct();
 
   
-
   String* mBody = null;
 
-  
-  
-  
   if(body != null) {
     mBody = new String(body->asJson());
     headerParams->Add(new String("Content-Type"), new String("application/json"));
   }
-  
-  
 
   String url(L"/user/{username}");
 
-  
   String s_username(L"{");
   s_username.Append(L"username");
   s_username.Append(L"}");
   url.Replace(s_username, stringify(username, L"String*"));
-  
 
   client->execute(SamiUserApi::getBasePath(), url, "PUT", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json");
   
 }
 
-void
-deleteUserProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiError*)) {
-  int code = pHttpResponse->GetHttpStatusCode();
-
-  if(code >= 200 && code < 300) {
-    handler(null, null);
-  }
-  else {
-    SamiError* error = new SamiError(code, new String(pHttpResponse->GetStatusText()));
-    
-    handler(error, null);
-  }
-}
-
-void 
-SamiUserApi::deleteUserWithCompletion(String* username, void(*success)(SamiError*)) {
-  client = new SamiApiClient();
-
-  client->success(&deleteUserProcessor, (void(*)(void*, SamiError*))success);
-  HashMap* headerParams = new HashMap(SingleObjectDeleter);
-  headerParams->Construct();
-
-  
-
-  HashMap* queryParams = new HashMap(SingleObjectDeleter);
-  queryParams->Construct();
-
-  
-
-  String* mBody = null;
-
-  
-
-  String url(L"/user/{username}");
-
-  
-  String s_username(L"{");
-  s_username.Append(L"username");
-  s_username.Append(L"}");
-  url.Replace(s_username, stringify(username, L"String*"));
-  
-
-  client->execute(SamiUserApi::getBasePath(), url, "DELETE", (IMap*)queryParams, mBody, (IMap*)headerParams, null, L"application/json");
-  
-}
-
 
 } /* namespace Swagger */
diff --git a/samples/client/petstore/tizen/client/SamiUserApi.h b/samples/client/petstore/tizen/client/SamiUserApi.h
index 1b42e3bc3b1..2851cb91419 100644
--- a/samples/client/petstore/tizen/client/SamiUserApi.h
+++ b/samples/client/petstore/tizen/client/SamiUserApi.h
@@ -18,31 +18,22 @@ public:
   SamiUserApi();
   virtual ~SamiUserApi();
 
-  
   void 
   createUserWithCompletion(SamiUser* body, void(* handler)(SamiError*));
-  
   void 
   createUsersWithArrayInputWithCompletion(IList* body, void(* handler)(SamiError*));
-  
   void 
   createUsersWithListInputWithCompletion(IList* body, void(* handler)(SamiError*));
-  
-  String* 
-  loginUserWithCompletion(String* username, String* password, void (* handler)(String*, SamiError*));
-  
-  void 
-  logoutUserWithCompletion( void(* handler)(SamiError*));
-  
-  SamiUser* 
-  getUserByNameWithCompletion(String* username, void (* handler)(SamiUser*, SamiError*));
-  
-  void 
-  updateUserWithCompletion(String* username, SamiUser* body, void(* handler)(SamiError*));
-  
   void 
   deleteUserWithCompletion(String* username, void(* handler)(SamiError*));
-  
+  SamiUser* 
+  getUserByNameWithCompletion(String* username, void (* handler)(SamiUser*, SamiError*));
+  String* 
+  loginUserWithCompletion(String* username, String* password, void (* handler)(String*, SamiError*));
+  void 
+  logoutUserWithCompletion( void(* handler)(SamiError*));
+  void 
+  updateUserWithCompletion(String* username, SamiUser* body, void(* handler)(SamiError*));
   static String getBasePath() {
     return L"http://petstore.swagger.io/v2";
   }
diff --git a/samples/client/petstore/typescript-node/api.ts b/samples/client/petstore/typescript-node/api.ts
index 3020e77491c..1e314a3fc64 100644
--- a/samples/client/petstore/typescript-node/api.ts
+++ b/samples/client/petstore/typescript-node/api.ts
@@ -8,11 +8,37 @@ import http = require('http');
 
 /* tslint:disable:no-unused-variable */
 
+export class Animal {
+    "className": string;
+}
+
+export class Cat extends Animal {
+    "declawed": boolean;
+}
+
 export class Category {
     "id": number;
     "name": string;
 }
 
+export class Dog extends Animal {
+    "breed": string;
+}
+
+export class FormatTest {
+    "integer": number;
+    "int32": number;
+    "int64": number;
+    "number": number;
+    "float": number;
+    "double": number;
+    "string": string;
+    "byte": string;
+    "binary": string;
+    "date": Date;
+    "dateTime": string;
+}
+
 export class InlineResponse200 {
     "tags": Array<Tag>;
     "id": number;
@@ -32,16 +58,26 @@ export namespace InlineResponse200 {
         sold = <any> 'sold'
     }
 }
+/**
+* Model for testing model name starting with number
+*/
 export class Model200Response {
     "name": number;
 }
 
+/**
+* Model for testing reserved words
+*/
 export class ModelReturn {
     "return": number;
 }
 
+/**
+* Model for testing model name same as property name
+*/
 export class Name {
     "name": number;
+    "snakeCase": number;
 }
 
 export class Order {
@@ -154,13 +190,19 @@ class VoidAuth implements Authentication {
     }
 }
 
+export enum PetApiApiKeys {
+    test_api_key_header,
+    api_key,
+    test_api_client_secret,
+    test_api_client_id,
+    test_api_key_query,
+}
+
 export class PetApi {
     protected basePath = 'http://petstore.swagger.io/v2';
     protected defaultHeaders : any = {};
 
-
-
-    public authentications = {
+    protected authentications = {
         'default': <Authentication>new VoidAuth(),
         'test_api_key_header': new ApiKeyAuth('header', 'test_api_key_header'),
         'api_key': new ApiKeyAuth('header', 'api_key'),
@@ -187,12 +229,8 @@ export class PetApi {
         }
     }
 
-    set apiKey(key: string) {
-        this.authentications.test_api_key_header.apiKey = key;
-    }
-
-    set apiKey(key: string) {
-        this.authentications.api_key.apiKey = key;
+    public setApiKey(key: PetApiApiKeys, value: string) {
+        this.authentications[PetApiApiKeys[key]].apiKey = value;
     }
 
     set username(username: string) {
@@ -203,18 +241,6 @@ export class PetApi {
         this.authentications.test_http_basic.password = password;
     }
 
-    set apiKey(key: string) {
-        this.authentications.test_api_client_secret.apiKey = key;
-    }
-
-    set apiKey(key: string) {
-        this.authentications.test_api_client_id.apiKey = key;
-    }
-
-    set apiKey(key: string) {
-        this.authentications.test_api_key_query.apiKey = key;
-    }
-
     set accessToken(token: string) {
         this.authentications.petstore_auth.accessToken = token;
     }
@@ -283,7 +309,7 @@ export class PetApi {
      * @param body Pet object in the form of byte array
      */
     public addPetUsingByteArray (body?: string) : Promise<{ response: http.ClientResponse; body?: any;  }> {
-        const localVarPath = this.basePath + '/pet?testing_byte_array=true';
+        const localVarPath = this.basePath + '/pet?testing_byte_array&#x3D;true';
         let queryParameters: any = {};
         let headerParams: any = this.extendObj({}, this.defaultHeaders);
         let formParams: any = {};
@@ -342,9 +368,9 @@ export class PetApi {
         let formParams: any = {};
 
 
-        // verify required parameter 'petId' is set
-        if (!petId) {
-            throw new Error('Missing required parameter petId when calling deletePet');
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new Error('Required parameter petId was null or undefined when calling deletePet.');
         }
 
         headerParams['api_key'] = apiKey;
@@ -508,9 +534,9 @@ export class PetApi {
         let formParams: any = {};
 
 
-        // verify required parameter 'petId' is set
-        if (!petId) {
-            throw new Error('Missing required parameter petId when calling getPetById');
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new Error('Required parameter petId was null or undefined when calling getPetById.');
         }
 
         let useFormData = false;
@@ -559,16 +585,16 @@ export class PetApi {
      * @param petId ID of pet that needs to be fetched
      */
     public getPetByIdInObject (petId: number) : Promise<{ response: http.ClientResponse; body: InlineResponse200;  }> {
-        const localVarPath = this.basePath + '/pet/{petId}?response=inline_arbitrary_object'
+        const localVarPath = this.basePath + '/pet/{petId}?response&#x3D;inline_arbitrary_object'
             .replace('{' + 'petId' + '}', String(petId));
         let queryParameters: any = {};
         let headerParams: any = this.extendObj({}, this.defaultHeaders);
         let formParams: any = {};
 
 
-        // verify required parameter 'petId' is set
-        if (!petId) {
-            throw new Error('Missing required parameter petId when calling getPetByIdInObject');
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new Error('Required parameter petId was null or undefined when calling getPetByIdInObject.');
         }
 
         let useFormData = false;
@@ -617,16 +643,16 @@ export class PetApi {
      * @param petId ID of pet that needs to be fetched
      */
     public petPetIdtestingByteArraytrueGet (petId: number) : Promise<{ response: http.ClientResponse; body: string;  }> {
-        const localVarPath = this.basePath + '/pet/{petId}?testing_byte_array=true'
+        const localVarPath = this.basePath + '/pet/{petId}?testing_byte_array&#x3D;true'
             .replace('{' + 'petId' + '}', String(petId));
         let queryParameters: any = {};
         let headerParams: any = this.extendObj({}, this.defaultHeaders);
         let formParams: any = {};
 
 
-        // verify required parameter 'petId' is set
-        if (!petId) {
-            throw new Error('Missing required parameter petId when calling petPetIdtestingByteArraytrueGet');
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new Error('Required parameter petId was null or undefined when calling petPetIdtestingByteArraytrueGet.');
         }
 
         let useFormData = false;
@@ -735,9 +761,9 @@ export class PetApi {
         let formParams: any = {};
 
 
-        // verify required parameter 'petId' is set
-        if (!petId) {
-            throw new Error('Missing required parameter petId when calling updatePetWithForm');
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new Error('Required parameter petId was null or undefined when calling updatePetWithForm.');
         }
 
         let useFormData = false;
@@ -801,9 +827,9 @@ export class PetApi {
         let formParams: any = {};
 
 
-        // verify required parameter 'petId' is set
-        if (!petId) {
-            throw new Error('Missing required parameter petId when calling uploadFile');
+        // verify required parameter 'petId' is not null or undefined
+        if (petId === null || petId === undefined) {
+            throw new Error('Required parameter petId was null or undefined when calling uploadFile.');
         }
 
         let useFormData = false;
@@ -854,13 +880,19 @@ export class PetApi {
         return localVarDeferred.promise;
     }
 }
+export enum StoreApiApiKeys {
+    test_api_key_header,
+    api_key,
+    test_api_client_secret,
+    test_api_client_id,
+    test_api_key_query,
+}
+
 export class StoreApi {
     protected basePath = 'http://petstore.swagger.io/v2';
     protected defaultHeaders : any = {};
 
-
-
-    public authentications = {
+    protected authentications = {
         'default': <Authentication>new VoidAuth(),
         'test_api_key_header': new ApiKeyAuth('header', 'test_api_key_header'),
         'api_key': new ApiKeyAuth('header', 'api_key'),
@@ -887,12 +919,8 @@ export class StoreApi {
         }
     }
 
-    set apiKey(key: string) {
-        this.authentications.test_api_key_header.apiKey = key;
-    }
-
-    set apiKey(key: string) {
-        this.authentications.api_key.apiKey = key;
+    public setApiKey(key: StoreApiApiKeys, value: string) {
+        this.authentications[StoreApiApiKeys[key]].apiKey = value;
     }
 
     set username(username: string) {
@@ -903,18 +931,6 @@ export class StoreApi {
         this.authentications.test_http_basic.password = password;
     }
 
-    set apiKey(key: string) {
-        this.authentications.test_api_client_secret.apiKey = key;
-    }
-
-    set apiKey(key: string) {
-        this.authentications.test_api_client_id.apiKey = key;
-    }
-
-    set apiKey(key: string) {
-        this.authentications.test_api_key_query.apiKey = key;
-    }
-
     set accessToken(token: string) {
         this.authentications.petstore_auth.accessToken = token;
     }
@@ -939,9 +955,9 @@ export class StoreApi {
         let formParams: any = {};
 
 
-        // verify required parameter 'orderId' is set
-        if (!orderId) {
-            throw new Error('Missing required parameter orderId when calling deleteOrder');
+        // verify required parameter 'orderId' is not null or undefined
+        if (orderId === null || orderId === undefined) {
+            throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.');
         }
 
         let useFormData = false;
@@ -1090,7 +1106,7 @@ export class StoreApi {
      * Returns an arbitrary object which is actually a map of status codes to quantities
      */
     public getInventoryInObject () : Promise<{ response: http.ClientResponse; body: any;  }> {
-        const localVarPath = this.basePath + '/store/inventory?response=arbitrary_object';
+        const localVarPath = this.basePath + '/store/inventory?response&#x3D;arbitrary_object';
         let queryParameters: any = {};
         let headerParams: any = this.extendObj({}, this.defaultHeaders);
         let formParams: any = {};
@@ -1136,7 +1152,7 @@ export class StoreApi {
     }
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
      * @param orderId ID of pet that needs to be fetched
      */
     public getOrderById (orderId: string) : Promise<{ response: http.ClientResponse; body: Order;  }> {
@@ -1147,9 +1163,9 @@ export class StoreApi {
         let formParams: any = {};
 
 
-        // verify required parameter 'orderId' is set
-        if (!orderId) {
-            throw new Error('Missing required parameter orderId when calling getOrderById');
+        // verify required parameter 'orderId' is not null or undefined
+        if (orderId === null || orderId === undefined) {
+            throw new Error('Required parameter orderId was null or undefined when calling getOrderById.');
         }
 
         let useFormData = false;
@@ -1246,13 +1262,19 @@ export class StoreApi {
         return localVarDeferred.promise;
     }
 }
+export enum UserApiApiKeys {
+    test_api_key_header,
+    api_key,
+    test_api_client_secret,
+    test_api_client_id,
+    test_api_key_query,
+}
+
 export class UserApi {
     protected basePath = 'http://petstore.swagger.io/v2';
     protected defaultHeaders : any = {};
 
-
-
-    public authentications = {
+    protected authentications = {
         'default': <Authentication>new VoidAuth(),
         'test_api_key_header': new ApiKeyAuth('header', 'test_api_key_header'),
         'api_key': new ApiKeyAuth('header', 'api_key'),
@@ -1279,12 +1301,8 @@ export class UserApi {
         }
     }
 
-    set apiKey(key: string) {
-        this.authentications.test_api_key_header.apiKey = key;
-    }
-
-    set apiKey(key: string) {
-        this.authentications.api_key.apiKey = key;
+    public setApiKey(key: UserApiApiKeys, value: string) {
+        this.authentications[UserApiApiKeys[key]].apiKey = value;
     }
 
     set username(username: string) {
@@ -1295,18 +1313,6 @@ export class UserApi {
         this.authentications.test_http_basic.password = password;
     }
 
-    set apiKey(key: string) {
-        this.authentications.test_api_client_secret.apiKey = key;
-    }
-
-    set apiKey(key: string) {
-        this.authentications.test_api_client_id.apiKey = key;
-    }
-
-    set apiKey(key: string) {
-        this.authentications.test_api_key_query.apiKey = key;
-    }
-
     set accessToken(token: string) {
         this.authentications.petstore_auth.accessToken = token;
     }
@@ -1478,9 +1484,9 @@ export class UserApi {
         let formParams: any = {};
 
 
-        // verify required parameter 'username' is set
-        if (!username) {
-            throw new Error('Missing required parameter username when calling deleteUser');
+        // verify required parameter 'username' is not null or undefined
+        if (username === null || username === undefined) {
+            throw new Error('Required parameter username was null or undefined when calling deleteUser.');
         }
 
         let useFormData = false;
@@ -1524,7 +1530,7 @@ export class UserApi {
     /**
      * Get user by user name
      * 
-     * @param username The name that needs to be fetched. Use user1 for testing.
+     * @param username The name that needs to be fetched. Use user1 for testing. 
      */
     public getUserByName (username: string) : Promise<{ response: http.ClientResponse; body: User;  }> {
         const localVarPath = this.basePath + '/user/{username}'
@@ -1534,9 +1540,9 @@ export class UserApi {
         let formParams: any = {};
 
 
-        // verify required parameter 'username' is set
-        if (!username) {
-            throw new Error('Missing required parameter username when calling getUserByName');
+        // verify required parameter 'username' is not null or undefined
+        if (username === null || username === undefined) {
+            throw new Error('Required parameter username was null or undefined when calling getUserByName.');
         }
 
         let useFormData = false;
@@ -1693,9 +1699,9 @@ export class UserApi {
         let formParams: any = {};
 
 
-        // verify required parameter 'username' is set
-        if (!username) {
-            throw new Error('Missing required parameter username when calling updateUser');
+        // verify required parameter 'username' is not null or undefined
+        if (username === null || username === undefined) {
+            throw new Error('Required parameter username was null or undefined when calling updateUser.');
         }
 
         let useFormData = false;
diff --git a/samples/client/petstore/typescript-node/client.ts b/samples/client/petstore/typescript-node/client.ts
index 891feef3902..51a7f687e09 100644
--- a/samples/client/petstore/typescript-node/client.ts
+++ b/samples/client/petstore/typescript-node/client.ts
@@ -2,7 +2,8 @@ import api = require('./api');
 import fs = require('fs');
 
 var petApi = new api.PetApi();
-petApi.apiKey = 'special-key';
+petApi.setApiKey(api.PetApiApiKeys.api_key, 'special-key');
+petApi.setApiKey(api.PetApiApiKeys.test_api_key_header, 'query-key');
 
 var tag1 = new api.Tag();
 tag1.id = 18291;
diff --git a/samples/dynamic-html/docs/index.html b/samples/dynamic-html/docs/index.html
index 22ed5d50b68..e72389d4e84 100644
--- a/samples/dynamic-html/docs/index.html
+++ b/samples/dynamic-html/docs/index.html
@@ -29,82 +29,47 @@
             <li>Getting Started</li>
           </ul>
         </div>
-        
-    		
-        <div class="section-box">
-          <div class="section-header">
-            <a href="#!/UserApi">UserApi</a>
-          </div>
-          <ul>
-			      
-			      
-            <li><a href="#!/UserApi#createUser">createUser</a></li>
-            
-            <li><a href="#!/UserApi#createUsersWithArrayInput">createUsersWithArrayInput</a></li>
-            
-            <li><a href="#!/UserApi#createUsersWithListInput">createUsersWithListInput</a></li>
-            
-            <li><a href="#!/UserApi#loginUser">loginUser</a></li>
-            
-            <li><a href="#!/UserApi#logoutUser">logoutUser</a></li>
-            
-            <li><a href="#!/UserApi#getUserByName">getUserByName</a></li>
-            
-            <li><a href="#!/UserApi#updateUser">updateUser</a></li>
-            
-            <li><a href="#!/UserApi#deleteUser">deleteUser</a></li>
-            
-            
-          </ul>
-        </div>
-        
         <div class="section-box">
           <div class="section-header">
             <a href="#!/PetApi">PetApi</a>
           </div>
           <ul>
-			      
-			      
-            <li><a href="#!/PetApi#updatePet">updatePet</a></li>
-            
             <li><a href="#!/PetApi#addPet">addPet</a></li>
-            
-            <li><a href="#!/PetApi#findPetsByStatus">findPetsByStatus</a></li>
-            
-            <li><a href="#!/PetApi#findPetsByTags">findPetsByTags</a></li>
-            
-            <li><a href="#!/PetApi#getPetById">getPetById</a></li>
-            
-            <li><a href="#!/PetApi#updatePetWithForm">updatePetWithForm</a></li>
-            
             <li><a href="#!/PetApi#deletePet">deletePet</a></li>
-            
+            <li><a href="#!/PetApi#findPetsByStatus">findPetsByStatus</a></li>
+            <li><a href="#!/PetApi#findPetsByTags">findPetsByTags</a></li>
+            <li><a href="#!/PetApi#getPetById">getPetById</a></li>
+            <li><a href="#!/PetApi#updatePet">updatePet</a></li>
+            <li><a href="#!/PetApi#updatePetWithForm">updatePetWithForm</a></li>
             <li><a href="#!/PetApi#uploadFile">uploadFile</a></li>
-            
-            
           </ul>
         </div>
-        
         <div class="section-box">
           <div class="section-header">
             <a href="#!/StoreApi">StoreApi</a>
           </div>
           <ul>
-			      
-			      
-            <li><a href="#!/StoreApi#getInventory">getInventory</a></li>
-            
-            <li><a href="#!/StoreApi#placeOrder">placeOrder</a></li>
-            
-            <li><a href="#!/StoreApi#getOrderById">getOrderById</a></li>
-            
             <li><a href="#!/StoreApi#deleteOrder">deleteOrder</a></li>
-            
-            
+            <li><a href="#!/StoreApi#getInventory">getInventory</a></li>
+            <li><a href="#!/StoreApi#getOrderById">getOrderById</a></li>
+            <li><a href="#!/StoreApi#placeOrder">placeOrder</a></li>
+          </ul>
+        </div>
+        <div class="section-box">
+          <div class="section-header">
+            <a href="#!/UserApi">UserApi</a>
+          </div>
+          <ul>
+            <li><a href="#!/UserApi#createUser">createUser</a></li>
+            <li><a href="#!/UserApi#createUsersWithArrayInput">createUsersWithArrayInput</a></li>
+            <li><a href="#!/UserApi#createUsersWithListInput">createUsersWithListInput</a></li>
+            <li><a href="#!/UserApi#deleteUser">deleteUser</a></li>
+            <li><a href="#!/UserApi#getUserByName">getUserByName</a></li>
+            <li><a href="#!/UserApi#loginUser">loginUser</a></li>
+            <li><a href="#!/UserApi#logoutUser">logoutUser</a></li>
+            <li><a href="#!/UserApi#updateUser">updateUser</a></li>
           </ul>
         </div>
-        
-        
       </div>
     <div class="non-sidebar">
       <div class="main-content">
diff --git a/samples/dynamic-html/docs/models/ApiResponse.html b/samples/dynamic-html/docs/models/ApiResponse.html
new file mode 100644
index 00000000000..8e7d4fa4785
--- /dev/null
+++ b/samples/dynamic-html/docs/models/ApiResponse.html
@@ -0,0 +1,17 @@
+
+<h2>ApiResponse</h2>
+<ul class="parameter">
+  <li class="param-required-">code : Integer
+    <br/>
+  </li>
+</ul>
+<ul class="parameter">
+  <li class="param-required-">type : String
+    <br/>
+  </li>
+</ul>
+<ul class="parameter">
+  <li class="param-required-">message : String
+    <br/>
+  </li>
+</ul>
diff --git a/samples/dynamic-html/docs/models/Category.html b/samples/dynamic-html/docs/models/Category.html
index 99ec473bcc7..3c6da307af8 100644
--- a/samples/dynamic-html/docs/models/Category.html
+++ b/samples/dynamic-html/docs/models/Category.html
@@ -1,17 +1,12 @@
 
 <h2>Category</h2>
-  
 <ul class="parameter">
   <li class="param-required-">id : Long
     <br/>
-    
   </li>
 </ul>
-  
 <ul class="parameter">
   <li class="param-required-">name : String
     <br/>
-    
   </li>
 </ul>
-  
diff --git a/samples/dynamic-html/docs/models/Order.html b/samples/dynamic-html/docs/models/Order.html
index a45f7d6cd65..63d480f3e83 100644
--- a/samples/dynamic-html/docs/models/Order.html
+++ b/samples/dynamic-html/docs/models/Order.html
@@ -1,57 +1,39 @@
 
 <h2>Order</h2>
-  
 <ul class="parameter">
   <li class="param-required-">id : Long
     <br/>
-    
   </li>
 </ul>
-  
 <ul class="parameter">
   <li class="param-required-">petId : Long
     <br/>
-    
   </li>
 </ul>
-  
 <ul class="parameter">
   <li class="param-required-">quantity : Integer
     <br/>
-    
   </li>
 </ul>
-  
 <ul class="parameter">
   <li class="param-required-">shipDate : Date
     <br/>
-    
   </li>
 </ul>
-  
 <ul class="parameter">
   <li class="param-required-">status : String
     <br/>Order Status
-    
       <dl class="param-enum">
         <dt>Enum:
-          
             <dd>placed</dd>
-          
             <dd>approved</dd>
-          
             <dd>delivered</dd>
-          
         </dt>
       </dl>
-    
   </li>
 </ul>
-  
 <ul class="parameter">
   <li class="param-required-">complete : Boolean
     <br/>
-    
   </li>
 </ul>
-  
diff --git a/samples/dynamic-html/docs/models/Pet.html b/samples/dynamic-html/docs/models/Pet.html
index 2578f97e660..e7adb8a05a0 100644
--- a/samples/dynamic-html/docs/models/Pet.html
+++ b/samples/dynamic-html/docs/models/Pet.html
@@ -1,57 +1,39 @@
 
 <h2>Pet</h2>
-  
 <ul class="parameter">
   <li class="param-required-">id : Long
     <br/>
-    
   </li>
 </ul>
-  
 <ul class="parameter">
   <li class="param-required-">category : Category
     <br/>
-    
   </li>
 </ul>
-  
 <ul class="parameter">
   <li class="param-required-true">name : String
     <br/>
-    
   </li>
 </ul>
-  
 <ul class="parameter">
   <li class="param-required-true">photoUrls : List
     <br/>
-    
   </li>
 </ul>
-  
 <ul class="parameter">
   <li class="param-required-">tags : List
     <br/>
-    
   </li>
 </ul>
-  
 <ul class="parameter">
   <li class="param-required-">status : String
     <br/>pet status in the store
-    
       <dl class="param-enum">
         <dt>Enum:
-          
             <dd>available</dd>
-          
             <dd>pending</dd>
-          
             <dd>sold</dd>
-          
         </dt>
       </dl>
-    
   </li>
 </ul>
-  
diff --git a/samples/dynamic-html/docs/models/Tag.html b/samples/dynamic-html/docs/models/Tag.html
index bf1ef9eadaf..a62d2f0128b 100644
--- a/samples/dynamic-html/docs/models/Tag.html
+++ b/samples/dynamic-html/docs/models/Tag.html
@@ -1,17 +1,12 @@
 
 <h2>Tag</h2>
-  
 <ul class="parameter">
   <li class="param-required-">id : Long
     <br/>
-    
   </li>
 </ul>
-  
 <ul class="parameter">
   <li class="param-required-">name : String
     <br/>
-    
   </li>
 </ul>
-  
diff --git a/samples/dynamic-html/docs/models/User.html b/samples/dynamic-html/docs/models/User.html
index d742aa7cfde..4659f77f8f4 100644
--- a/samples/dynamic-html/docs/models/User.html
+++ b/samples/dynamic-html/docs/models/User.html
@@ -1,59 +1,42 @@
 
 <h2>User</h2>
-  
 <ul class="parameter">
   <li class="param-required-">id : Long
     <br/>
-    
   </li>
 </ul>
-  
 <ul class="parameter">
   <li class="param-required-">username : String
     <br/>
-    
   </li>
 </ul>
-  
 <ul class="parameter">
   <li class="param-required-">firstName : String
     <br/>
-    
   </li>
 </ul>
-  
 <ul class="parameter">
   <li class="param-required-">lastName : String
     <br/>
-    
   </li>
 </ul>
-  
 <ul class="parameter">
   <li class="param-required-">email : String
     <br/>
-    
   </li>
 </ul>
-  
 <ul class="parameter">
   <li class="param-required-">password : String
     <br/>
-    
   </li>
 </ul>
-  
 <ul class="parameter">
   <li class="param-required-">phone : String
     <br/>
-    
   </li>
 </ul>
-  
 <ul class="parameter">
   <li class="param-required-">userStatus : Integer
     <br/>User Status
-    
   </li>
 </ul>
-  
diff --git a/samples/dynamic-html/docs/operations/PetApi.html b/samples/dynamic-html/docs/operations/PetApi.html
index 08e1cd1d42c..cf11a3814dc 100644
--- a/samples/dynamic-html/docs/operations/PetApi.html
+++ b/samples/dynamic-html/docs/operations/PetApi.html
@@ -2,35 +2,6 @@
   <h2><a name=""></a></h2>
   <p>This is the  API</p>
 
-  
-  
-  <h2><a name="updatePet"></a>updatePet</h2>
-  <hr>
-  <p></p>
-  <p></p>
-  <h3 class="section">URL</h3>
-  <code>http://petstore.swagger.io/v2/pet</code>
-  <h3 class="section">HTTP Method</h3>
-  <code>PUT</code>
-  <h3 class="section">Response Type</h3>
-  <div class="model" data-model=""><a href=""></a></div>
-  <h3 class="section">Parameters</h3>
-  <ul>
-  	
-	  <li class="parameter">
-      
-      
-      
-      
-      <span class="param-in">Body: </span>
-      <span class="param-name">body</span>
-      <span class="param-type">Pet</span>
-      
-      <p class="param-description">Pet object that needs to be added to the store</p>
-	  </li>
-    
-  </ul>
-  
   <h2><a name="addPet"></a>addPet</h2>
   <hr>
   <p></p>
@@ -43,7 +14,6 @@
   <div class="model" data-model=""><a href=""></a></div>
   <h3 class="section">Parameters</h3>
   <ul>
-  	
 	  <li class="parameter">
       
       
@@ -51,145 +21,11 @@
       
       <span class="param-in">Body: </span>
       <span class="param-name">body</span>
-      <span class="param-type">Pet</span>
+      <span class="param-type">Pet(Pet)</span>
       
       <p class="param-description">Pet object that needs to be added to the store</p>
 	  </li>
-    
   </ul>
-  
-  <h2><a name="findPetsByStatus"></a>findPetsByStatus</h2>
-  <hr>
-  <p></p>
-  <p>Multiple status values can be provided with comma seperated strings</p>
-  <h3 class="section">URL</h3>
-  <code>http://petstore.swagger.io/v2/pet/findByStatus</code>
-  <h3 class="section">HTTP Method</h3>
-  <code>GET</code>
-  <h3 class="section">Response Type</h3>
-  <div class="model" data-model="Pet"><a href="">List</a></div>
-  <h3 class="section">Parameters</h3>
-  <ul>
-  	
-	  <li class="parameter">
-      
-      <span class="param-in">Query: </span>
-      
-      
-      
-      <span class="param-name">status</span>
-      <span class="param-type">List(String)</span>
-      
-      <p class="param-description">Status values that need to be considered for filter</p>
-	  </li>
-    
-  </ul>
-  
-  <h2><a name="findPetsByTags"></a>findPetsByTags</h2>
-  <hr>
-  <p></p>
-  <p>Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.</p>
-  <h3 class="section">URL</h3>
-  <code>http://petstore.swagger.io/v2/pet/findByTags</code>
-  <h3 class="section">HTTP Method</h3>
-  <code>GET</code>
-  <h3 class="section">Response Type</h3>
-  <div class="model" data-model="Pet"><a href="">List</a></div>
-  <h3 class="section">Parameters</h3>
-  <ul>
-  	
-	  <li class="parameter">
-      
-      <span class="param-in">Query: </span>
-      
-      
-      
-      <span class="param-name">tags</span>
-      <span class="param-type">List(String)</span>
-      
-      <p class="param-description">Tags to filter by</p>
-	  </li>
-    
-  </ul>
-  
-  <h2><a name="getPetById"></a>getPetById</h2>
-  <hr>
-  <p></p>
-  <p>Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions</p>
-  <h3 class="section">URL</h3>
-  <code>http://petstore.swagger.io/v2/pet/{petId}</code>
-  <h3 class="section">HTTP Method</h3>
-  <code>GET</code>
-  <h3 class="section">Response Type</h3>
-  <div class="model" data-model="Pet"><a href="">Pet</a></div>
-  <h3 class="section">Parameters</h3>
-  <ul>
-  	
-	  <li class="parameter">
-      
-      
-      <span class="param-in">Path: </span>
-      
-      
-      <span class="param-name">petId</span>
-      <span class="param-type">Long</span>
-      
-      <p class="param-description">ID of pet that needs to be fetched</p>
-	  </li>
-    
-  </ul>
-  
-  <h2><a name="updatePetWithForm"></a>updatePetWithForm</h2>
-  <hr>
-  <p></p>
-  <p></p>
-  <h3 class="section">URL</h3>
-  <code>http://petstore.swagger.io/v2/pet/{petId}</code>
-  <h3 class="section">HTTP Method</h3>
-  <code>POST</code>
-  <h3 class="section">Response Type</h3>
-  <div class="model" data-model=""><a href=""></a></div>
-  <h3 class="section">Parameters</h3>
-  <ul>
-  	
-	  <li class="parameter">
-      
-      
-      <span class="param-in">Path: </span>
-      
-      
-      <span class="param-name">petId</span>
-      <span class="param-type">String</span>
-      
-      <p class="param-description">ID of pet that needs to be updated</p>
-	  </li>
-    
-	  <li class="parameter">
-      <span class="param-in">Form: </span>
-      
-      
-      
-      
-      <span class="param-name">name</span>
-      <span class="param-type">String</span>
-      
-      <p class="param-description">Updated name of the pet</p>
-	  </li>
-    
-	  <li class="parameter">
-      <span class="param-in">Form: </span>
-      
-      
-      
-      
-      <span class="param-name">status</span>
-      <span class="param-type">String</span>
-      
-      <p class="param-description">Updated status of the pet</p>
-	  </li>
-    
-  </ul>
-  
   <h2><a name="deletePet"></a>deletePet</h2>
   <hr>
   <p></p>
@@ -202,7 +38,6 @@
   <div class="model" data-model=""><a href=""></a></div>
   <h3 class="section">Parameters</h3>
   <ul>
-  	
 	  <li class="parameter">
       
       
@@ -214,7 +49,6 @@
       
       <p class="param-description">Pet id to delete</p>
 	  </li>
-    
 	  <li class="parameter">
       
       
@@ -226,9 +60,149 @@
       
       <p class="param-description"></p>
 	  </li>
-    
   </ul>
-  
+  <h2><a name="findPetsByStatus"></a>findPetsByStatus</h2>
+  <hr>
+  <p></p>
+  <p>Multiple status values can be provided with comma separated strings</p>
+  <h3 class="section">URL</h3>
+  <code>http://petstore.swagger.io/v2/pet/findByStatus</code>
+  <h3 class="section">HTTP Method</h3>
+  <code>GET</code>
+  <h3 class="section">Response Type</h3>
+  <div class="model" data-model="Pet"><a href="">List</a></div>
+  <h3 class="section">Parameters</h3>
+  <ul>
+	  <li class="parameter">
+      
+      <span class="param-in">Query: </span>
+      
+      
+      
+      <span class="param-name">status</span>
+      <span class="param-type">List(String)</span>
+      
+      <p class="param-description">Status values that need to be considered for filter</p>
+	  </li>
+  </ul>
+  <h2><a name="findPetsByTags"></a>findPetsByTags</h2>
+  <hr>
+  <p></p>
+  <p>Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.</p>
+  <h3 class="section">URL</h3>
+  <code>http://petstore.swagger.io/v2/pet/findByTags</code>
+  <h3 class="section">HTTP Method</h3>
+  <code>GET</code>
+  <h3 class="section">Response Type</h3>
+  <div class="model" data-model="Pet"><a href="">List</a></div>
+  <h3 class="section">Parameters</h3>
+  <ul>
+	  <li class="parameter">
+      
+      <span class="param-in">Query: </span>
+      
+      
+      
+      <span class="param-name">tags</span>
+      <span class="param-type">List(String)</span>
+      
+      <p class="param-description">Tags to filter by</p>
+	  </li>
+  </ul>
+  <h2><a name="getPetById"></a>getPetById</h2>
+  <hr>
+  <p></p>
+  <p>Returns a single pet</p>
+  <h3 class="section">URL</h3>
+  <code>http://petstore.swagger.io/v2/pet/{petId}</code>
+  <h3 class="section">HTTP Method</h3>
+  <code>GET</code>
+  <h3 class="section">Response Type</h3>
+  <div class="model" data-model="Pet"><a href="">Pet</a></div>
+  <h3 class="section">Parameters</h3>
+  <ul>
+	  <li class="parameter">
+      
+      
+      <span class="param-in">Path: </span>
+      
+      
+      <span class="param-name">petId</span>
+      <span class="param-type">Long</span>
+      
+      <p class="param-description">ID of pet to return</p>
+	  </li>
+  </ul>
+  <h2><a name="updatePet"></a>updatePet</h2>
+  <hr>
+  <p></p>
+  <p></p>
+  <h3 class="section">URL</h3>
+  <code>http://petstore.swagger.io/v2/pet</code>
+  <h3 class="section">HTTP Method</h3>
+  <code>PUT</code>
+  <h3 class="section">Response Type</h3>
+  <div class="model" data-model=""><a href=""></a></div>
+  <h3 class="section">Parameters</h3>
+  <ul>
+	  <li class="parameter">
+      
+      
+      
+      
+      <span class="param-in">Body: </span>
+      <span class="param-name">body</span>
+      <span class="param-type">Pet(Pet)</span>
+      
+      <p class="param-description">Pet object that needs to be added to the store</p>
+	  </li>
+  </ul>
+  <h2><a name="updatePetWithForm"></a>updatePetWithForm</h2>
+  <hr>
+  <p></p>
+  <p></p>
+  <h3 class="section">URL</h3>
+  <code>http://petstore.swagger.io/v2/pet/{petId}</code>
+  <h3 class="section">HTTP Method</h3>
+  <code>POST</code>
+  <h3 class="section">Response Type</h3>
+  <div class="model" data-model=""><a href=""></a></div>
+  <h3 class="section">Parameters</h3>
+  <ul>
+	  <li class="parameter">
+      
+      
+      <span class="param-in">Path: </span>
+      
+      
+      <span class="param-name">petId</span>
+      <span class="param-type">Long</span>
+      
+      <p class="param-description">ID of pet that needs to be updated</p>
+	  </li>
+	  <li class="parameter">
+      <span class="param-in">Form: </span>
+      
+      
+      
+      
+      <span class="param-name">name</span>
+      <span class="param-type">String</span>
+      
+      <p class="param-description">Updated name of the pet</p>
+	  </li>
+	  <li class="parameter">
+      <span class="param-in">Form: </span>
+      
+      
+      
+      
+      <span class="param-name">status</span>
+      <span class="param-type">String</span>
+      
+      <p class="param-description">Updated status of the pet</p>
+	  </li>
+  </ul>
   <h2><a name="uploadFile"></a>uploadFile</h2>
   <hr>
   <p></p>
@@ -238,10 +212,9 @@
   <h3 class="section">HTTP Method</h3>
   <code>POST</code>
   <h3 class="section">Response Type</h3>
-  <div class="model" data-model=""><a href=""></a></div>
+  <div class="model" data-model="ApiResponse"><a href="">ApiResponse</a></div>
   <h3 class="section">Parameters</h3>
   <ul>
-  	
 	  <li class="parameter">
       
       
@@ -253,7 +226,6 @@
       
       <p class="param-description">ID of pet to update</p>
 	  </li>
-    
 	  <li class="parameter">
       <span class="param-in">Form: </span>
       
@@ -265,7 +237,6 @@
       
       <p class="param-description">Additional data to pass to server</p>
 	  </li>
-    
 	  <li class="parameter">
       <span class="param-in">Form: </span>
       
@@ -277,8 +248,5 @@
       
       <p class="param-description">file to upload</p>
 	  </li>
-    
   </ul>
-  
-  
 </div>
diff --git a/samples/dynamic-html/docs/operations/StoreApi.html b/samples/dynamic-html/docs/operations/StoreApi.html
index 65990b21423..4d4c7eeed50 100644
--- a/samples/dynamic-html/docs/operations/StoreApi.html
+++ b/samples/dynamic-html/docs/operations/StoreApi.html
@@ -2,77 +2,6 @@
   <h2><a name=""></a></h2>
   <p>This is the  API</p>
 
-  
-  
-  <h2><a name="getInventory"></a>getInventory</h2>
-  <hr>
-  <p></p>
-  <p>Returns a map of status codes to quantities</p>
-  <h3 class="section">URL</h3>
-  <code>http://petstore.swagger.io/v2/store/inventory</code>
-  <h3 class="section">HTTP Method</h3>
-  <code>GET</code>
-  <h3 class="section">Response Type</h3>
-  <div class="model" data-model="integer"><a href="">Map</a></div>
-  <h3 class="section">Parameters</h3>
-  <ul>
-  	
-  </ul>
-  
-  <h2><a name="placeOrder"></a>placeOrder</h2>
-  <hr>
-  <p></p>
-  <p></p>
-  <h3 class="section">URL</h3>
-  <code>http://petstore.swagger.io/v2/store/order</code>
-  <h3 class="section">HTTP Method</h3>
-  <code>POST</code>
-  <h3 class="section">Response Type</h3>
-  <div class="model" data-model="Order"><a href="">Order</a></div>
-  <h3 class="section">Parameters</h3>
-  <ul>
-  	
-	  <li class="parameter">
-      
-      
-      
-      
-      <span class="param-in">Body: </span>
-      <span class="param-name">body</span>
-      <span class="param-type">Order</span>
-      
-      <p class="param-description">order placed for purchasing the pet</p>
-	  </li>
-    
-  </ul>
-  
-  <h2><a name="getOrderById"></a>getOrderById</h2>
-  <hr>
-  <p></p>
-  <p>For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions</p>
-  <h3 class="section">URL</h3>
-  <code>http://petstore.swagger.io/v2/store/order/{orderId}</code>
-  <h3 class="section">HTTP Method</h3>
-  <code>GET</code>
-  <h3 class="section">Response Type</h3>
-  <div class="model" data-model="Order"><a href="">Order</a></div>
-  <h3 class="section">Parameters</h3>
-  <ul>
-  	
-	  <li class="parameter">
-      
-      
-      <span class="param-in">Path: </span>
-      
-      
-      <span class="param-name">orderId</span>
-      <span class="param-type">String</span>
-      
-      <p class="param-description">ID of pet that needs to be fetched</p>
-	  </li>
-    
-  </ul>
-  
   <h2><a name="deleteOrder"></a>deleteOrder</h2>
   <hr>
   <p></p>
@@ -85,7 +14,6 @@
   <div class="model" data-model=""><a href=""></a></div>
   <h3 class="section">Parameters</h3>
   <ul>
-  	
 	  <li class="parameter">
       
       
@@ -97,8 +25,66 @@
       
       <p class="param-description">ID of the order that needs to be deleted</p>
 	  </li>
-    
   </ul>
-  
-  
+  <h2><a name="getInventory"></a>getInventory</h2>
+  <hr>
+  <p></p>
+  <p>Returns a map of status codes to quantities</p>
+  <h3 class="section">URL</h3>
+  <code>http://petstore.swagger.io/v2/store/inventory</code>
+  <h3 class="section">HTTP Method</h3>
+  <code>GET</code>
+  <h3 class="section">Response Type</h3>
+  <div class="model" data-model="integer"><a href="">Map</a></div>
+  <h3 class="section">Parameters</h3>
+  <ul>
+  </ul>
+  <h2><a name="getOrderById"></a>getOrderById</h2>
+  <hr>
+  <p></p>
+  <p>For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions</p>
+  <h3 class="section">URL</h3>
+  <code>http://petstore.swagger.io/v2/store/order/{orderId}</code>
+  <h3 class="section">HTTP Method</h3>
+  <code>GET</code>
+  <h3 class="section">Response Type</h3>
+  <div class="model" data-model="Order"><a href="">Order</a></div>
+  <h3 class="section">Parameters</h3>
+  <ul>
+	  <li class="parameter">
+      
+      
+      <span class="param-in">Path: </span>
+      
+      
+      <span class="param-name">orderId</span>
+      <span class="param-type">Long</span>
+      
+      <p class="param-description">ID of pet that needs to be fetched</p>
+	  </li>
+  </ul>
+  <h2><a name="placeOrder"></a>placeOrder</h2>
+  <hr>
+  <p></p>
+  <p></p>
+  <h3 class="section">URL</h3>
+  <code>http://petstore.swagger.io/v2/store/order</code>
+  <h3 class="section">HTTP Method</h3>
+  <code>POST</code>
+  <h3 class="section">Response Type</h3>
+  <div class="model" data-model="Order"><a href="">Order</a></div>
+  <h3 class="section">Parameters</h3>
+  <ul>
+	  <li class="parameter">
+      
+      
+      
+      
+      <span class="param-in">Body: </span>
+      <span class="param-name">body</span>
+      <span class="param-type">Order(Order)</span>
+      
+      <p class="param-description">order placed for purchasing the pet</p>
+	  </li>
+  </ul>
 </div>
diff --git a/samples/dynamic-html/docs/operations/UserApi.html b/samples/dynamic-html/docs/operations/UserApi.html
index 8639fdfbf9f..cdd84feedac 100644
--- a/samples/dynamic-html/docs/operations/UserApi.html
+++ b/samples/dynamic-html/docs/operations/UserApi.html
@@ -2,8 +2,6 @@
   <h2><a name=""></a></h2>
   <p>This is the  API</p>
 
-  
-  
   <h2><a name="createUser"></a>createUser</h2>
   <hr>
   <p></p>
@@ -16,7 +14,6 @@
   <div class="model" data-model=""><a href=""></a></div>
   <h3 class="section">Parameters</h3>
   <ul>
-  	
 	  <li class="parameter">
       
       
@@ -24,13 +21,11 @@
       
       <span class="param-in">Body: </span>
       <span class="param-name">body</span>
-      <span class="param-type">User</span>
+      <span class="param-type">User(User)</span>
       
       <p class="param-description">Created user object</p>
 	  </li>
-    
   </ul>
-  
   <h2><a name="createUsersWithArrayInput"></a>createUsersWithArrayInput</h2>
   <hr>
   <p></p>
@@ -43,7 +38,6 @@
   <div class="model" data-model=""><a href=""></a></div>
   <h3 class="section">Parameters</h3>
   <ul>
-  	
 	  <li class="parameter">
       
       
@@ -51,13 +45,11 @@
       
       <span class="param-in">Body: </span>
       <span class="param-name">body</span>
-      <span class="param-type">List</span>
+      <span class="param-type">List(User)</span>
       
       <p class="param-description">List of user object</p>
 	  </li>
-    
   </ul>
-  
   <h2><a name="createUsersWithListInput"></a>createUsersWithListInput</h2>
   <hr>
   <p></p>
@@ -70,7 +62,6 @@
   <div class="model" data-model=""><a href=""></a></div>
   <h3 class="section">Parameters</h3>
   <ul>
-  	
 	  <li class="parameter">
       
       
@@ -78,133 +69,11 @@
       
       <span class="param-in">Body: </span>
       <span class="param-name">body</span>
-      <span class="param-type">List</span>
+      <span class="param-type">List(User)</span>
       
       <p class="param-description">List of user object</p>
 	  </li>
-    
   </ul>
-  
-  <h2><a name="loginUser"></a>loginUser</h2>
-  <hr>
-  <p></p>
-  <p></p>
-  <h3 class="section">URL</h3>
-  <code>http://petstore.swagger.io/v2/user/login</code>
-  <h3 class="section">HTTP Method</h3>
-  <code>GET</code>
-  <h3 class="section">Response Type</h3>
-  <div class="model" data-model="string"><a href="">String</a></div>
-  <h3 class="section">Parameters</h3>
-  <ul>
-  	
-	  <li class="parameter">
-      
-      <span class="param-in">Query: </span>
-      
-      
-      
-      <span class="param-name">username</span>
-      <span class="param-type">String</span>
-      
-      <p class="param-description">The user name for login</p>
-	  </li>
-    
-	  <li class="parameter">
-      
-      <span class="param-in">Query: </span>
-      
-      
-      
-      <span class="param-name">password</span>
-      <span class="param-type">String</span>
-      
-      <p class="param-description">The password for login in clear text</p>
-	  </li>
-    
-  </ul>
-  
-  <h2><a name="logoutUser"></a>logoutUser</h2>
-  <hr>
-  <p></p>
-  <p></p>
-  <h3 class="section">URL</h3>
-  <code>http://petstore.swagger.io/v2/user/logout</code>
-  <h3 class="section">HTTP Method</h3>
-  <code>GET</code>
-  <h3 class="section">Response Type</h3>
-  <div class="model" data-model=""><a href=""></a></div>
-  <h3 class="section">Parameters</h3>
-  <ul>
-  	
-  </ul>
-  
-  <h2><a name="getUserByName"></a>getUserByName</h2>
-  <hr>
-  <p></p>
-  <p></p>
-  <h3 class="section">URL</h3>
-  <code>http://petstore.swagger.io/v2/user/{username}</code>
-  <h3 class="section">HTTP Method</h3>
-  <code>GET</code>
-  <h3 class="section">Response Type</h3>
-  <div class="model" data-model="User"><a href="">User</a></div>
-  <h3 class="section">Parameters</h3>
-  <ul>
-  	
-	  <li class="parameter">
-      
-      
-      <span class="param-in">Path: </span>
-      
-      
-      <span class="param-name">username</span>
-      <span class="param-type">String</span>
-      
-      <p class="param-description">The name that needs to be fetched. Use user1 for testing.</p>
-	  </li>
-    
-  </ul>
-  
-  <h2><a name="updateUser"></a>updateUser</h2>
-  <hr>
-  <p></p>
-  <p>This can only be done by the logged in user.</p>
-  <h3 class="section">URL</h3>
-  <code>http://petstore.swagger.io/v2/user/{username}</code>
-  <h3 class="section">HTTP Method</h3>
-  <code>PUT</code>
-  <h3 class="section">Response Type</h3>
-  <div class="model" data-model=""><a href=""></a></div>
-  <h3 class="section">Parameters</h3>
-  <ul>
-  	
-	  <li class="parameter">
-      
-      
-      <span class="param-in">Path: </span>
-      
-      
-      <span class="param-name">username</span>
-      <span class="param-type">String</span>
-      
-      <p class="param-description">name that need to be deleted</p>
-	  </li>
-    
-	  <li class="parameter">
-      
-      
-      
-      
-      <span class="param-in">Body: </span>
-      <span class="param-name">body</span>
-      <span class="param-type">User</span>
-      
-      <p class="param-description">Updated user object</p>
-	  </li>
-    
-  </ul>
-  
   <h2><a name="deleteUser"></a>deleteUser</h2>
   <hr>
   <p></p>
@@ -217,7 +86,6 @@
   <div class="model" data-model=""><a href=""></a></div>
   <h3 class="section">Parameters</h3>
   <ul>
-  	
 	  <li class="parameter">
       
       
@@ -229,8 +97,112 @@
       
       <p class="param-description">The name that needs to be deleted</p>
 	  </li>
-    
   </ul>
-  
-  
+  <h2><a name="getUserByName"></a>getUserByName</h2>
+  <hr>
+  <p></p>
+  <p></p>
+  <h3 class="section">URL</h3>
+  <code>http://petstore.swagger.io/v2/user/{username}</code>
+  <h3 class="section">HTTP Method</h3>
+  <code>GET</code>
+  <h3 class="section">Response Type</h3>
+  <div class="model" data-model="User"><a href="">User</a></div>
+  <h3 class="section">Parameters</h3>
+  <ul>
+	  <li class="parameter">
+      
+      
+      <span class="param-in">Path: </span>
+      
+      
+      <span class="param-name">username</span>
+      <span class="param-type">String</span>
+      
+      <p class="param-description">The name that needs to be fetched. Use user1 for testing. </p>
+	  </li>
+  </ul>
+  <h2><a name="loginUser"></a>loginUser</h2>
+  <hr>
+  <p></p>
+  <p></p>
+  <h3 class="section">URL</h3>
+  <code>http://petstore.swagger.io/v2/user/login</code>
+  <h3 class="section">HTTP Method</h3>
+  <code>GET</code>
+  <h3 class="section">Response Type</h3>
+  <div class="model" data-model="string"><a href="">String</a></div>
+  <h3 class="section">Parameters</h3>
+  <ul>
+	  <li class="parameter">
+      
+      <span class="param-in">Query: </span>
+      
+      
+      
+      <span class="param-name">username</span>
+      <span class="param-type">String</span>
+      
+      <p class="param-description">The user name for login</p>
+	  </li>
+	  <li class="parameter">
+      
+      <span class="param-in">Query: </span>
+      
+      
+      
+      <span class="param-name">password</span>
+      <span class="param-type">String</span>
+      
+      <p class="param-description">The password for login in clear text</p>
+	  </li>
+  </ul>
+  <h2><a name="logoutUser"></a>logoutUser</h2>
+  <hr>
+  <p></p>
+  <p></p>
+  <h3 class="section">URL</h3>
+  <code>http://petstore.swagger.io/v2/user/logout</code>
+  <h3 class="section">HTTP Method</h3>
+  <code>GET</code>
+  <h3 class="section">Response Type</h3>
+  <div class="model" data-model=""><a href=""></a></div>
+  <h3 class="section">Parameters</h3>
+  <ul>
+  </ul>
+  <h2><a name="updateUser"></a>updateUser</h2>
+  <hr>
+  <p></p>
+  <p>This can only be done by the logged in user.</p>
+  <h3 class="section">URL</h3>
+  <code>http://petstore.swagger.io/v2/user/{username}</code>
+  <h3 class="section">HTTP Method</h3>
+  <code>PUT</code>
+  <h3 class="section">Response Type</h3>
+  <div class="model" data-model=""><a href=""></a></div>
+  <h3 class="section">Parameters</h3>
+  <ul>
+	  <li class="parameter">
+      
+      
+      <span class="param-in">Path: </span>
+      
+      
+      <span class="param-name">username</span>
+      <span class="param-type">String</span>
+      
+      <p class="param-description">name that need to be deleted</p>
+	  </li>
+	  <li class="parameter">
+      
+      
+      
+      
+      <span class="param-in">Body: </span>
+      <span class="param-name">body</span>
+      <span class="param-type">User(User)</span>
+      
+      <p class="param-description">Updated user object</p>
+	  </li>
+  </ul>
 </div>
diff --git a/samples/html/index.html b/samples/html/index.html
index cae7e02c9e0..c16a59a025a 100644
--- a/samples/html/index.html
+++ b/samples/html/index.html
@@ -182,7 +182,7 @@ font-style: italic;
   </head>
   <body>
   <h1>Swagger Petstore</h1>
-    <div class="app-desc">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</div>
+    <div class="app-desc">This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.</div>
     
     <div class="app-desc">Contact Info: <a href="apiteam@swagger.io">apiteam@swagger.io</a></div>
     <div class="app-desc">Version: 1.0.0</div>
@@ -194,450 +194,309 @@ font-style: italic;
   <h2><a name="__Methods">Methods</a></h2>
   [ Jump to <a href="#__Models">Models</a> ]
 
-  
   <h2>Table of Contents </h2>
   <div class="method-summary"></div>
-  
   <ol>
-  
-  
-  
-  <li><a href="#updatePet"><code><span class="http-method">put</span> /pet</code></a></li>
-  
   <li><a href="#addPet"><code><span class="http-method">post</span> /pet</code></a></li>
-  
-  <li><a href="#findPetsByStatus"><code><span class="http-method">get</span> /pet/findByStatus</code></a></li>
-  
-  <li><a href="#findPetsByTags"><code><span class="http-method">get</span> /pet/findByTags</code></a></li>
-  
-  <li><a href="#getPetById"><code><span class="http-method">get</span> /pet/{petId}</code></a></li>
-  
-  <li><a href="#updatePetWithForm"><code><span class="http-method">post</span> /pet/{petId}</code></a></li>
-  
   <li><a href="#deletePet"><code><span class="http-method">delete</span> /pet/{petId}</code></a></li>
-  
+  <li><a href="#findPetsByStatus"><code><span class="http-method">get</span> /pet/findByStatus</code></a></li>
+  <li><a href="#findPetsByTags"><code><span class="http-method">get</span> /pet/findByTags</code></a></li>
+  <li><a href="#getPetById"><code><span class="http-method">get</span> /pet/{petId}</code></a></li>
+  <li><a href="#updatePet"><code><span class="http-method">put</span> /pet</code></a></li>
+  <li><a href="#updatePetWithForm"><code><span class="http-method">post</span> /pet/{petId}</code></a></li>
   <li><a href="#uploadFile"><code><span class="http-method">post</span> /pet/{petId}/uploadImage</code></a></li>
-  
-  <li><a href="#getInventory"><code><span class="http-method">get</span> /store/inventory</code></a></li>
-  
-  <li><a href="#placeOrder"><code><span class="http-method">post</span> /store/order</code></a></li>
-  
-  <li><a href="#getOrderById"><code><span class="http-method">get</span> /store/order/{orderId}</code></a></li>
-  
   <li><a href="#deleteOrder"><code><span class="http-method">delete</span> /store/order/{orderId}</code></a></li>
-  
+  <li><a href="#getInventory"><code><span class="http-method">get</span> /store/inventory</code></a></li>
+  <li><a href="#getOrderById"><code><span class="http-method">get</span> /store/order/{orderId}</code></a></li>
+  <li><a href="#placeOrder"><code><span class="http-method">post</span> /store/order</code></a></li>
   <li><a href="#createUser"><code><span class="http-method">post</span> /user</code></a></li>
-  
   <li><a href="#createUsersWithArrayInput"><code><span class="http-method">post</span> /user/createWithArray</code></a></li>
-  
   <li><a href="#createUsersWithListInput"><code><span class="http-method">post</span> /user/createWithList</code></a></li>
-  
-  <li><a href="#loginUser"><code><span class="http-method">get</span> /user/login</code></a></li>
-  
-  <li><a href="#logoutUser"><code><span class="http-method">get</span> /user/logout</code></a></li>
-  
-  <li><a href="#getUserByName"><code><span class="http-method">get</span> /user/{username}</code></a></li>
-  
-  <li><a href="#updateUser"><code><span class="http-method">put</span> /user/{username}</code></a></li>
-  
   <li><a href="#deleteUser"><code><span class="http-method">delete</span> /user/{username}</code></a></li>
-  
-  
-  
+  <li><a href="#getUserByName"><code><span class="http-method">get</span> /user/{username}</code></a></li>
+  <li><a href="#loginUser"><code><span class="http-method">get</span> /user/login</code></a></li>
+  <li><a href="#logoutUser"><code><span class="http-method">get</span> /user/logout</code></a></li>
+  <li><a href="#updateUser"><code><span class="http-method">put</span> /user/{username}</code></a></li>
   </ol>
-  
 
-  
-  
-  
-  
-  <div class="method"><a name="updatePet"/>
-    <div class="method-path">
-    <a class="up" href="#__Methods">Up</a>
-    <pre class="put"><code class="huge"><span class="http-method">put</span> /pet</code></pre></div>
-    <div class="method-summary">Update an existing pet (<span class="nickname">updatePet</span>)</div>
-    
-    <div class="method-notes"></div>
-
-    
-
-    
-    <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>
-    
-      <li><code>application/json</code></li>
-    
-      <li><code>application/xml</code></li>
-    
-    </ul>
-    
-
-    
-    <h3 class="field-label">Request body</h3>
-    <div class="field-items">
-      <div class="param">body (optional)</div>
-
-      <div class="param-desc"><span class="param-type">Body Parameter</span> &mdash; Pet object that needs to be added to the store </div>
-    </div>  <!-- field-items -->
-    
-
-    
-
-    
-
-    
-
-    <!-- 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
-
-    
-
-    Todo: process Response Object and its headers, schema, examples
-    -->
-
-    
-
-    
-    <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>
-    
-      <li><code>application/json</code></li>
-    
-      <li><code>application/xml</code></li>
-    
-    </ul>
-    
-
-    <h3 class="field-label">Responses</h3>
-    
-    <h4 class="field-label">400</h4>
-    Invalid ID supplied
-    
-    
-    <h4 class="field-label">404</h4>
-    Pet not found
-    
-    
-    <h4 class="field-label">405</h4>
-    Validation exception
-    
-    
-  </div> <!-- method -->
-  <hr/>
-  
   <div class="method"><a name="addPet"/>
     <div class="method-path">
     <a class="up" href="#__Methods">Up</a>
     <pre class="post"><code class="huge"><span class="http-method">post</span> /pet</code></pre></div>
     <div class="method-summary">Add a new pet to the store (<span class="nickname">addPet</span>)</div>
-    
     <div class="method-notes"></div>
 
-    
 
-    
     <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>
-    
       <li><code>application/json</code></li>
-    
       <li><code>application/xml</code></li>
-    
     </ul>
-    
 
-    
     <h3 class="field-label">Request body</h3>
     <div class="field-items">
-      <div class="param">body (optional)</div>
+      <div class="param">body (required)</div>
 
       <div class="param-desc"><span class="param-type">Body Parameter</span> &mdash; Pet object that needs to be added to the store </div>
     </div>  <!-- field-items -->
-    
 
-    
 
-    
 
-    
 
-    <!-- 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
 
-    
+    <!--Todo: process Response Object and its headers, schema, examples -->
 
-    Todo: process Response Object and its headers, schema, examples
-    -->
 
-    
-
-    
     <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>
-    
-      <li><code>application/json</code></li>
-    
       <li><code>application/xml</code></li>
-    
+      <li><code>application/json</code></li>
     </ul>
-    
 
     <h3 class="field-label">Responses</h3>
-    
     <h4 class="field-label">405</h4>
     Invalid input
-    
-    
   </div> <!-- method -->
   <hr/>
-  
+  <div class="method"><a name="deletePet"/>
+    <div class="method-path">
+    <a class="up" href="#__Methods">Up</a>
+    <pre class="delete"><code class="huge"><span class="http-method">delete</span> /pet/{petId}</code></pre></div>
+    <div class="method-summary">Deletes a pet (<span class="nickname">deletePet</span>)</div>
+    <div class="method-notes"></div>
+
+    <h3 class="field-label">Path parameters</h3>
+    <div class="field-items">
+      <div class="param">petId (required)</div>
+
+      <div class="param-desc"><span class="param-type">Path Parameter</span> &mdash; Pet id to delete </div>
+    </div>  <!-- field-items -->
+
+
+
+
+
+
+
+    <!--Todo: process Response Object and its headers, schema, examples -->
+
+
+    <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>
+      <li><code>application/xml</code></li>
+      <li><code>application/json</code></li>
+    </ul>
+
+    <h3 class="field-label">Responses</h3>
+    <h4 class="field-label">400</h4>
+    Invalid pet value
+  </div> <!-- method -->
+  <hr/>
   <div class="method"><a name="findPetsByStatus"/>
     <div class="method-path">
     <a class="up" href="#__Methods">Up</a>
     <pre class="get"><code class="huge"><span class="http-method">get</span> /pet/findByStatus</code></pre></div>
     <div class="method-summary">Finds Pets by status (<span class="nickname">findPetsByStatus</span>)</div>
-    
-    <div class="method-notes">Multiple status values can be provided with comma seperated strings</div>
+    <div class="method-notes">Multiple status values can be provided with comma separated strings</div>
 
-    
 
-    
 
-    
 
-    
 
-    
     <h3 class="field-label">Query parameters</h3>
     <div class="field-items">
-      <div class="param">status (optional)</div>
+      <div class="param">status (required)</div>
 
-      <div class="param-desc"><span class="param-type">Query Parameter</span> &mdash; Status values that need to be considered for filter default: available</div>
+      <div class="param-desc"><span class="param-type">Query Parameter</span> &mdash; Status values that need to be considered for filter </div>
     </div>  <!-- field-items -->
-    
 
-    
 
-    <!-- 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
-
-    
     <h3 class="field-label">Return type</h3>
-    <div class="return-type"><a href="#array">array[Pet]</a></div>
-    
+    <div class="return-type">
+      array[<a href="#Pet">Pet</a>]
+      
+    </div>
 
-    Todo: process Response Object and its headers, schema, examples
-    -->
+    <!--Todo: process Response Object and its headers, schema, examples -->
 
-    
 
-    
     <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>
-    
-      <li><code>application/json</code></li>
-    
       <li><code>application/xml</code></li>
-    
+      <li><code>application/json</code></li>
     </ul>
-    
 
     <h3 class="field-label">Responses</h3>
-    
     <h4 class="field-label">200</h4>
     successful operation
-    
-    
     <h4 class="field-label">400</h4>
     Invalid status value
-    
-    
   </div> <!-- method -->
   <hr/>
-  
   <div class="method"><a name="findPetsByTags"/>
     <div class="method-path">
     <a class="up" href="#__Methods">Up</a>
     <pre class="get"><code class="huge"><span class="http-method">get</span> /pet/findByTags</code></pre></div>
     <div class="method-summary">Finds Pets by tags (<span class="nickname">findPetsByTags</span>)</div>
-    
-    <div class="method-notes">Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.</div>
+    <div class="method-notes">Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.</div>
 
-    
 
-    
 
-    
 
-    
 
-    
     <h3 class="field-label">Query parameters</h3>
     <div class="field-items">
-      <div class="param">tags (optional)</div>
+      <div class="param">tags (required)</div>
 
       <div class="param-desc"><span class="param-type">Query Parameter</span> &mdash; Tags to filter by </div>
     </div>  <!-- field-items -->
-    
 
-    
 
-    <!-- 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
-
-    
     <h3 class="field-label">Return type</h3>
-    <div class="return-type"><a href="#array">array[Pet]</a></div>
-    
+    <div class="return-type">
+      array[<a href="#Pet">Pet</a>]
+      
+    </div>
 
-    Todo: process Response Object and its headers, schema, examples
-    -->
+    <!--Todo: process Response Object and its headers, schema, examples -->
 
-    
 
-    
     <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>
-    
-      <li><code>application/json</code></li>
-    
       <li><code>application/xml</code></li>
-    
+      <li><code>application/json</code></li>
     </ul>
-    
 
     <h3 class="field-label">Responses</h3>
-    
     <h4 class="field-label">200</h4>
     successful operation
-    
-    
     <h4 class="field-label">400</h4>
     Invalid tag value
-    
-    
   </div> <!-- method -->
   <hr/>
-  
   <div class="method"><a name="getPetById"/>
     <div class="method-path">
     <a class="up" href="#__Methods">Up</a>
     <pre class="get"><code class="huge"><span class="http-method">get</span> /pet/{petId}</code></pre></div>
     <div class="method-summary">Find pet by ID (<span class="nickname">getPetById</span>)</div>
-    
-    <div class="method-notes">Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions</div>
+    <div class="method-notes">Returns a single pet</div>
 
-    
     <h3 class="field-label">Path parameters</h3>
     <div class="field-items">
       <div class="param">petId (required)</div>
 
-      <div class="param-desc"><span class="param-type">Path Parameter</span> &mdash; ID of pet that needs to be fetched </div>
+      <div class="param-desc"><span class="param-type">Path Parameter</span> &mdash; ID of pet to return </div>
     </div>  <!-- field-items -->
-    
 
-    
 
-    
 
-    
 
-    
 
-    
 
-    <!-- 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
-
-    
     <h3 class="field-label">Return type</h3>
-    <div class="return-type"><a href="#">Pet</a></div>
-    
+    <div class="return-type">
+      <a href="#Pet">Pet</a>
+      
+    </div>
 
-    Todo: process Response Object and its headers, schema, examples
-    -->
+    <!--Todo: process Response Object and its headers, schema, examples -->
 
-    
 
-    
     <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>
-    
-      <li><code>application/json</code></li>
-    
       <li><code>application/xml</code></li>
-    
+      <li><code>application/json</code></li>
     </ul>
-    
 
     <h3 class="field-label">Responses</h3>
-    
     <h4 class="field-label">200</h4>
     successful operation
-    
-    
     <h4 class="field-label">400</h4>
     Invalid ID supplied
-    
-    
     <h4 class="field-label">404</h4>
     Pet not found
-    
-    
   </div> <!-- method -->
   <hr/>
-  
+  <div class="method"><a name="updatePet"/>
+    <div class="method-path">
+    <a class="up" href="#__Methods">Up</a>
+    <pre class="put"><code class="huge"><span class="http-method">put</span> /pet</code></pre></div>
+    <div class="method-summary">Update an existing pet (<span class="nickname">updatePet</span>)</div>
+    <div class="method-notes"></div>
+
+
+    <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>
+      <li><code>application/json</code></li>
+      <li><code>application/xml</code></li>
+    </ul>
+
+    <h3 class="field-label">Request body</h3>
+    <div class="field-items">
+      <div class="param">body (required)</div>
+
+      <div class="param-desc"><span class="param-type">Body Parameter</span> &mdash; Pet object that needs to be added to the store </div>
+    </div>  <!-- field-items -->
+
+
+
+
+
+    <!--Todo: process Response Object and its headers, schema, examples -->
+
+
+    <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>
+      <li><code>application/xml</code></li>
+      <li><code>application/json</code></li>
+    </ul>
+
+    <h3 class="field-label">Responses</h3>
+    <h4 class="field-label">400</h4>
+    Invalid ID supplied
+    <h4 class="field-label">404</h4>
+    Pet not found
+    <h4 class="field-label">405</h4>
+    Validation exception
+  </div> <!-- method -->
+  <hr/>
   <div class="method"><a name="updatePetWithForm"/>
     <div class="method-path">
     <a class="up" href="#__Methods">Up</a>
     <pre class="post"><code class="huge"><span class="http-method">post</span> /pet/{petId}</code></pre></div>
     <div class="method-summary">Updates a pet in the store with form data (<span class="nickname">updatePetWithForm</span>)</div>
-    
     <div class="method-notes"></div>
 
-    
     <h3 class="field-label">Path parameters</h3>
     <div class="field-items">
       <div class="param">petId (required)</div>
 
       <div class="param-desc"><span class="param-type">Path Parameter</span> &mdash; ID of pet that needs to be updated </div>
     </div>  <!-- field-items -->
-    
 
-    
     <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>
-    
       <li><code>application/x-www-form-urlencoded</code></li>
-    
     </ul>
-    
 
-    
 
-    
 
-    
 
-    
     <h3 class="field-label">Form parameters</h3>
     <div class="field-items">
       <div class="param">name (optional)</div>
@@ -646,135 +505,47 @@ font-style: italic;
 
       <div class="param-desc"><span class="param-type">Form Parameter</span> &mdash; Updated status of the pet </div>
     </div>  <!-- field-items -->
-    
 
-    <!-- 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
 
-    
+    <!--Todo: process Response Object and its headers, schema, examples -->
 
-    Todo: process Response Object and its headers, schema, examples
-    -->
 
-    
-
-    
     <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>
-    
-      <li><code>application/json</code></li>
-    
       <li><code>application/xml</code></li>
-    
+      <li><code>application/json</code></li>
     </ul>
-    
 
     <h3 class="field-label">Responses</h3>
-    
     <h4 class="field-label">405</h4>
     Invalid input
-    
-    
   </div> <!-- method -->
   <hr/>
-  
-  <div class="method"><a name="deletePet"/>
-    <div class="method-path">
-    <a class="up" href="#__Methods">Up</a>
-    <pre class="delete"><code class="huge"><span class="http-method">delete</span> /pet/{petId}</code></pre></div>
-    <div class="method-summary">Deletes a pet (<span class="nickname">deletePet</span>)</div>
-    
-    <div class="method-notes"></div>
-
-    
-    <h3 class="field-label">Path parameters</h3>
-    <div class="field-items">
-      <div class="param">petId (required)</div>
-
-      <div class="param-desc"><span class="param-type">Path Parameter</span> &mdash; Pet id to delete </div>
-    </div>  <!-- field-items -->
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    <!-- 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
-
-    
-
-    Todo: process Response Object and its headers, schema, examples
-    -->
-
-    
-
-    
-    <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>
-    
-      <li><code>application/json</code></li>
-    
-      <li><code>application/xml</code></li>
-    
-    </ul>
-    
-
-    <h3 class="field-label">Responses</h3>
-    
-    <h4 class="field-label">400</h4>
-    Invalid pet value
-    
-    
-  </div> <!-- method -->
-  <hr/>
-  
   <div class="method"><a name="uploadFile"/>
     <div class="method-path">
     <a class="up" href="#__Methods">Up</a>
     <pre class="post"><code class="huge"><span class="http-method">post</span> /pet/{petId}/uploadImage</code></pre></div>
     <div class="method-summary">uploads an image (<span class="nickname">uploadFile</span>)</div>
-    
     <div class="method-notes"></div>
 
-    
     <h3 class="field-label">Path parameters</h3>
     <div class="field-items">
       <div class="param">petId (required)</div>
 
       <div class="param-desc"><span class="param-type">Path Parameter</span> &mdash; ID of pet to update </div>
     </div>  <!-- field-items -->
-    
 
-    
     <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>
-    
       <li><code>multipart/form-data</code></li>
-    
     </ul>
-    
 
-    
 
-    
 
-    
 
-    
     <h3 class="field-label">Form parameters</h3>
     <div class="field-items">
       <div class="param">additionalMetadata (optional)</div>
@@ -783,814 +554,498 @@ font-style: italic;
 
       <div class="param-desc"><span class="param-type">Form Parameter</span> &mdash; file to upload </div>
     </div>  <!-- field-items -->
-    
 
-    <!-- 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
-
-    
-
-    Todo: process Response Object and its headers, schema, examples
-    -->
-
-    
-
-    
-    <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>
-    
-      <li><code>application/json</code></li>
-    
-      <li><code>application/xml</code></li>
-    
-    </ul>
-    
-
-    <h3 class="field-label">Responses</h3>
-    
-    <h4 class="field-label">0</h4>
-    successful operation
-    
-    
-  </div> <!-- method -->
-  <hr/>
-  
-  <div class="method"><a name="getInventory"/>
-    <div class="method-path">
-    <a class="up" href="#__Methods">Up</a>
-    <pre class="get"><code class="huge"><span class="http-method">get</span> /store/inventory</code></pre></div>
-    <div class="method-summary">Returns pet inventories by status (<span class="nickname">getInventory</span>)</div>
-    
-    <div class="method-notes">Returns a map of status codes to quantities</div>
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    <!-- 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
-
-    
     <h3 class="field-label">Return type</h3>
-    <div class="return-type"><a href="#map">map[String, Integer]</a></div>
-    
+    <div class="return-type">
+      <a href="#ApiResponse">ApiResponse</a>
+      
+    </div>
 
-    Todo: process Response Object and its headers, schema, examples
-    -->
+    <!--Todo: process Response Object and its headers, schema, examples -->
 
-    
 
-    
     <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>
-    
       <li><code>application/json</code></li>
-    
-      <li><code>application/xml</code></li>
-    
     </ul>
-    
 
     <h3 class="field-label">Responses</h3>
-    
     <h4 class="field-label">200</h4>
     successful operation
-    
-    
   </div> <!-- method -->
   <hr/>
-  
-  <div class="method"><a name="placeOrder"/>
-    <div class="method-path">
-    <a class="up" href="#__Methods">Up</a>
-    <pre class="post"><code class="huge"><span class="http-method">post</span> /store/order</code></pre></div>
-    <div class="method-summary">Place an order for a pet (<span class="nickname">placeOrder</span>)</div>
-    
-    <div class="method-notes"></div>
-
-    
-
-    
-
-    
-    <h3 class="field-label">Request body</h3>
-    <div class="field-items">
-      <div class="param">body (optional)</div>
-
-      <div class="param-desc"><span class="param-type">Body Parameter</span> &mdash; order placed for purchasing the pet </div>
-    </div>  <!-- field-items -->
-    
-
-    
-
-    
-
-    
-
-    <!-- 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
-
-    
-    <h3 class="field-label">Return type</h3>
-    <div class="return-type"><a href="#">Order</a></div>
-    
-
-    Todo: process Response Object and its headers, schema, examples
-    -->
-
-    
-
-    
-    <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>
-    
-      <li><code>application/json</code></li>
-    
-      <li><code>application/xml</code></li>
-    
-    </ul>
-    
-
-    <h3 class="field-label">Responses</h3>
-    
-    <h4 class="field-label">200</h4>
-    successful operation
-    
-    
-    <h4 class="field-label">400</h4>
-    Invalid Order
-    
-    
-  </div> <!-- method -->
-  <hr/>
-  
-  <div class="method"><a name="getOrderById"/>
-    <div class="method-path">
-    <a class="up" href="#__Methods">Up</a>
-    <pre class="get"><code class="huge"><span class="http-method">get</span> /store/order/{orderId}</code></pre></div>
-    <div class="method-summary">Find purchase order by ID (<span class="nickname">getOrderById</span>)</div>
-    
-    <div class="method-notes">For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions</div>
-
-    
-    <h3 class="field-label">Path parameters</h3>
-    <div class="field-items">
-      <div class="param">orderId (required)</div>
-
-      <div class="param-desc"><span class="param-type">Path Parameter</span> &mdash; ID of pet that needs to be fetched </div>
-    </div>  <!-- field-items -->
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    <!-- 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
-
-    
-    <h3 class="field-label">Return type</h3>
-    <div class="return-type"><a href="#">Order</a></div>
-    
-
-    Todo: process Response Object and its headers, schema, examples
-    -->
-
-    
-
-    
-    <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>
-    
-      <li><code>application/json</code></li>
-    
-      <li><code>application/xml</code></li>
-    
-    </ul>
-    
-
-    <h3 class="field-label">Responses</h3>
-    
-    <h4 class="field-label">200</h4>
-    successful operation
-    
-    
-    <h4 class="field-label">400</h4>
-    Invalid ID supplied
-    
-    
-    <h4 class="field-label">404</h4>
-    Order not found
-    
-    
-  </div> <!-- method -->
-  <hr/>
-  
   <div class="method"><a name="deleteOrder"/>
     <div class="method-path">
     <a class="up" href="#__Methods">Up</a>
     <pre class="delete"><code class="huge"><span class="http-method">delete</span> /store/order/{orderId}</code></pre></div>
     <div class="method-summary">Delete purchase order by ID (<span class="nickname">deleteOrder</span>)</div>
-    
     <div class="method-notes">For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors</div>
 
-    
     <h3 class="field-label">Path parameters</h3>
     <div class="field-items">
       <div class="param">orderId (required)</div>
 
       <div class="param-desc"><span class="param-type">Path Parameter</span> &mdash; ID of the order that needs to be deleted </div>
     </div>  <!-- field-items -->
-    
 
-    
 
-    
 
-    
 
-    
 
-    
 
-    <!-- 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
 
-    
+    <!--Todo: process Response Object and its headers, schema, examples -->
 
-    Todo: process Response Object and its headers, schema, examples
-    -->
 
-    
-
-    
     <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>
-    
-      <li><code>application/json</code></li>
-    
       <li><code>application/xml</code></li>
-    
+      <li><code>application/json</code></li>
     </ul>
-    
 
     <h3 class="field-label">Responses</h3>
-    
     <h4 class="field-label">400</h4>
     Invalid ID supplied
-    
-    
     <h4 class="field-label">404</h4>
     Order not found
-    
-    
   </div> <!-- method -->
   <hr/>
-  
+  <div class="method"><a name="getInventory"/>
+    <div class="method-path">
+    <a class="up" href="#__Methods">Up</a>
+    <pre class="get"><code class="huge"><span class="http-method">get</span> /store/inventory</code></pre></div>
+    <div class="method-summary">Returns pet inventories by status (<span class="nickname">getInventory</span>)</div>
+    <div class="method-notes">Returns a map of status codes to quantities</div>
+
+
+
+
+
+
+
+    <h3 class="field-label">Return type</h3>
+    <div class="return-type">
+      
+      map[String, Integer]
+    </div>
+
+    <!--Todo: process Response Object and its headers, schema, examples -->
+
+
+    <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>
+      <li><code>application/json</code></li>
+    </ul>
+
+    <h3 class="field-label">Responses</h3>
+    <h4 class="field-label">200</h4>
+    successful operation
+  </div> <!-- method -->
+  <hr/>
+  <div class="method"><a name="getOrderById"/>
+    <div class="method-path">
+    <a class="up" href="#__Methods">Up</a>
+    <pre class="get"><code class="huge"><span class="http-method">get</span> /store/order/{orderId}</code></pre></div>
+    <div class="method-summary">Find purchase order by ID (<span class="nickname">getOrderById</span>)</div>
+    <div class="method-notes">For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions</div>
+
+    <h3 class="field-label">Path parameters</h3>
+    <div class="field-items">
+      <div class="param">orderId (required)</div>
+
+      <div class="param-desc"><span class="param-type">Path Parameter</span> &mdash; ID of pet that needs to be fetched </div>
+    </div>  <!-- field-items -->
+
+
+
+
+
+
+    <h3 class="field-label">Return type</h3>
+    <div class="return-type">
+      <a href="#Order">Order</a>
+      
+    </div>
+
+    <!--Todo: process Response Object and its headers, schema, examples -->
+
+
+    <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>
+      <li><code>application/xml</code></li>
+      <li><code>application/json</code></li>
+    </ul>
+
+    <h3 class="field-label">Responses</h3>
+    <h4 class="field-label">200</h4>
+    successful operation
+    <h4 class="field-label">400</h4>
+    Invalid ID supplied
+    <h4 class="field-label">404</h4>
+    Order not found
+  </div> <!-- method -->
+  <hr/>
+  <div class="method"><a name="placeOrder"/>
+    <div class="method-path">
+    <a class="up" href="#__Methods">Up</a>
+    <pre class="post"><code class="huge"><span class="http-method">post</span> /store/order</code></pre></div>
+    <div class="method-summary">Place an order for a pet (<span class="nickname">placeOrder</span>)</div>
+    <div class="method-notes"></div>
+
+
+
+    <h3 class="field-label">Request body</h3>
+    <div class="field-items">
+      <div class="param">body (required)</div>
+
+      <div class="param-desc"><span class="param-type">Body Parameter</span> &mdash; order placed for purchasing the pet </div>
+    </div>  <!-- field-items -->
+
+
+
+
+    <h3 class="field-label">Return type</h3>
+    <div class="return-type">
+      <a href="#Order">Order</a>
+      
+    </div>
+
+    <!--Todo: process Response Object and its headers, schema, examples -->
+
+
+    <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>
+      <li><code>application/xml</code></li>
+      <li><code>application/json</code></li>
+    </ul>
+
+    <h3 class="field-label">Responses</h3>
+    <h4 class="field-label">200</h4>
+    successful operation
+    <h4 class="field-label">400</h4>
+    Invalid Order
+  </div> <!-- method -->
+  <hr/>
   <div class="method"><a name="createUser"/>
     <div class="method-path">
     <a class="up" href="#__Methods">Up</a>
     <pre class="post"><code class="huge"><span class="http-method">post</span> /user</code></pre></div>
     <div class="method-summary">Create user (<span class="nickname">createUser</span>)</div>
-    
     <div class="method-notes">This can only be done by the logged in user.</div>
 
-    
 
-    
 
-    
     <h3 class="field-label">Request body</h3>
     <div class="field-items">
-      <div class="param">body (optional)</div>
+      <div class="param">body (required)</div>
 
       <div class="param-desc"><span class="param-type">Body Parameter</span> &mdash; Created user object </div>
     </div>  <!-- field-items -->
-    
 
-    
 
-    
 
-    
 
-    <!-- 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
 
-    
+    <!--Todo: process Response Object and its headers, schema, examples -->
 
-    Todo: process Response Object and its headers, schema, examples
-    -->
 
-    
-
-    
     <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>
-    
-      <li><code>application/json</code></li>
-    
       <li><code>application/xml</code></li>
-    
+      <li><code>application/json</code></li>
     </ul>
-    
 
     <h3 class="field-label">Responses</h3>
-    
     <h4 class="field-label">0</h4>
     successful operation
-    
-    
   </div> <!-- method -->
   <hr/>
-  
   <div class="method"><a name="createUsersWithArrayInput"/>
     <div class="method-path">
     <a class="up" href="#__Methods">Up</a>
     <pre class="post"><code class="huge"><span class="http-method">post</span> /user/createWithArray</code></pre></div>
     <div class="method-summary">Creates list of users with given input array (<span class="nickname">createUsersWithArrayInput</span>)</div>
-    
     <div class="method-notes"></div>
 
-    
 
-    
 
-    
     <h3 class="field-label">Request body</h3>
     <div class="field-items">
-      <div class="param">body (optional)</div>
+      <div class="param">body (required)</div>
 
       <div class="param-desc"><span class="param-type">Body Parameter</span> &mdash; List of user object </div>
     </div>  <!-- field-items -->
-    
 
-    
 
-    
 
-    
 
-    <!-- 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
 
-    
+    <!--Todo: process Response Object and its headers, schema, examples -->
 
-    Todo: process Response Object and its headers, schema, examples
-    -->
 
-    
-
-    
     <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>
-    
-      <li><code>application/json</code></li>
-    
       <li><code>application/xml</code></li>
-    
+      <li><code>application/json</code></li>
     </ul>
-    
 
     <h3 class="field-label">Responses</h3>
-    
     <h4 class="field-label">0</h4>
     successful operation
-    
-    
   </div> <!-- method -->
   <hr/>
-  
   <div class="method"><a name="createUsersWithListInput"/>
     <div class="method-path">
     <a class="up" href="#__Methods">Up</a>
     <pre class="post"><code class="huge"><span class="http-method">post</span> /user/createWithList</code></pre></div>
     <div class="method-summary">Creates list of users with given input array (<span class="nickname">createUsersWithListInput</span>)</div>
-    
     <div class="method-notes"></div>
 
-    
 
-    
 
-    
     <h3 class="field-label">Request body</h3>
     <div class="field-items">
-      <div class="param">body (optional)</div>
+      <div class="param">body (required)</div>
 
       <div class="param-desc"><span class="param-type">Body Parameter</span> &mdash; List of user object </div>
     </div>  <!-- field-items -->
-    
 
-    
 
-    
 
-    
 
-    <!-- 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
 
-    
+    <!--Todo: process Response Object and its headers, schema, examples -->
 
-    Todo: process Response Object and its headers, schema, examples
-    -->
 
-    
-
-    
     <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>
-    
-      <li><code>application/json</code></li>
-    
       <li><code>application/xml</code></li>
-    
+      <li><code>application/json</code></li>
     </ul>
-    
 
     <h3 class="field-label">Responses</h3>
-    
     <h4 class="field-label">0</h4>
     successful operation
-    
-    
   </div> <!-- method -->
   <hr/>
-  
-  <div class="method"><a name="loginUser"/>
-    <div class="method-path">
-    <a class="up" href="#__Methods">Up</a>
-    <pre class="get"><code class="huge"><span class="http-method">get</span> /user/login</code></pre></div>
-    <div class="method-summary">Logs user into the system (<span class="nickname">loginUser</span>)</div>
-    
-    <div class="method-notes"></div>
-
-    
-
-    
-
-    
-
-    
-
-    
-    <h3 class="field-label">Query parameters</h3>
-    <div class="field-items">
-      <div class="param">username (optional)</div>
-
-      <div class="param-desc"><span class="param-type">Query Parameter</span> &mdash; The user name for login </div><div class="param">password (optional)</div>
-
-      <div class="param-desc"><span class="param-type">Query Parameter</span> &mdash; The password for login in clear text </div>
-    </div>  <!-- field-items -->
-    
-
-    
-
-    <!-- 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
-
-    
-    <h3 class="field-label">Return type</h3>
-    <div class="return-type"><a href="#">String</a></div>
-    
-
-    Todo: process Response Object and its headers, schema, examples
-    -->
-
-    
-
-    
-    <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>
-    
-      <li><code>application/json</code></li>
-    
-      <li><code>application/xml</code></li>
-    
-    </ul>
-    
-
-    <h3 class="field-label">Responses</h3>
-    
-    <h4 class="field-label">200</h4>
-    successful operation
-    
-    
-    <h4 class="field-label">400</h4>
-    Invalid username/password supplied
-    
-    
-  </div> <!-- method -->
-  <hr/>
-  
-  <div class="method"><a name="logoutUser"/>
-    <div class="method-path">
-    <a class="up" href="#__Methods">Up</a>
-    <pre class="get"><code class="huge"><span class="http-method">get</span> /user/logout</code></pre></div>
-    <div class="method-summary">Logs out current logged in user session (<span class="nickname">logoutUser</span>)</div>
-    
-    <div class="method-notes"></div>
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    <!-- 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
-
-    
-
-    Todo: process Response Object and its headers, schema, examples
-    -->
-
-    
-
-    
-    <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>
-    
-      <li><code>application/json</code></li>
-    
-      <li><code>application/xml</code></li>
-    
-    </ul>
-    
-
-    <h3 class="field-label">Responses</h3>
-    
-    <h4 class="field-label">0</h4>
-    successful operation
-    
-    
-  </div> <!-- method -->
-  <hr/>
-  
-  <div class="method"><a name="getUserByName"/>
-    <div class="method-path">
-    <a class="up" href="#__Methods">Up</a>
-    <pre class="get"><code class="huge"><span class="http-method">get</span> /user/{username}</code></pre></div>
-    <div class="method-summary">Get user by user name (<span class="nickname">getUserByName</span>)</div>
-    
-    <div class="method-notes"></div>
-
-    
-    <h3 class="field-label">Path parameters</h3>
-    <div class="field-items">
-      <div class="param">username (required)</div>
-
-      <div class="param-desc"><span class="param-type">Path Parameter</span> &mdash; The name that needs to be fetched. Use user1 for testing. </div>
-    </div>  <!-- field-items -->
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    <!-- 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
-
-    
-    <h3 class="field-label">Return type</h3>
-    <div class="return-type"><a href="#">User</a></div>
-    
-
-    Todo: process Response Object and its headers, schema, examples
-    -->
-
-    
-
-    
-    <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>
-    
-      <li><code>application/json</code></li>
-    
-      <li><code>application/xml</code></li>
-    
-    </ul>
-    
-
-    <h3 class="field-label">Responses</h3>
-    
-    <h4 class="field-label">200</h4>
-    successful operation
-    
-    <h3 class="field-label">Example data</h3>
-    <div class="example-data-content-type">Content-Type: application/json</div>
-    <pre class="example"><code>{id=1, username=johnp, firstName=John, lastName=Public, email=johnp@swagger.io, password=-secret-, phone=0123456789, userStatus=0}</code></pre>
-    
-    
-    <h4 class="field-label">400</h4>
-    Invalid username supplied
-    
-    
-    <h4 class="field-label">404</h4>
-    User not found
-    
-    
-  </div> <!-- method -->
-  <hr/>
-  
-  <div class="method"><a name="updateUser"/>
-    <div class="method-path">
-    <a class="up" href="#__Methods">Up</a>
-    <pre class="put"><code class="huge"><span class="http-method">put</span> /user/{username}</code></pre></div>
-    <div class="method-summary">Updated user (<span class="nickname">updateUser</span>)</div>
-    
-    <div class="method-notes">This can only be done by the logged in user.</div>
-
-    
-    <h3 class="field-label">Path parameters</h3>
-    <div class="field-items">
-      <div class="param">username (required)</div>
-
-      <div class="param-desc"><span class="param-type">Path Parameter</span> &mdash; name that need to be deleted </div>
-    </div>  <!-- field-items -->
-    
-
-    
-
-    
-    <h3 class="field-label">Request body</h3>
-    <div class="field-items">
-      <div class="param">body (optional)</div>
-
-      <div class="param-desc"><span class="param-type">Body Parameter</span> &mdash; Updated user object </div>
-    </div>  <!-- field-items -->
-    
-
-    
-
-    
-
-    
-
-    <!-- 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
-
-    
-
-    Todo: process Response Object and its headers, schema, examples
-    -->
-
-    
-
-    
-    <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>
-    
-      <li><code>application/json</code></li>
-    
-      <li><code>application/xml</code></li>
-    
-    </ul>
-    
-
-    <h3 class="field-label">Responses</h3>
-    
-    <h4 class="field-label">400</h4>
-    Invalid user supplied
-    
-    
-    <h4 class="field-label">404</h4>
-    User not found
-    
-    
-  </div> <!-- method -->
-  <hr/>
-  
   <div class="method"><a name="deleteUser"/>
     <div class="method-path">
     <a class="up" href="#__Methods">Up</a>
     <pre class="delete"><code class="huge"><span class="http-method">delete</span> /user/{username}</code></pre></div>
     <div class="method-summary">Delete user (<span class="nickname">deleteUser</span>)</div>
-    
     <div class="method-notes">This can only be done by the logged in user.</div>
 
-    
     <h3 class="field-label">Path parameters</h3>
     <div class="field-items">
       <div class="param">username (required)</div>
 
       <div class="param-desc"><span class="param-type">Path Parameter</span> &mdash; The name that needs to be deleted </div>
     </div>  <!-- field-items -->
-    
 
-    
 
-    
 
-    
 
-    
 
-    
 
-    <!-- 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
 
-    
+    <!--Todo: process Response Object and its headers, schema, examples -->
 
-    Todo: process Response Object and its headers, schema, examples
-    -->
 
-    
-
-    
     <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>
-    
-      <li><code>application/json</code></li>
-    
       <li><code>application/xml</code></li>
-    
+      <li><code>application/json</code></li>
     </ul>
-    
 
     <h3 class="field-label">Responses</h3>
-    
     <h4 class="field-label">400</h4>
     Invalid username supplied
-    
-    
     <h4 class="field-label">404</h4>
     User not found
-    
-    
   </div> <!-- method -->
   <hr/>
-  
-  
-  
-  
+  <div class="method"><a name="getUserByName"/>
+    <div class="method-path">
+    <a class="up" href="#__Methods">Up</a>
+    <pre class="get"><code class="huge"><span class="http-method">get</span> /user/{username}</code></pre></div>
+    <div class="method-summary">Get user by user name (<span class="nickname">getUserByName</span>)</div>
+    <div class="method-notes"></div>
+
+    <h3 class="field-label">Path parameters</h3>
+    <div class="field-items">
+      <div class="param">username (required)</div>
+
+      <div class="param-desc"><span class="param-type">Path Parameter</span> &mdash; The name that needs to be fetched. Use user1 for testing.  </div>
+    </div>  <!-- field-items -->
+
+
+
+
+
+
+    <h3 class="field-label">Return type</h3>
+    <div class="return-type">
+      <a href="#User">User</a>
+      
+    </div>
+
+    <!--Todo: process Response Object and its headers, schema, examples -->
+
+
+    <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>
+      <li><code>application/xml</code></li>
+      <li><code>application/json</code></li>
+    </ul>
+
+    <h3 class="field-label">Responses</h3>
+    <h4 class="field-label">200</h4>
+    successful operation
+    <h4 class="field-label">400</h4>
+    Invalid username supplied
+    <h4 class="field-label">404</h4>
+    User not found
+  </div> <!-- method -->
+  <hr/>
+  <div class="method"><a name="loginUser"/>
+    <div class="method-path">
+    <a class="up" href="#__Methods">Up</a>
+    <pre class="get"><code class="huge"><span class="http-method">get</span> /user/login</code></pre></div>
+    <div class="method-summary">Logs user into the system (<span class="nickname">loginUser</span>)</div>
+    <div class="method-notes"></div>
+
+
+
+
+
+    <h3 class="field-label">Query parameters</h3>
+    <div class="field-items">
+      <div class="param">username (required)</div>
+
+      <div class="param-desc"><span class="param-type">Query Parameter</span> &mdash; The user name for login </div><div class="param">password (required)</div>
+
+      <div class="param-desc"><span class="param-type">Query Parameter</span> &mdash; The password for login in clear text </div>
+    </div>  <!-- field-items -->
+
+
+    <h3 class="field-label">Return type</h3>
+    <div class="return-type">
+      
+      String
+    </div>
+
+    <!--Todo: process Response Object and its headers, schema, examples -->
+
+
+    <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>
+      <li><code>application/xml</code></li>
+      <li><code>application/json</code></li>
+    </ul>
+
+    <h3 class="field-label">Responses</h3>
+    <h4 class="field-label">200</h4>
+    successful operation
+    <h4 class="field-label">400</h4>
+    Invalid username/password supplied
+  </div> <!-- method -->
+  <hr/>
+  <div class="method"><a name="logoutUser"/>
+    <div class="method-path">
+    <a class="up" href="#__Methods">Up</a>
+    <pre class="get"><code class="huge"><span class="http-method">get</span> /user/logout</code></pre></div>
+    <div class="method-summary">Logs out current logged in user session (<span class="nickname">logoutUser</span>)</div>
+    <div class="method-notes"></div>
+
+
+
+
+
+
+
+
+    <!--Todo: process Response Object and its headers, schema, examples -->
+
+
+    <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>
+      <li><code>application/xml</code></li>
+      <li><code>application/json</code></li>
+    </ul>
+
+    <h3 class="field-label">Responses</h3>
+    <h4 class="field-label">0</h4>
+    successful operation
+  </div> <!-- method -->
+  <hr/>
+  <div class="method"><a name="updateUser"/>
+    <div class="method-path">
+    <a class="up" href="#__Methods">Up</a>
+    <pre class="put"><code class="huge"><span class="http-method">put</span> /user/{username}</code></pre></div>
+    <div class="method-summary">Updated user (<span class="nickname">updateUser</span>)</div>
+    <div class="method-notes">This can only be done by the logged in user.</div>
+
+    <h3 class="field-label">Path parameters</h3>
+    <div class="field-items">
+      <div class="param">username (required)</div>
+
+      <div class="param-desc"><span class="param-type">Path Parameter</span> &mdash; name that need to be deleted </div>
+    </div>  <!-- field-items -->
+
+
+    <h3 class="field-label">Request body</h3>
+    <div class="field-items">
+      <div class="param">body (required)</div>
+
+      <div class="param-desc"><span class="param-type">Body Parameter</span> &mdash; Updated user object </div>
+    </div>  <!-- field-items -->
+
+
+
+
+
+    <!--Todo: process Response Object and its headers, schema, examples -->
+
+
+    <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>
+      <li><code>application/xml</code></li>
+      <li><code>application/json</code></li>
+    </ul>
+
+    <h3 class="field-label">Responses</h3>
+    <h4 class="field-label">400</h4>
+    Invalid user supplied
+    <h4 class="field-label">404</h4>
+    User not found
+  </div> <!-- method -->
+  <hr/>
 
   <div class="up"><a href="#__Models">Up</a></div>
   <h2><a name="__Models">Models</a></h2>
@@ -1598,128 +1053,74 @@ font-style: italic;
 
   <h2>Table of Contents</h2>
   <ol>
-  
-  
-    <li><a href="#User"><code>User</code></a></li>
-  
-  
-  
+    <li><a href="#ApiResponse"><code>ApiResponse</code></a></li>
     <li><a href="#Category"><code>Category</code></a></li>
-  
-  
-  
-    <li><a href="#Pet"><code>Pet</code></a></li>
-  
-  
-  
-    <li><a href="#Tag"><code>Tag</code></a></li>
-  
-  
-  
     <li><a href="#Order"><code>Order</code></a></li>
-  
-  
+    <li><a href="#Pet"><code>Pet</code></a></li>
+    <li><a href="#Tag"><code>Tag</code></a></li>
+    <li><a href="#User"><code>User</code></a></li>
   </ol>
 
-  
-  
   <div class="model">
-    <h3 class="field-label"><a name="User">User</a> <a class="up" href="#__Models">Up</a></h3>
+    <h3 class="field-label"><a name="ApiResponse">ApiResponse</a> <a class="up" href="#__Models">Up</a></h3>
     <div class="field-items">
-      <div class="param">id </div><div class="param-desc"><span class="param-type">Long</span> </div>
-      
-      <div class="param">username </div><div class="param-desc"><span class="param-type">String</span> </div>
-      
-      <div class="param">firstName </div><div class="param-desc"><span class="param-type">String</span> </div>
-      
-      <div class="param">lastName </div><div class="param-desc"><span class="param-type">String</span> </div>
-      
-      <div class="param">email </div><div class="param-desc"><span class="param-type">String</span> </div>
-      
-      <div class="param">password </div><div class="param-desc"><span class="param-type">String</span> </div>
-      
-      <div class="param">phone </div><div class="param-desc"><span class="param-type">String</span> </div>
-      
-      <div class="param">userStatus </div><div class="param-desc"><span class="param-type">Integer</span> User Status</div>
-      
-      
+      <div class="param">code (optional)</div><div class="param-desc"><span class="param-type">Integer</span> </div>
+<div class="param">type (optional)</div><div class="param-desc"><span class="param-type">String</span> </div>
+<div class="param">message (optional)</div><div class="param-desc"><span class="param-type">String</span> </div>
     </div>  <!-- field-items -->
   </div>
-  
-  
-  
   <div class="model">
     <h3 class="field-label"><a name="Category">Category</a> <a class="up" href="#__Models">Up</a></h3>
     <div class="field-items">
-      <div class="param">id </div><div class="param-desc"><span class="param-type">Long</span> </div>
-      
-      <div class="param">name </div><div class="param-desc"><span class="param-type">String</span> </div>
-      
-      
+      <div class="param">id (optional)</div><div class="param-desc"><span class="param-type">Long</span> </div>
+<div class="param">name (optional)</div><div class="param-desc"><span class="param-type">String</span> </div>
     </div>  <!-- field-items -->
   </div>
-  
-  
-  
-  <div class="model">
-    <h3 class="field-label"><a name="Pet">Pet</a> <a class="up" href="#__Models">Up</a></h3>
-    <div class="field-items">
-      <div class="param">id </div><div class="param-desc"><span class="param-type">Long</span> </div>
-      
-      <div class="param">category </div><div class="param-desc"><span class="param-type">Category</span> </div>
-      
-      <div class="param">name </div><div class="param-desc"><span class="param-type">String</span> </div>
-      
-      <div class="param">photoUrls </div><div class="param-desc"><span class="param-type">array[String]</span> </div>
-      
-      <div class="param">tags </div><div class="param-desc"><span class="param-type">array[Tag]</span> </div>
-      
-      <div class="param">status </div><div class="param-desc"><span class="param-type">String</span> pet status in the store</div>
-      
-        <div class="param-enum-header">Enum:</div>
-        <div class="param-enum">available</div><div class="param-enum">pending</div><div class="param-enum">sold</div>
-      
-      
-    </div>  <!-- field-items -->
-  </div>
-  
-  
-  
-  <div class="model">
-    <h3 class="field-label"><a name="Tag">Tag</a> <a class="up" href="#__Models">Up</a></h3>
-    <div class="field-items">
-      <div class="param">id </div><div class="param-desc"><span class="param-type">Long</span> </div>
-      
-      <div class="param">name </div><div class="param-desc"><span class="param-type">String</span> </div>
-      
-      
-    </div>  <!-- field-items -->
-  </div>
-  
-  
-  
   <div class="model">
     <h3 class="field-label"><a name="Order">Order</a> <a class="up" href="#__Models">Up</a></h3>
     <div class="field-items">
-      <div class="param">id </div><div class="param-desc"><span class="param-type">Long</span> </div>
-      
-      <div class="param">petId </div><div class="param-desc"><span class="param-type">Long</span> </div>
-      
-      <div class="param">quantity </div><div class="param-desc"><span class="param-type">Integer</span> </div>
-      
-      <div class="param">shipDate </div><div class="param-desc"><span class="param-type">Date</span> </div>
-      
-      <div class="param">status </div><div class="param-desc"><span class="param-type">String</span> Order Status</div>
-      
+      <div class="param">id (optional)</div><div class="param-desc"><span class="param-type">Long</span> </div>
+<div class="param">petId (optional)</div><div class="param-desc"><span class="param-type">Long</span> </div>
+<div class="param">quantity (optional)</div><div class="param-desc"><span class="param-type">Integer</span> </div>
+<div class="param">shipDate (optional)</div><div class="param-desc"><span class="param-type">Date</span> </div>
+<div class="param">status (optional)</div><div class="param-desc"><span class="param-type">String</span> Order Status</div>
         <div class="param-enum-header">Enum:</div>
         <div class="param-enum">placed</div><div class="param-enum">approved</div><div class="param-enum">delivered</div>
-      
-      <div class="param">complete </div><div class="param-desc"><span class="param-type">Boolean</span> </div>
-      
-      
+<div class="param">complete (optional)</div><div class="param-desc"><span class="param-type">Boolean</span> </div>
+    </div>  <!-- field-items -->
+  </div>
+  <div class="model">
+    <h3 class="field-label"><a name="Pet">Pet</a> <a class="up" href="#__Models">Up</a></h3>
+    <div class="field-items">
+      <div class="param">id (optional)</div><div class="param-desc"><span class="param-type">Long</span> </div>
+<div class="param">category (optional)</div><div class="param-desc"><span class="param-type">Category</span> </div>
+<div class="param">name </div><div class="param-desc"><span class="param-type">String</span> </div>
+<div class="param">photoUrls </div><div class="param-desc"><span class="param-type">array[String]</span> </div>
+<div class="param">tags (optional)</div><div class="param-desc"><span class="param-type">array[Tag]</span> </div>
+<div class="param">status (optional)</div><div class="param-desc"><span class="param-type">String</span> pet status in the store</div>
+        <div class="param-enum-header">Enum:</div>
+        <div class="param-enum">available</div><div class="param-enum">pending</div><div class="param-enum">sold</div>
+    </div>  <!-- field-items -->
+  </div>
+  <div class="model">
+    <h3 class="field-label"><a name="Tag">Tag</a> <a class="up" href="#__Models">Up</a></h3>
+    <div class="field-items">
+      <div class="param">id (optional)</div><div class="param-desc"><span class="param-type">Long</span> </div>
+<div class="param">name (optional)</div><div class="param-desc"><span class="param-type">String</span> </div>
+    </div>  <!-- field-items -->
+  </div>
+  <div class="model">
+    <h3 class="field-label"><a name="User">User</a> <a class="up" href="#__Models">Up</a></h3>
+    <div class="field-items">
+      <div class="param">id (optional)</div><div class="param-desc"><span class="param-type">Long</span> </div>
+<div class="param">username (optional)</div><div class="param-desc"><span class="param-type">String</span> </div>
+<div class="param">firstName (optional)</div><div class="param-desc"><span class="param-type">String</span> </div>
+<div class="param">lastName (optional)</div><div class="param-desc"><span class="param-type">String</span> </div>
+<div class="param">email (optional)</div><div class="param-desc"><span class="param-type">String</span> </div>
+<div class="param">password (optional)</div><div class="param-desc"><span class="param-type">String</span> </div>
+<div class="param">phone (optional)</div><div class="param-desc"><span class="param-type">String</span> </div>
+<div class="param">userStatus (optional)</div><div class="param-desc"><span class="param-type">Integer</span> User Status</div>
     </div>  <!-- field-items -->
   </div>
-  
-  
   </body>
 </html>
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/PetApi.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/PetApi.cs
index 8eb740a1e4e..a30ac7a5f1a 100644
--- a/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/PetApi.cs
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/PetApi.cs
@@ -19,23 +19,6 @@ namespace IO.Swagger.Controllers
     public class PetApiController : Controller
     { 
 
-        /// <summary>
-        /// Update an existing pet
-        /// </summary>
-        /// <remarks></remarks>
-        /// <param name="body">Pet object that needs to be added to the store</param>
-        /// <response code="400">Invalid ID supplied</response>
-        /// <response code="404">Pet not found</response>
-        /// <response code="405">Validation exception</response>
-        [HttpPut]
-        [Route("/pet")]
-        [SwaggerOperation("UpdatePet")]
-        public void UpdatePet([FromBody]Pet body)
-        { 
-            throw new NotImplementedException();
-        }
-
-
         /// <summary>
         /// Add a new pet to the store
         /// </summary>
@@ -51,93 +34,6 @@ namespace IO.Swagger.Controllers
         }
 
 
-        /// <summary>
-        /// Finds Pets by status
-        /// </summary>
-        /// <remarks>Multiple status values can be provided with comma seperated strings</remarks>
-        /// <param name="status">Status values that need to be considered for filter</param>
-        /// <response code="200">successful operation</response>
-        /// <response code="400">Invalid status value</response>
-        [HttpGet]
-        [Route("/pet/findByStatus")]
-        [SwaggerOperation("FindPetsByStatus")]
-        [SwaggerResponse(200, type: typeof(List<Pet>))]
-        public IActionResult FindPetsByStatus([FromQuery]List<string> status)
-        { 
-            string exampleJson = null;
-            
-            var example = exampleJson != null
-            ? JsonConvert.DeserializeObject<List<Pet>>(exampleJson)
-            : default(List<Pet>);
-            
-            return new ObjectResult(example);
-        }
-
-
-        /// <summary>
-        /// Finds Pets by tags
-        /// </summary>
-        /// <remarks>Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.</remarks>
-        /// <param name="tags">Tags to filter by</param>
-        /// <response code="200">successful operation</response>
-        /// <response code="400">Invalid tag value</response>
-        [HttpGet]
-        [Route("/pet/findByTags")]
-        [SwaggerOperation("FindPetsByTags")]
-        [SwaggerResponse(200, type: typeof(List<Pet>))]
-        public IActionResult FindPetsByTags([FromQuery]List<string> tags)
-        { 
-            string exampleJson = null;
-            
-            var example = exampleJson != null
-            ? JsonConvert.DeserializeObject<List<Pet>>(exampleJson)
-            : default(List<Pet>);
-            
-            return new ObjectResult(example);
-        }
-
-
-        /// <summary>
-        /// Find pet by ID
-        /// </summary>
-        /// <remarks>Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions</remarks>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
-        /// <response code="200">successful operation</response>
-        /// <response code="400">Invalid ID supplied</response>
-        /// <response code="404">Pet not found</response>
-        [HttpGet]
-        [Route("/pet/{petId}")]
-        [SwaggerOperation("GetPetById")]
-        [SwaggerResponse(200, type: typeof(Pet))]
-        public IActionResult GetPetById([FromRoute]long? petId)
-        { 
-            string exampleJson = null;
-            
-            var example = exampleJson != null
-            ? JsonConvert.DeserializeObject<Pet>(exampleJson)
-            : default(Pet);
-            
-            return new ObjectResult(example);
-        }
-
-
-        /// <summary>
-        /// Updates a pet in the store with form data
-        /// </summary>
-        /// <remarks></remarks>
-        /// <param name="petId">ID of pet that needs to be updated</param>
-        /// <param name="name">Updated name of the pet</param>
-        /// <param name="status">Updated status of the pet</param>
-        /// <response code="405">Invalid input</response>
-        [HttpPost]
-        [Route("/pet/{petId}")]
-        [SwaggerOperation("UpdatePetWithForm")]
-        public void UpdatePetWithForm([FromRoute]string petId, [FromForm]string name, [FromForm]string status)
-        { 
-            throw new NotImplementedException();
-        }
-
-
         /// <summary>
         /// Deletes a pet
         /// </summary>
@@ -154,6 +50,107 @@ namespace IO.Swagger.Controllers
         }
 
 
+        /// <summary>
+        /// Finds Pets by status
+        /// </summary>
+        /// <remarks>Multiple status values can be provided with comma separated strings</remarks>
+        /// <param name="status">Status values that need to be considered for filter</param>
+        /// <response code="200">successful operation</response>
+        /// <response code="400">Invalid status value</response>
+        [HttpGet]
+        [Route("/pet/findByStatus")]
+        [SwaggerOperation("FindPetsByStatus")]
+        [SwaggerResponse(200, type: typeof(List<Pet>))]
+        public IActionResult FindPetsByStatus([FromQuery]List<string> status)
+        { 
+            string exampleJson = null;
+            
+            var example = exampleJson != null
+            ? JsonConvert.DeserializeObject<List<Pet>>(exampleJson)
+            : default(List<Pet>);
+            return new ObjectResult(example);
+        }
+
+
+        /// <summary>
+        /// Finds Pets by tags
+        /// </summary>
+        /// <remarks>Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.</remarks>
+        /// <param name="tags">Tags to filter by</param>
+        /// <response code="200">successful operation</response>
+        /// <response code="400">Invalid tag value</response>
+        [HttpGet]
+        [Route("/pet/findByTags")]
+        [SwaggerOperation("FindPetsByTags")]
+        [SwaggerResponse(200, type: typeof(List<Pet>))]
+        public IActionResult FindPetsByTags([FromQuery]List<string> tags)
+        { 
+            string exampleJson = null;
+            
+            var example = exampleJson != null
+            ? JsonConvert.DeserializeObject<List<Pet>>(exampleJson)
+            : default(List<Pet>);
+            return new ObjectResult(example);
+        }
+
+
+        /// <summary>
+        /// Find pet by ID
+        /// </summary>
+        /// <remarks>Returns a single pet</remarks>
+        /// <param name="petId">ID of pet to return</param>
+        /// <response code="200">successful operation</response>
+        /// <response code="400">Invalid ID supplied</response>
+        /// <response code="404">Pet not found</response>
+        [HttpGet]
+        [Route("/pet/{petId}")]
+        [SwaggerOperation("GetPetById")]
+        [SwaggerResponse(200, type: typeof(Pet))]
+        public IActionResult GetPetById([FromRoute]long? petId)
+        { 
+            string exampleJson = null;
+            
+            var example = exampleJson != null
+            ? JsonConvert.DeserializeObject<Pet>(exampleJson)
+            : default(Pet);
+            return new ObjectResult(example);
+        }
+
+
+        /// <summary>
+        /// Update an existing pet
+        /// </summary>
+        /// <remarks></remarks>
+        /// <param name="body">Pet object that needs to be added to the store</param>
+        /// <response code="400">Invalid ID supplied</response>
+        /// <response code="404">Pet not found</response>
+        /// <response code="405">Validation exception</response>
+        [HttpPut]
+        [Route("/pet")]
+        [SwaggerOperation("UpdatePet")]
+        public void UpdatePet([FromBody]Pet body)
+        { 
+            throw new NotImplementedException();
+        }
+
+
+        /// <summary>
+        /// Updates a pet in the store with form data
+        /// </summary>
+        /// <remarks></remarks>
+        /// <param name="petId">ID of pet that needs to be updated</param>
+        /// <param name="name">Updated name of the pet</param>
+        /// <param name="status">Updated status of the pet</param>
+        /// <response code="405">Invalid input</response>
+        [HttpPost]
+        [Route("/pet/{petId}")]
+        [SwaggerOperation("UpdatePetWithForm")]
+        public void UpdatePetWithForm([FromRoute]long? petId, [FromForm]string name, [FromForm]string status)
+        { 
+            throw new NotImplementedException();
+        }
+
+
         /// <summary>
         /// uploads an image
         /// </summary>
@@ -161,52 +158,19 @@ namespace IO.Swagger.Controllers
         /// <param name="petId">ID of pet to update</param>
         /// <param name="additionalMetadata">Additional data to pass to server</param>
         /// <param name="file">file to upload</param>
-        /// <response code="0">successful operation</response>
+        /// <response code="200">successful operation</response>
         [HttpPost]
         [Route("/pet/{petId}/uploadImage")]
         [SwaggerOperation("UploadFile")]
-        public void UploadFile([FromRoute]long? petId, [FromForm]string additionalMetadata, [FromForm]Stream file)
-        { 
-            throw new NotImplementedException();
-        }
-
-
-        /// <summary>
-        /// Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
-        /// </summary>
-        /// <remarks>Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions</remarks>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
-        /// <response code="200">successful operation</response>
-        /// <response code="400">Invalid ID supplied</response>
-        /// <response code="404">Pet not found</response>
-        [HttpGet]
-        [Route("/pet/{petId}/testing_byte_array=true")]
-        [SwaggerOperation("GetPetByIdWithByteArray")]
-        [SwaggerResponse(200, type: typeof(byte[]))]
-        public IActionResult GetPetByIdWithByteArray([FromRoute]long? petId)
+        [SwaggerResponse(200, type: typeof(ApiResponse))]
+        public IActionResult UploadFile([FromRoute]long? petId, [FromForm]string additionalMetadata, [FromForm]System.IO.Stream file)
         { 
             string exampleJson = null;
             
             var example = exampleJson != null
-            ? JsonConvert.DeserializeObject<byte[]>(exampleJson)
-            : default(byte[]);
-            
+            ? JsonConvert.DeserializeObject<ApiResponse>(exampleJson)
+            : default(ApiResponse);
             return new ObjectResult(example);
         }
-
-
-        /// <summary>
-        /// Fake endpoint to test byte array in body parameter for adding a new pet to the store
-        /// </summary>
-        /// <remarks></remarks>
-        /// <param name="body">Pet object in the form of byte array</param>
-        /// <response code="405">Invalid input</response>
-        [HttpPost]
-        [Route("/pet/testing_byte_array=true")]
-        [SwaggerOperation("AddPetUsingByteArray")]
-        public void AddPetUsingByteArray([FromBody]byte[] body)
-        { 
-            throw new NotImplementedException();
-        }
     }
 }
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/StoreApi.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/StoreApi.cs
index 347c46abd69..04838253884 100644
--- a/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/StoreApi.cs
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/StoreApi.cs
@@ -19,6 +19,22 @@ namespace IO.Swagger.Controllers
     public class StoreApiController : Controller
     { 
 
+        /// <summary>
+        /// Delete purchase order by ID
+        /// </summary>
+        /// <remarks>For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors</remarks>
+        /// <param name="orderId">ID of the order that needs to be deleted</param>
+        /// <response code="400">Invalid ID supplied</response>
+        /// <response code="404">Order not found</response>
+        [HttpDelete]
+        [Route("/store/order/{orderId}")]
+        [SwaggerOperation("DeleteOrder")]
+        public void DeleteOrder([FromRoute]string orderId)
+        { 
+            throw new NotImplementedException();
+        }
+
+
         /// <summary>
         /// Returns pet inventories by status
         /// </summary>
@@ -35,7 +51,29 @@ namespace IO.Swagger.Controllers
             var example = exampleJson != null
             ? JsonConvert.DeserializeObject<Dictionary<string, int?>>(exampleJson)
             : default(Dictionary<string, int?>);
+            return new ObjectResult(example);
+        }
+
+
+        /// <summary>
+        /// Find purchase order by ID
+        /// </summary>
+        /// <remarks>For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions</remarks>
+        /// <param name="orderId">ID of pet that needs to be fetched</param>
+        /// <response code="200">successful operation</response>
+        /// <response code="400">Invalid ID supplied</response>
+        /// <response code="404">Order not found</response>
+        [HttpGet]
+        [Route("/store/order/{orderId}")]
+        [SwaggerOperation("GetOrderById")]
+        [SwaggerResponse(200, type: typeof(Order))]
+        public IActionResult GetOrderById([FromRoute]long? orderId)
+        { 
+            string exampleJson = null;
             
+            var example = exampleJson != null
+            ? JsonConvert.DeserializeObject<Order>(exampleJson)
+            : default(Order);
             return new ObjectResult(example);
         }
 
@@ -58,48 +96,7 @@ namespace IO.Swagger.Controllers
             var example = exampleJson != null
             ? JsonConvert.DeserializeObject<Order>(exampleJson)
             : default(Order);
-            
             return new ObjectResult(example);
         }
-
-
-        /// <summary>
-        /// Find purchase order by ID
-        /// </summary>
-        /// <remarks>For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions</remarks>
-        /// <param name="orderId">ID of pet that needs to be fetched</param>
-        /// <response code="200">successful operation</response>
-        /// <response code="400">Invalid ID supplied</response>
-        /// <response code="404">Order not found</response>
-        [HttpGet]
-        [Route("/store/order/{orderId}")]
-        [SwaggerOperation("GetOrderById")]
-        [SwaggerResponse(200, type: typeof(Order))]
-        public IActionResult GetOrderById([FromRoute]string orderId)
-        { 
-            string exampleJson = null;
-            
-            var example = exampleJson != null
-            ? JsonConvert.DeserializeObject<Order>(exampleJson)
-            : default(Order);
-            
-            return new ObjectResult(example);
-        }
-
-
-        /// <summary>
-        /// Delete purchase order by ID
-        /// </summary>
-        /// <remarks>For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors</remarks>
-        /// <param name="orderId">ID of the order that needs to be deleted</param>
-        /// <response code="400">Invalid ID supplied</response>
-        /// <response code="404">Order not found</response>
-        [HttpDelete]
-        [Route("/store/order/{orderId}")]
-        [SwaggerOperation("DeleteOrder")]
-        public void DeleteOrder([FromRoute]string orderId)
-        { 
-            throw new NotImplementedException();
-        }
     }
 }
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/UserApi.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/UserApi.cs
index 180dc4aa00a..dd676fac85b 100644
--- a/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/UserApi.cs
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/UserApi.cs
@@ -64,6 +64,45 @@ namespace IO.Swagger.Controllers
         }
 
 
+        /// <summary>
+        /// Delete user
+        /// </summary>
+        /// <remarks>This can only be done by the logged in user.</remarks>
+        /// <param name="username">The name that needs to be deleted</param>
+        /// <response code="400">Invalid username supplied</response>
+        /// <response code="404">User not found</response>
+        [HttpDelete]
+        [Route("/user/{username}")]
+        [SwaggerOperation("DeleteUser")]
+        public void DeleteUser([FromRoute]string username)
+        { 
+            throw new NotImplementedException();
+        }
+
+
+        /// <summary>
+        /// Get user by user name
+        /// </summary>
+        /// <remarks></remarks>
+        /// <param name="username">The name that needs to be fetched. Use user1 for testing. </param>
+        /// <response code="200">successful operation</response>
+        /// <response code="400">Invalid username supplied</response>
+        /// <response code="404">User not found</response>
+        [HttpGet]
+        [Route("/user/{username}")]
+        [SwaggerOperation("GetUserByName")]
+        [SwaggerResponse(200, type: typeof(User))]
+        public IActionResult GetUserByName([FromRoute]string username)
+        { 
+            string exampleJson = null;
+            
+            var example = exampleJson != null
+            ? JsonConvert.DeserializeObject<User>(exampleJson)
+            : default(User);
+            return new ObjectResult(example);
+        }
+
+
         /// <summary>
         /// Logs user into the system
         /// </summary>
@@ -83,7 +122,6 @@ namespace IO.Swagger.Controllers
             var example = exampleJson != null
             ? JsonConvert.DeserializeObject<string>(exampleJson)
             : default(string);
-            
             return new ObjectResult(example);
         }
 
@@ -102,30 +140,6 @@ namespace IO.Swagger.Controllers
         }
 
 
-        /// <summary>
-        /// Get user by user name
-        /// </summary>
-        /// <remarks></remarks>
-        /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
-        /// <response code="200">successful operation</response>
-        /// <response code="400">Invalid username supplied</response>
-        /// <response code="404">User not found</response>
-        [HttpGet]
-        [Route("/user/{username}")]
-        [SwaggerOperation("GetUserByName")]
-        [SwaggerResponse(200, type: typeof(User))]
-        public IActionResult GetUserByName([FromRoute]string username)
-        { 
-            string exampleJson = null;
-            
-            var example = exampleJson != null
-            ? JsonConvert.DeserializeObject<User>(exampleJson)
-            : default(User);
-            
-            return new ObjectResult(example);
-        }
-
-
         /// <summary>
         /// Updated user
         /// </summary>
@@ -141,21 +155,5 @@ namespace IO.Swagger.Controllers
         { 
             throw new NotImplementedException();
         }
-
-
-        /// <summary>
-        /// Delete user
-        /// </summary>
-        /// <remarks>This can only be done by the logged in user.</remarks>
-        /// <param name="username">The name that needs to be deleted</param>
-        /// <response code="400">Invalid username supplied</response>
-        /// <response code="404">User not found</response>
-        [HttpDelete]
-        [Route("/user/{username}")]
-        [SwaggerOperation("DeleteUser")]
-        public void DeleteUser([FromRoute]string username)
-        { 
-            throw new NotImplementedException();
-        }
     }
 }
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/ApiResponse.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/ApiResponse.cs
new file mode 100644
index 00000000000..886f22c21bf
--- /dev/null
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/ApiResponse.cs
@@ -0,0 +1,150 @@
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+
+namespace IO.Swagger.Models
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public partial class ApiResponse :  IEquatable<ApiResponse>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApiResponse" /> class.
+        /// </summary>
+        /// <param name="Code">Code.</param>
+        /// <param name="Type">Type.</param>
+        /// <param name="Message">Message.</param>
+        public ApiResponse(int? Code = null, string Type = null, string Message = null)
+        {
+            this.Code = Code;
+            this.Type = Type;
+            this.Message = Message;
+            
+        }
+
+        /// <summary>
+        /// Gets or Sets Code
+        /// </summary>
+        public int? Code { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Type
+        /// </summary>
+        public string Type { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Message
+        /// </summary>
+        public string Message { get; set; }
+
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class ApiResponse {\n");
+            sb.Append("  Code: ").Append(Code).Append("\n");
+sb.Append("  Type: ").Append(Type).Append("\n");
+sb.Append("  Message: ").Append(Message).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="obj">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            if (obj.GetType() != GetType()) return false;
+            return Equals((ApiResponse)obj);
+        }
+
+        /// <summary>
+        /// Returns true if ApiResponse instances are equal
+        /// </summary>
+        /// <param name="other">Instance of ApiResponse to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(ApiResponse other)
+        {
+
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return 
+                (
+                    this.Code == other.Code ||
+                    this.Code != null &&
+                    this.Code.Equals(other.Code)
+                ) && 
+                (
+                    this.Type == other.Type ||
+                    this.Type != null &&
+                    this.Type.Equals(other.Type)
+                ) && 
+                (
+                    this.Message == other.Message ||
+                    this.Message != null &&
+                    this.Message.Equals(other.Message)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            // credit: http://stackoverflow.com/a/263416/677735
+            unchecked // Overflow is fine, just wrap
+            {
+                int hash = 41;
+                // Suitable nullity checks etc, of course :)
+                    if (this.Code != null)
+                    hash = hash * 59 + this.Code.GetHashCode();
+                    if (this.Type != null)
+                    hash = hash * 59 + this.Type.GetHashCode();
+                    if (this.Message != null)
+                    hash = hash * 59 + this.Message.GetHashCode();
+                return hash;
+            }
+        }
+
+        #region Operators
+
+        public static bool operator ==(ApiResponse left, ApiResponse right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(ApiResponse left, ApiResponse right)
+        {
+            return !Equals(left, right);
+        }
+
+        #endregion Operators
+
+    }
+}
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Category.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Category.cs
index 1bdccbdc4e1..e412db81ee2 100644
--- a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Category.cs
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Category.cs
@@ -27,19 +27,16 @@ namespace IO.Swagger.Models
             
         }
 
-        
         /// <summary>
         /// Gets or Sets Id
         /// </summary>
         public long? Id { get; set; }
 
-        
         /// <summary>
         /// Gets or Sets Name
         /// </summary>
         public string Name { get; set; }
 
-        
 
         /// <summary>
         /// Returns the string presentation of the object
@@ -50,8 +47,7 @@ namespace IO.Swagger.Models
             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("  Name: ").Append(Name).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -113,13 +109,10 @@ namespace IO.Swagger.Models
             {
                 int hash = 41;
                 // Suitable nullity checks etc, of course :)
-                
                     if (this.Id != null)
                     hash = hash * 59 + this.Id.GetHashCode();
-                
                     if (this.Name != null)
                     hash = hash * 59 + this.Name.GetHashCode();
-                
                 return hash;
             }
         }
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Order.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Order.cs
index 27252258328..5b5a9b6d14e 100644
--- a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Order.cs
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Order.cs
@@ -23,7 +23,7 @@ namespace IO.Swagger.Models
         /// <param name="Quantity">Quantity.</param>
         /// <param name="ShipDate">ShipDate.</param>
         /// <param name="Status">Order Status.</param>
-        /// <param name="Complete">Complete.</param>
+        /// <param name="Complete">Complete (default to false).</param>
         public Order(long? Id = null, long? PetId = null, int? Quantity = null, DateTime? ShipDate = null, string Status = null, bool? Complete = null)
         {
             this.Id = Id;
@@ -31,48 +31,49 @@ namespace IO.Swagger.Models
             this.Quantity = Quantity;
             this.ShipDate = ShipDate;
             this.Status = Status;
-            this.Complete = Complete;
+            // use default value if no "Complete" provided
+            if (Complete == null)
+            {
+                this.Complete = false;
+            }
+            else
+            {
+                this.Complete = Complete;
+            }
             
         }
 
-        
         /// <summary>
         /// Gets or Sets Id
         /// </summary>
         public long? Id { get; set; }
 
-        
         /// <summary>
         /// Gets or Sets PetId
         /// </summary>
         public long? PetId { get; set; }
 
-        
         /// <summary>
         /// Gets or Sets Quantity
         /// </summary>
         public int? Quantity { get; set; }
 
-        
         /// <summary>
         /// Gets or Sets ShipDate
         /// </summary>
         public DateTime? ShipDate { get; set; }
 
-        
         /// <summary>
         /// Order Status
         /// </summary>
         /// <value>Order Status</value>
         public string Status { get; set; }
 
-        
         /// <summary>
         /// Gets or Sets Complete
         /// </summary>
         public bool? Complete { get; set; }
 
-        
 
         /// <summary>
         /// Returns the string presentation of the object
@@ -83,12 +84,11 @@ namespace IO.Swagger.Models
             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("  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();
         }
@@ -170,25 +170,18 @@ namespace IO.Swagger.Models
             {
                 int hash = 41;
                 // Suitable nullity checks etc, of course :)
-                
                     if (this.Id != null)
                     hash = hash * 59 + this.Id.GetHashCode();
-                
                     if (this.PetId != null)
                     hash = hash * 59 + this.PetId.GetHashCode();
-                
                     if (this.Quantity != null)
                     hash = hash * 59 + this.Quantity.GetHashCode();
-                
                     if (this.ShipDate != null)
                     hash = hash * 59 + this.ShipDate.GetHashCode();
-                
                     if (this.Status != null)
                     hash = hash * 59 + this.Status.GetHashCode();
-                
                     if (this.Complete != null)
                     hash = hash * 59 + this.Complete.GetHashCode();
-                
                 return hash;
             }
         }
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Pet.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Pet.cs
index e2756f6a80d..70a3992c294 100644
--- a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Pet.cs
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Pet.cs
@@ -51,44 +51,37 @@ namespace IO.Swagger.Models
             
         }
 
-        
         /// <summary>
         /// Gets or Sets Id
         /// </summary>
         public long? Id { get; set; }
 
-        
         /// <summary>
         /// Gets or Sets Category
         /// </summary>
         public Category Category { get; set; }
 
-        
         /// <summary>
         /// Gets or Sets Name
         /// </summary>
         public string Name { get; set; }
 
-        
         /// <summary>
         /// Gets or Sets PhotoUrls
         /// </summary>
         public List<string> PhotoUrls { get; set; }
 
-        
         /// <summary>
         /// Gets or Sets Tags
         /// </summary>
         public List<Tag> Tags { get; set; }
 
-        
         /// <summary>
         /// pet status in the store
         /// </summary>
         /// <value>pet status in the store</value>
         public string Status { get; set; }
 
-        
 
         /// <summary>
         /// Returns the string presentation of the object
@@ -99,12 +92,11 @@ namespace IO.Swagger.Models
             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("  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();
         }
@@ -186,25 +178,18 @@ namespace IO.Swagger.Models
             {
                 int hash = 41;
                 // Suitable nullity checks etc, of course :)
-                
                     if (this.Id != null)
                     hash = hash * 59 + this.Id.GetHashCode();
-                
                     if (this.Category != null)
                     hash = hash * 59 + this.Category.GetHashCode();
-                
                     if (this.Name != null)
                     hash = hash * 59 + this.Name.GetHashCode();
-                
                     if (this.PhotoUrls != null)
                     hash = hash * 59 + this.PhotoUrls.GetHashCode();
-                
                     if (this.Tags != null)
                     hash = hash * 59 + this.Tags.GetHashCode();
-                
                     if (this.Status != null)
                     hash = hash * 59 + this.Status.GetHashCode();
-                
                 return hash;
             }
         }
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Tag.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Tag.cs
index ce8a4e8eafe..77697097379 100644
--- a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Tag.cs
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Tag.cs
@@ -27,19 +27,16 @@ namespace IO.Swagger.Models
             
         }
 
-        
         /// <summary>
         /// Gets or Sets Id
         /// </summary>
         public long? Id { get; set; }
 
-        
         /// <summary>
         /// Gets or Sets Name
         /// </summary>
         public string Name { get; set; }
 
-        
 
         /// <summary>
         /// Returns the string presentation of the object
@@ -50,8 +47,7 @@ namespace IO.Swagger.Models
             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("  Name: ").Append(Name).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -113,13 +109,10 @@ namespace IO.Swagger.Models
             {
                 int hash = 41;
                 // Suitable nullity checks etc, of course :)
-                
                     if (this.Id != null)
                     hash = hash * 59 + this.Id.GetHashCode();
-                
                     if (this.Name != null)
                     hash = hash * 59 + this.Name.GetHashCode();
-                
                 return hash;
             }
         }
diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/User.cs b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/User.cs
index 9c3737b8b32..c8373712db9 100644
--- a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/User.cs
+++ b/samples/server/petstore/aspnet5/src/IO.Swagger/Models/User.cs
@@ -39,56 +39,47 @@ namespace IO.Swagger.Models
             
         }
 
-        
         /// <summary>
         /// Gets or Sets Id
         /// </summary>
         public long? Id { get; set; }
 
-        
         /// <summary>
         /// Gets or Sets Username
         /// </summary>
         public string Username { get; set; }
 
-        
         /// <summary>
         /// Gets or Sets FirstName
         /// </summary>
         public string FirstName { get; set; }
 
-        
         /// <summary>
         /// Gets or Sets LastName
         /// </summary>
         public string LastName { get; set; }
 
-        
         /// <summary>
         /// Gets or Sets Email
         /// </summary>
         public string Email { get; set; }
 
-        
         /// <summary>
         /// Gets or Sets Password
         /// </summary>
         public string Password { get; set; }
 
-        
         /// <summary>
         /// Gets or Sets Phone
         /// </summary>
         public string Phone { get; set; }
 
-        
         /// <summary>
         /// User Status
         /// </summary>
         /// <value>User Status</value>
         public int? UserStatus { get; set; }
 
-        
 
         /// <summary>
         /// Returns the string presentation of the object
@@ -99,14 +90,13 @@ namespace IO.Swagger.Models
             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("  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();
         }
@@ -198,31 +188,22 @@ namespace IO.Swagger.Models
             {
                 int hash = 41;
                 // Suitable nullity checks etc, of course :)
-                
                     if (this.Id != null)
                     hash = hash * 59 + this.Id.GetHashCode();
-                
                     if (this.Username != null)
                     hash = hash * 59 + this.Username.GetHashCode();
-                
                     if (this.FirstName != null)
                     hash = hash * 59 + this.FirstName.GetHashCode();
-                
                     if (this.LastName != null)
                     hash = hash * 59 + this.LastName.GetHashCode();
-                
                     if (this.Email != null)
                     hash = hash * 59 + this.Email.GetHashCode();
-                
                     if (this.Password != null)
                     hash = hash * 59 + this.Password.GetHashCode();
-                
                     if (this.Phone != null)
                     hash = hash * 59 + this.Phone.GetHashCode();
-                
                     if (this.UserStatus != null)
                     hash = hash * 59 + this.UserStatus.GetHashCode();
-                
                 return hash;
             }
         }
diff --git a/samples/server/petstore/flaskConnexion/__init__.py b/samples/server/petstore/flaskConnexion/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/samples/server/petstore/flaskConnexion/app.py b/samples/server/petstore/flaskConnexion/app.py
index 1e2fed4d9ea..0b3ce76dd2f 100644
--- a/samples/server/petstore/flaskConnexion/app.py
+++ b/samples/server/petstore/flaskConnexion/app.py
@@ -4,5 +4,5 @@ import connexion
 
 if __name__ == '__main__':
     app = connexion.App(__name__, specification_dir='./swagger/')
-    app.add_api('swagger.yaml', arguments={'title': 'This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.'})
+    app.add_api('swagger.yaml', arguments={'title': 'This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key &#x60;special-key&#x60; to test the authorization filters.'})
     app.run(port=8080)
diff --git a/samples/server/petstore/flaskConnexion/controllers/__init__.py b/samples/server/petstore/flaskConnexion/controllers/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/samples/server/petstore/flaskConnexion/controllers/default_controller.py b/samples/server/petstore/flaskConnexion/controllers/default_controller.py
index d42c48575d1..e6a231aa6fe 100644
--- a/samples/server/petstore/flaskConnexion/controllers/default_controller.py
+++ b/samples/server/petstore/flaskConnexion/controllers/default_controller.py
@@ -1,46 +1,10 @@
 
-def create_user(body) -> str:
-    return 'do some magic!'
-
-def create_users_with_array_input(body) -> str:
-    return 'do some magic!'
-
-def create_users_with_list_input(body) -> str:
-    return 'do some magic!'
-
-def login_user(username, password) -> str:
-    return 'do some magic!'
-
-def logout_user() -> str:
-    return 'do some magic!'
-
-def get_user_by_name(username) -> str:
-    return 'do some magic!'
-
-def update_user(username, body) -> str:
-    return 'do some magic!'
-
-def delete_user(username) -> str:
-    return 'do some magic!'
-
-def get_inventory() -> str:
-    return 'do some magic!'
-
-def place_order(body) -> str:
-    return 'do some magic!'
-
-def get_order_by_id(orderId) -> str:
-    return 'do some magic!'
-
-def delete_order(orderId) -> str:
-    return 'do some magic!'
-
-def update_pet(body) -> str:
-    return 'do some magic!'
-
 def add_pet(body) -> str:
     return 'do some magic!'
 
+def delete_pet(petId, apiKey = None) -> str:
+    return 'do some magic!'
+
 def find_pets_by_status(status) -> str:
     return 'do some magic!'
 
@@ -50,11 +14,47 @@ def find_pets_by_tags(tags) -> str:
 def get_pet_by_id(petId) -> str:
     return 'do some magic!'
 
-def update_pet_with_form(petId, name, status) -> str:
+def update_pet(body) -> str:
     return 'do some magic!'
 
-def delete_pet(petId, apiKey) -> str:
+def update_pet_with_form(petId, name = None, status = None) -> str:
     return 'do some magic!'
 
-def upload_file(petId, additionalMetadata, file) -> str:
+def upload_file(petId, additionalMetadata = None, file = None) -> str:
+    return 'do some magic!'
+
+def delete_order(orderId) -> str:
+    return 'do some magic!'
+
+def get_inventory() -> str:
+    return 'do some magic!'
+
+def get_order_by_id(orderId) -> str:
+    return 'do some magic!'
+
+def place_order(body) -> str:
+    return 'do some magic!'
+
+def create_user(body) -> str:
+    return 'do some magic!'
+
+def create_users_with_array_input(body) -> str:
+    return 'do some magic!'
+
+def create_users_with_list_input(body) -> str:
+    return 'do some magic!'
+
+def delete_user(username) -> str:
+    return 'do some magic!'
+
+def get_user_by_name(username) -> str:
+    return 'do some magic!'
+
+def login_user(username, password) -> str:
+    return 'do some magic!'
+
+def logout_user() -> str:
+    return 'do some magic!'
+
+def update_user(username, body) -> str:
     return 'do some magic!'
diff --git a/samples/server/petstore/flaskConnexion/controllers/init.py b/samples/server/petstore/flaskConnexion/controllers/init.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/samples/server/petstore/flaskConnexion/init.py b/samples/server/petstore/flaskConnexion/init.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/samples/server/petstore/flaskConnexion/swagger/swagger.yaml b/samples/server/petstore/flaskConnexion/swagger/swagger.yaml
index d086d6ff49d..368e2c24e82 100644
--- a/samples/server/petstore/flaskConnexion/swagger/swagger.yaml
+++ b/samples/server/petstore/flaskConnexion/swagger/swagger.yaml
@@ -54,6 +54,10 @@ paths:
       responses:
         405:
           description: "Invalid input"
+      security:
+      - petstore_auth:
+        - "write:pets"
+        - "read:pets"
       x-tags:
       - tag: "pet"
     put:
@@ -82,6 +86,10 @@ paths:
           description: "Pet not found"
         405:
           description: "Validation exception"
+      security:
+      - petstore_auth:
+        - "write:pets"
+        - "read:pets"
       x-tags:
       - tag: "pet"
   /pet/findByStatus:
@@ -102,12 +110,12 @@ paths:
         type: "array"
         items:
           type: "string"
+          default: "available"
           enum:
           - "available"
           - "pending"
           - "sold"
-          default: "available"
-        collectionFormat: "multi"
+        collectionFormat: "csv"
       responses:
         200:
           description: "successful operation"
@@ -117,6 +125,10 @@ paths:
               $ref: "#/definitions/Pet"
         400:
           description: "Invalid status value"
+      security:
+      - petstore_auth:
+        - "write:pets"
+        - "read:pets"
       x-tags:
       - tag: "pet"
   /pet/findByTags:
@@ -124,7 +136,7 @@ paths:
       tags:
       - "pet"
       summary: "Finds Pets by tags"
-      description: "Muliple tags can be provided with comma separated strings. Use\
+      description: "Multiple tags can be provided with comma separated strings. Use\
         \ tag1, tag2, tag3 for testing."
       operationId: "controllers.default_controller.find_pets_by_tags"
       produces:
@@ -138,7 +150,7 @@ paths:
         type: "array"
         items:
           type: "string"
-        collectionFormat: "multi"
+        collectionFormat: "csv"
       responses:
         200:
           description: "successful operation"
@@ -148,7 +160,10 @@ paths:
               $ref: "#/definitions/Pet"
         400:
           description: "Invalid tag value"
-      deprecated: true
+      security:
+      - petstore_auth:
+        - "write:pets"
+        - "read:pets"
       x-tags:
       - tag: "pet"
   /pet/{petId}:
@@ -212,6 +227,10 @@ paths:
       responses:
         405:
           description: "Invalid input"
+      security:
+      - petstore_auth:
+        - "write:pets"
+        - "read:pets"
       x-tags:
       - tag: "pet"
     delete:
@@ -236,9 +255,11 @@ paths:
         format: "int64"
       responses:
         400:
-          description: "Invalid ID supplied"
-        404:
-          description: "Pet not found"
+          description: "Invalid pet value"
+      security:
+      - petstore_auth:
+        - "write:pets"
+        - "read:pets"
       x-tags:
       - tag: "pet"
   /pet/{petId}/uploadImage:
@@ -274,6 +295,10 @@ paths:
           description: "successful operation"
           schema:
             $ref: "#/definitions/ApiResponse"
+      security:
+      - petstore_auth:
+        - "write:pets"
+        - "read:pets"
       x-tags:
       - tag: "pet"
   /store/inventory:
@@ -329,8 +354,8 @@ paths:
       tags:
       - "store"
       summary: "Find purchase order by ID"
-      description: "For valid response try integer IDs with value >= 1 and <= 10.\
-        \ Other values will generated exceptions"
+      description: "For valid response try integer IDs with value <= 5 or > 10. Other\
+        \ values will generated exceptions"
       operationId: "controllers.default_controller.get_order_by_id"
       produces:
       - "application/xml"
@@ -341,7 +366,7 @@ paths:
         description: "ID of pet that needs to be fetched"
         required: true
         type: "integer"
-        maximum: 10.0
+        maximum: 5.0
         minimum: 1.0
         format: "int64"
       responses:
@@ -359,8 +384,8 @@ paths:
       tags:
       - "store"
       summary: "Delete purchase order by ID"
-      description: "For valid response try integer IDs with positive integer value.\
-        \ Negative or non-integer values will generate API errors"
+      description: "For valid response try integer IDs with value < 1000. Anything\
+        \ above 1000 or nonintegers will generate API errors"
       operationId: "controllers.default_controller.delete_order"
       produces:
       - "application/xml"
@@ -370,9 +395,8 @@ paths:
         in: "path"
         description: "ID of the order that needs to be deleted"
         required: true
-        type: "integer"
+        type: "string"
         minimum: 1.0
-        format: "int64"
       responses:
         400:
           description: "Invalid ID supplied"
@@ -484,7 +508,7 @@ paths:
             X-Expires-After:
               type: "string"
               format: "date-time"
-              description: "date in UTC when token expires"
+              description: "date in UTC when toekn expires"
         400:
           description: "Invalid username/password supplied"
       x-tags:
@@ -544,7 +568,7 @@ paths:
       parameters:
       - name: "username"
         in: "path"
-        description: "name that need to be updated"
+        description: "name that need to be deleted"
         required: true
         type: "string"
       - in: "body"
@@ -587,6 +611,13 @@ securityDefinitions:
     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:
   Order:
     type: "object"
@@ -615,6 +646,16 @@ definitions:
         default: false
     xml:
       name: "Order"
+  Category:
+    type: "object"
+    properties:
+      id:
+        type: "integer"
+        format: "int64"
+      name:
+        type: "string"
+    xml:
+      name: "Category"
   User:
     type: "object"
     properties:
@@ -639,16 +680,6 @@ definitions:
         description: "User Status"
     xml:
       name: "User"
-  Category:
-    type: "object"
-    properties:
-      id:
-        type: "integer"
-        format: "int64"
-      name:
-        type: "string"
-    xml:
-      name: "Category"
   Tag:
     type: "object"
     properties:
@@ -659,16 +690,6 @@ definitions:
         type: "string"
     xml:
       name: "Tag"
-  ApiResponse:
-    type: "object"
-    properties:
-      code:
-        type: "integer"
-        format: "int32"
-      type:
-        type: "string"
-      message:
-        type: "string"
   Pet:
     type: "object"
     required:
@@ -706,6 +727,16 @@ definitions:
         - "sold"
     xml:
       name: "Pet"
+  ApiResponse:
+    type: "object"
+    properties:
+      code:
+        type: "integer"
+        format: "int32"
+      type:
+        type: "string"
+      message:
+        type: "string"
 externalDocs:
   description: "Find out more about Swagger"
   url: "http://swagger.io"
diff --git a/samples/server/petstore/java-inflector/inflector.yaml b/samples/server/petstore/java-inflector/inflector.yaml
index 8a11ca3b659..2511293c542 100644
--- a/samples/server/petstore/java-inflector/inflector.yaml
+++ b/samples/server/petstore/java-inflector/inflector.yaml
@@ -2,12 +2,15 @@ controllerPackage: io.swagger.handler
 modelPackage:  io.swagger.model
 swaggerUrl: ./src/main/swagger/swagger.yaml
 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
-  
+  # to enable explicit mappings, use this syntax:
+  DefinitionFromSwaggerSpecification: fully.qualified.path.to.Model
+  ApiResponse : io.swagger.model.ApiResponse
+Category : io.swagger.model.Category
+Order : io.swagger.model.Order
+Pet : io.swagger.model.Pet
+Tag : io.swagger.model.Tag
+User : io.swagger.model.User
+
 entityProcessors:
   - json
   - xml
diff --git a/samples/server/petstore/java-inflector/pom.xml b/samples/server/petstore/java-inflector/pom.xml
index ace023a70db..d93b5e8a6c5 100644
--- a/samples/server/petstore/java-inflector/pom.xml
+++ b/samples/server/petstore/java-inflector/pom.xml
@@ -19,6 +19,25 @@
         <directory>target</directory>
         <finalName>${project.artifactId}-${project.version}</finalName>
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.10</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/gen/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
@@ -78,12 +97,21 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-inflector</artifactId>
-            <version>1.0.0</version>
+            <version>${swagger-inflector-version}</version>
         </dependency>
     </dependencies>
+    <repositories>
+        <repository>
+            <id>sonatype-snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
     <properties>
         <maven-plugin-version>1.0.0</maven-plugin-version>
-        <swagger-core-version>1.5.7</swagger-core-version>
+        <swagger-inflector-version>1.0.4</swagger-inflector-version>
         <jetty-version>9.2.9.v20150224</jetty-version>
         <logback-version>1.0.1</logback-version>
         <junit-version>4.8.2</junit-version>
diff --git a/samples/server/petstore/java-inflector/src/main/java/io/swagger/handler/PetController.java b/samples/server/petstore/java-inflector/src/main/java/io/swagger/handler/PetController.java
index 9a9c25f919f..e05a1ffc1f2 100644
--- a/samples/server/petstore/java-inflector/src/main/java/io/swagger/handler/PetController.java
+++ b/samples/server/petstore/java-inflector/src/main/java/io/swagger/handler/PetController.java
@@ -11,9 +11,10 @@ import java.util.List;
 import io.swagger.model.*;
 
 import io.swagger.model.Pet;
+import io.swagger.model.ApiResponse;
 import java.io.File;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2016-01-19T23:33:17.124+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2016-04-15T17:48:04.458+08:00")
 public class PetController  {
   /** 
    * Uncomment and implement as you see fit.  These operations will map
@@ -22,13 +23,13 @@ public class PetController  {
    **/
 
   /*
-    public ResponseContext updatePet(RequestContext request , Pet body) {
+    public ResponseContext addPet(RequestContext request , Pet body) {
         return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
     }
   */
 
   /*
-    public ResponseContext addPet(RequestContext request , Pet body) {
+    public ResponseContext deletePet(RequestContext request , Long petId, String apiKey) {
         return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
     }
   */
@@ -52,13 +53,13 @@ public class PetController  {
   */
 
   /*
-    public ResponseContext updatePetWithForm(RequestContext request , String petId, String name, String status) {
+    public ResponseContext updatePet(RequestContext request , Pet body) {
         return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
     }
   */
 
   /*
-    public ResponseContext deletePet(RequestContext request , Long petId, String apiKey) {
+    public ResponseContext updatePetWithForm(RequestContext request , Long petId, String name, String status) {
         return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
     }
   */
@@ -69,11 +70,5 @@ public class PetController  {
     }
   */
 
-  /*
-    public ResponseContext getPetByIdWithByteArray(RequestContext request , Long petId) {
-        return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
-    }
-  */
-
 }
 
diff --git a/samples/server/petstore/java-inflector/src/main/java/io/swagger/handler/StoreController.java b/samples/server/petstore/java-inflector/src/main/java/io/swagger/handler/StoreController.java
index e00b1a67048..cf96ddf68fd 100644
--- a/samples/server/petstore/java-inflector/src/main/java/io/swagger/handler/StoreController.java
+++ b/samples/server/petstore/java-inflector/src/main/java/io/swagger/handler/StoreController.java
@@ -13,7 +13,7 @@ import io.swagger.model.*;
 import java.util.Map;
 import io.swagger.model.Order;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2016-01-19T23:33:17.124+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2016-04-15T17:48:04.458+08:00")
 public class StoreController  {
   /** 
    * Uncomment and implement as you see fit.  These operations will map
@@ -21,29 +21,29 @@ public class StoreController  {
    * Code allows you to implement logic incrementally, they are disabled.
    **/
 
+  /*
+    public ResponseContext deleteOrder(RequestContext request , String orderId) {
+        return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
+    }
+  */
+
   /*
     public ResponseContext getInventory(RequestContext request ) {
         return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
     }
   */
 
+  /*
+    public ResponseContext getOrderById(RequestContext request , Long orderId) {
+        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
index 41331602f07..4d99da8b342 100644
--- a/samples/server/petstore/java-inflector/src/main/java/io/swagger/handler/UserController.java
+++ b/samples/server/petstore/java-inflector/src/main/java/io/swagger/handler/UserController.java
@@ -11,9 +11,9 @@ import java.util.List;
 import io.swagger.model.*;
 
 import io.swagger.model.User;
-import java.util.*;
+import java.util.List;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2016-01-19T23:33:17.124+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2016-04-15T17:48:04.458+08:00")
 public class UserController  {
   /** 
    * Uncomment and implement as you see fit.  These operations will map
@@ -39,6 +39,18 @@ public class UserController  {
     }
   */
 
+  /*
+    public ResponseContext deleteUser(RequestContext request , String username) {
+        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 loginUser(RequestContext request , String username, String password) {
         return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" );
@@ -51,23 +63,11 @@ public class UserController  {
     }
   */
 
-  /*
-    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
deleted file mode 100644
index ce925e6cfb8..00000000000
--- a/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Category.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package io.swagger.model;
-
-import java.util.Objects;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-
-
-
-
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2016-01-19T23:33:17.124+08:00")
-public class Category   {
-  
-  private Long id = null;
-  private String name = null;
-
-  
-  /**
-   **/
-  
-  @ApiModelProperty(value = "")
-  @JsonProperty("id")
-  public Long getId() {
-    return id;
-  }
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  
-  /**
-   **/
-  
-  @ApiModelProperty(value = "")
-  @JsonProperty("name")
-  public String getName() {
-    return name;
-  }
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Category category = (Category) o;
-    return Objects.equals(id, category.id) &&
-        Objects.equals(name, category.name);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, name);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Category {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Order.java b/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Order.java
deleted file mode 100644
index 4a1505f7442..00000000000
--- a/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Order.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package io.swagger.model;
-
-import java.util.Objects;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-
-
-
-
-
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2016-01-19T23:33:17.124+08:00")
-public class Order   {
-  
-  private Long id = null;
-  private Long petId = null;
-  private Integer quantity = null;
-  private Date shipDate = null;
-
-
-  public enum StatusEnum {
-    PLACED("placed"),
-    APPROVED("approved"),
-    DELIVERED("delivered");
-
-    private String value;
-
-    StatusEnum(String value) {
-      this.value = value;
-    }
-
-    @Override
-    @JsonValue
-    public String toString() {
-      return value;
-    }
-  }
-
-  private StatusEnum status = null;
-  private Boolean complete = null;
-
-  
-  /**
-   **/
-  
-  @ApiModelProperty(value = "")
-  @JsonProperty("id")
-  public Long getId() {
-    return id;
-  }
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  
-  /**
-   **/
-  
-  @ApiModelProperty(value = "")
-  @JsonProperty("petId")
-  public Long getPetId() {
-    return petId;
-  }
-  public void setPetId(Long petId) {
-    this.petId = petId;
-  }
-
-  
-  /**
-   **/
-  
-  @ApiModelProperty(value = "")
-  @JsonProperty("quantity")
-  public Integer getQuantity() {
-    return quantity;
-  }
-  public void setQuantity(Integer quantity) {
-    this.quantity = quantity;
-  }
-
-  
-  /**
-   **/
-  
-  @ApiModelProperty(value = "")
-  @JsonProperty("shipDate")
-  public Date getShipDate() {
-    return shipDate;
-  }
-  public void setShipDate(Date shipDate) {
-    this.shipDate = shipDate;
-  }
-
-  
-  /**
-   * Order Status
-   **/
-  
-  @ApiModelProperty(value = "Order Status")
-  @JsonProperty("status")
-  public StatusEnum getStatus() {
-    return status;
-  }
-  public void setStatus(StatusEnum status) {
-    this.status = status;
-  }
-
-  
-  /**
-   **/
-  
-  @ApiModelProperty(value = "")
-  @JsonProperty("complete")
-  public Boolean getComplete() {
-    return complete;
-  }
-  public void setComplete(Boolean complete) {
-    this.complete = complete;
-  }
-
-  
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Order order = (Order) o;
-    return Objects.equals(id, order.id) &&
-        Objects.equals(petId, order.petId) &&
-        Objects.equals(quantity, order.quantity) &&
-        Objects.equals(shipDate, order.shipDate) &&
-        Objects.equals(status, order.status) &&
-        Objects.equals(complete, order.complete);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Order {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    petId: ").append(toIndentedString(petId)).append("\n");
-    sb.append("    quantity: ").append(toIndentedString(quantity)).append("\n");
-    sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Tag.java b/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Tag.java
deleted file mode 100644
index c0d2e1e4c0e..00000000000
--- a/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Tag.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package io.swagger.model;
-
-import java.util.Objects;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-
-
-
-
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2016-01-19T23:33:17.124+08:00")
-public class Tag   {
-  
-  private Long id = null;
-  private String name = null;
-
-  
-  /**
-   **/
-  
-  @ApiModelProperty(value = "")
-  @JsonProperty("id")
-  public Long getId() {
-    return id;
-  }
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  
-  /**
-   **/
-  
-  @ApiModelProperty(value = "")
-  @JsonProperty("name")
-  public String getName() {
-    return name;
-  }
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Tag tag = (Tag) o;
-    return Objects.equals(id, tag.id) &&
-        Objects.equals(name, tag.name);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, name);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Tag {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/User.java b/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/User.java
deleted file mode 100644
index e2982024306..00000000000
--- a/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/User.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package io.swagger.model;
-
-import java.util.Objects;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-
-
-
-
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2016-01-19T23:33:17.124+08:00")
-public class User   {
-  
-  private Long id = null;
-  private String username = null;
-  private String firstName = null;
-  private String lastName = null;
-  private String email = null;
-  private String password = null;
-  private String phone = null;
-  private Integer userStatus = null;
-
-  
-  /**
-   **/
-  
-  @ApiModelProperty(value = "")
-  @JsonProperty("id")
-  public Long getId() {
-    return id;
-  }
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  
-  /**
-   **/
-  
-  @ApiModelProperty(value = "")
-  @JsonProperty("username")
-  public String getUsername() {
-    return username;
-  }
-  public void setUsername(String username) {
-    this.username = username;
-  }
-
-  
-  /**
-   **/
-  
-  @ApiModelProperty(value = "")
-  @JsonProperty("firstName")
-  public String getFirstName() {
-    return firstName;
-  }
-  public void setFirstName(String firstName) {
-    this.firstName = firstName;
-  }
-
-  
-  /**
-   **/
-  
-  @ApiModelProperty(value = "")
-  @JsonProperty("lastName")
-  public String getLastName() {
-    return lastName;
-  }
-  public void setLastName(String lastName) {
-    this.lastName = lastName;
-  }
-
-  
-  /**
-   **/
-  
-  @ApiModelProperty(value = "")
-  @JsonProperty("email")
-  public String getEmail() {
-    return email;
-  }
-  public void setEmail(String email) {
-    this.email = email;
-  }
-
-  
-  /**
-   **/
-  
-  @ApiModelProperty(value = "")
-  @JsonProperty("password")
-  public String getPassword() {
-    return password;
-  }
-  public void setPassword(String password) {
-    this.password = password;
-  }
-
-  
-  /**
-   **/
-  
-  @ApiModelProperty(value = "")
-  @JsonProperty("phone")
-  public String getPhone() {
-    return phone;
-  }
-  public void setPhone(String phone) {
-    this.phone = phone;
-  }
-
-  
-  /**
-   * User Status
-   **/
-  
-  @ApiModelProperty(value = "User Status")
-  @JsonProperty("userStatus")
-  public Integer getUserStatus() {
-    return userStatus;
-  }
-  public void setUserStatus(Integer userStatus) {
-    this.userStatus = userStatus;
-  }
-
-  
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    User user = (User) o;
-    return Objects.equals(id, user.id) &&
-        Objects.equals(username, user.username) &&
-        Objects.equals(firstName, user.firstName) &&
-        Objects.equals(lastName, user.lastName) &&
-        Objects.equals(email, user.email) &&
-        Objects.equals(password, user.password) &&
-        Objects.equals(phone, user.phone) &&
-        Objects.equals(userStatus, user.userStatus);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class User {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    username: ").append(toIndentedString(username)).append("\n");
-    sb.append("    firstName: ").append(toIndentedString(firstName)).append("\n");
-    sb.append("    lastName: ").append(toIndentedString(lastName)).append("\n");
-    sb.append("    email: ").append(toIndentedString(email)).append("\n");
-    sb.append("    password: ").append(toIndentedString(password)).append("\n");
-    sb.append("    phone: ").append(toIndentedString(phone)).append("\n");
-    sb.append("    userStatus: ").append(toIndentedString(userStatus)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/samples/server/petstore/java-inflector/src/main/swagger/swagger.yaml b/samples/server/petstore/java-inflector/src/main/swagger/swagger.yaml
index 6e00a887848..0917da7891b 100644
--- a/samples/server/petstore/java-inflector/src/main/swagger/swagger.yaml
+++ b/samples/server/petstore/java-inflector/src/main/swagger/swagger.yaml
@@ -2,9 +2,9 @@
 swagger: "2.0"
 info:
   description: "This is a sample server Petstore server.  You can find out more about\
-    \ Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net,\
-    \ #swagger.  For this sample, you can use the api key \"special-key\" to test\
-    \ the authorization filters"
+    \ Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).\
+    \  For this sample, you can use the api key `special-key` to test the authorization\
+    \ filters."
   version: "1.0.0"
   title: "Swagger Petstore"
   termsOfService: "http://swagger.io/terms/"
@@ -15,6 +15,19 @@ info:
     url: "http://www.apache.org/licenses/LICENSE-2.0.html"
 host: "petstore.swagger.io"
 basePath: "/v2"
+tags:
+- name: "pet"
+  description: "Everything about your Pets"
+  externalDocs:
+    description: "Find out more"
+    url: "http://swagger.io"
+- name: "store"
+  description: "Access to Petstore orders"
+- name: "user"
+  description: "Operations about user"
+  externalDocs:
+    description: "Find out more about our store"
+    url: "http://swagger.io"
 schemes:
 - "http"
 paths:
@@ -29,13 +42,13 @@ paths:
       - "application/json"
       - "application/xml"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "Pet object that needs to be added to the store"
-        required: false
+        required: true
         schema:
           $ref: "#/definitions/Pet"
       responses:
@@ -57,13 +70,13 @@ paths:
       - "application/json"
       - "application/xml"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "Pet object that needs to be added to the store"
-        required: false
+        required: true
         schema:
           $ref: "#/definitions/Pet"
       responses:
@@ -84,21 +97,25 @@ paths:
       tags:
       - "pet"
       summary: "Finds Pets by status"
-      description: "Multiple status values can be provided with comma seperated strings"
+      description: "Multiple status values can be provided with comma separated strings"
       operationId: "findPetsByStatus"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "status"
         in: "query"
         description: "Status values that need to be considered for filter"
-        required: false
+        required: true
         type: "array"
         items:
           type: "string"
-        collectionFormat: "multi"
-        default: "available"
+          default: "available"
+          enum:
+          - "available"
+          - "pending"
+          - "sold"
+        collectionFormat: "csv"
       responses:
         200:
           description: "successful operation"
@@ -119,21 +136,21 @@ paths:
       tags:
       - "pet"
       summary: "Finds Pets by tags"
-      description: "Muliple tags can be provided with comma seperated strings. Use\
+      description: "Multiple tags can be provided with comma separated strings. Use\
         \ tag1, tag2, tag3 for testing."
       operationId: "findPetsByTags"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "tags"
         in: "query"
         description: "Tags to filter by"
-        required: false
+        required: true
         type: "array"
         items:
           type: "string"
-        collectionFormat: "multi"
+        collectionFormat: "csv"
       responses:
         200:
           description: "successful operation"
@@ -154,16 +171,15 @@ paths:
       tags:
       - "pet"
       summary: "Find pet by ID"
-      description: "Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate\
-        \ API error conditions"
+      description: "Returns a single pet"
       operationId: "getPetById"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "petId"
         in: "path"
-        description: "ID of pet that needs to be fetched"
+        description: "ID of pet to return"
         required: true
         type: "integer"
         format: "int64"
@@ -178,9 +194,6 @@ paths:
           description: "Pet not found"
       security:
       - api_key: []
-      - petstore_auth:
-        - "write:pets"
-        - "read:pets"
       x-contentType: "application/json"
       x-accepts: "application/json"
     post:
@@ -192,14 +205,15 @@ paths:
       consumes:
       - "application/x-www-form-urlencoded"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "petId"
         in: "path"
         description: "ID of pet that needs to be updated"
         required: true
-        type: "string"
+        type: "integer"
+        format: "int64"
       - name: "name"
         in: "formData"
         description: "Updated name of the pet"
@@ -226,12 +240,11 @@ paths:
       description: ""
       operationId: "deletePet"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "api_key"
         in: "header"
-        description: ""
         required: false
         type: "string"
       - name: "petId"
@@ -260,7 +273,6 @@ paths:
       - "multipart/form-data"
       produces:
       - "application/json"
-      - "application/xml"
       parameters:
       - name: "petId"
         in: "path"
@@ -279,80 +291,16 @@ paths:
         required: false
         type: "file"
       responses:
-        default:
+        200:
           description: "successful operation"
+          schema:
+            $ref: "#/definitions/ApiResponse"
       security:
       - petstore_auth:
         - "write:pets"
         - "read:pets"
       x-contentType: "multipart/form-data"
       x-accepts: "application/json"
-  /pet/{petId}?testing_byte_array=true:
-    get:
-      tags:
-      - "pet"
-      summary: "Fake endpoint to test byte array return by 'Find pet by ID'"
-      description: "Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate\
-        \ API error conditions"
-      operationId: "getPetByIdWithByteArray"
-      produces:
-      - "application/json"
-      - "application/xml"
-      parameters:
-      - name: "petId"
-        in: "path"
-        description: "ID of pet that needs to be fetched"
-        required: true
-        type: "integer"
-        format: "int64"
-      responses:
-        200:
-          description: "successful operation"
-          schema:
-            type: "string"
-            format: "binary"
-        400:
-          description: "Invalid ID supplied"
-        404:
-          description: "Pet not found"
-      security:
-      - api_key: []
-      - petstore_auth:
-        - "write:pets"
-        - "read:pets"
-      x-contentType: "application/json"
-      x-accepts: "application/json"
-  /pet?testing_byte_array=true:
-    post:
-      tags:
-      - "pet"
-      summary: "Fake endpoint to test byte array in body parameter for adding a new\
-        \ pet to the store"
-      description: ""
-      operationId: "addPetUsingByteArray"
-      consumes:
-      - "application/json"
-      - "application/xml"
-      produces:
-      - "application/json"
-      - "application/xml"
-      parameters:
-      - in: "body"
-        name: "body"
-        description: "Pet object in the form of byte array"
-        required: false
-        schema:
-          type: "string"
-          format: "binary"
-      responses:
-        405:
-          description: "Invalid input"
-      security:
-      - petstore_auth:
-        - "write:pets"
-        - "read:pets"
-      x-contentType: "application/json"
-      x-accepts: "application/json"
   /store/inventory:
     get:
       tags:
@@ -362,7 +310,6 @@ paths:
       operationId: "getInventory"
       produces:
       - "application/json"
-      - "application/xml"
       parameters: []
       responses:
         200:
@@ -384,13 +331,13 @@ paths:
       description: ""
       operationId: "placeOrder"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "order placed for purchasing the pet"
-        required: false
+        required: true
         schema:
           $ref: "#/definitions/Order"
       responses:
@@ -411,14 +358,17 @@ paths:
         \ values will generated exceptions"
       operationId: "getOrderById"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "orderId"
         in: "path"
         description: "ID of pet that needs to be fetched"
         required: true
-        type: "string"
+        type: "integer"
+        maximum: 5.0
+        minimum: 1.0
+        format: "int64"
       responses:
         200:
           description: "successful operation"
@@ -438,14 +388,15 @@ paths:
         \ above 1000 or nonintegers will generate API errors"
       operationId: "deleteOrder"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "orderId"
         in: "path"
         description: "ID of the order that needs to be deleted"
         required: true
         type: "string"
+        minimum: 1.0
       responses:
         400:
           description: "Invalid ID supplied"
@@ -461,13 +412,13 @@ paths:
       description: "This can only be done by the logged in user."
       operationId: "createUser"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "Created user object"
-        required: false
+        required: true
         schema:
           $ref: "#/definitions/User"
       responses:
@@ -483,13 +434,13 @@ paths:
       description: ""
       operationId: "createUsersWithArrayInput"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "List of user object"
-        required: false
+        required: true
         schema:
           type: "array"
           items:
@@ -507,13 +458,13 @@ paths:
       description: ""
       operationId: "createUsersWithListInput"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "List of user object"
-        required: false
+        required: true
         schema:
           type: "array"
           items:
@@ -531,24 +482,33 @@ paths:
       description: ""
       operationId: "loginUser"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "username"
         in: "query"
         description: "The user name for login"
-        required: false
+        required: true
         type: "string"
       - name: "password"
         in: "query"
         description: "The password for login in clear text"
-        required: false
+        required: true
         type: "string"
       responses:
         200:
           description: "successful operation"
           schema:
             type: "string"
+          headers:
+            X-Rate-Limit:
+              type: "integer"
+              format: "int32"
+              description: "calls per hour allowed by the user"
+            X-Expires-After:
+              type: "string"
+              format: "date-time"
+              description: "date in UTC when toekn expires"
         400:
           description: "Invalid username/password supplied"
       x-contentType: "application/json"
@@ -561,8 +521,8 @@ paths:
       description: ""
       operationId: "logoutUser"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters: []
       responses:
         default:
@@ -577,8 +537,8 @@ paths:
       description: ""
       operationId: "getUserByName"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "username"
         in: "path"
@@ -590,16 +550,6 @@ paths:
           description: "successful operation"
           schema:
             $ref: "#/definitions/User"
-          examples:
-            application/json:
-              id: 1
-              username: "johnp"
-              firstName: "John"
-              lastName: "Public"
-              email: "johnp@swagger.io"
-              password: "-secret-"
-              phone: "0123456789"
-              userStatus: 0
         400:
           description: "Invalid username supplied"
         404:
@@ -613,8 +563,8 @@ paths:
       description: "This can only be done by the logged in user."
       operationId: "updateUser"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "username"
         in: "path"
@@ -624,7 +574,7 @@ paths:
       - in: "body"
         name: "body"
         description: "Updated user object"
-        required: false
+        required: true
         schema:
           $ref: "#/definitions/User"
       responses:
@@ -641,8 +591,8 @@ paths:
       description: "This can only be done by the logged in user."
       operationId: "deleteUser"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "username"
         in: "path"
@@ -669,7 +619,45 @@ securityDefinitions:
       write:pets: "modify pets in your account"
       read:pets: "read your pets"
 definitions:
+  Order:
+    type: "object"
+    properties:
+      id:
+        type: "integer"
+        format: "int64"
+      petId:
+        type: "integer"
+        format: "int64"
+      quantity:
+        type: "integer"
+        format: "int32"
+      shipDate:
+        type: "string"
+        format: "date-time"
+      status:
+        type: "string"
+        description: "Order Status"
+        enum:
+        - "placed"
+        - "approved"
+        - "delivered"
+      complete:
+        type: "boolean"
+        default: false
+    xml:
+      name: "Order"
+  Category:
+    type: "object"
+    properties:
+      id:
+        type: "integer"
+        format: "int64"
+      name:
+        type: "string"
+    xml:
+      name: "Category"
   User:
+    type: "object"
     properties:
       id:
         type: "integer"
@@ -692,7 +680,8 @@ definitions:
         description: "User Status"
     xml:
       name: "User"
-  Category:
+  Tag:
+    type: "object"
     properties:
       id:
         type: "integer"
@@ -700,8 +689,9 @@ definitions:
       name:
         type: "string"
     xml:
-      name: "Category"
+      name: "Tag"
   Pet:
+    type: "object"
     required:
     - "name"
     - "photoUrls"
@@ -737,37 +727,16 @@ definitions:
         - "sold"
     xml:
       name: "Pet"
-  Tag:
+  ApiResponse:
+    type: "object"
     properties:
-      id:
-        type: "integer"
-        format: "int64"
-      name:
-        type: "string"
-    xml:
-      name: "Tag"
-  Order:
-    properties:
-      id:
-        type: "integer"
-        format: "int64"
-      petId:
-        type: "integer"
-        format: "int64"
-      quantity:
+      code:
         type: "integer"
         format: "int32"
-      shipDate:
+      type:
         type: "string"
-        format: "date-time"
-      status:
+      message:
         type: "string"
-        description: "Order Status"
-        enum:
-        - "placed"
-        - "approved"
-        - "delivered"
-      complete:
-        type: "boolean"
-    xml:
-      name: "Order"
+externalDocs:
+  description: "Find out more about Swagger"
+  url: "http://swagger.io"
diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/api/StoreApi.java
index 7b26e047746..39ffe2436a8 100644
--- a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/api/StoreApi.java
@@ -14,7 +14,7 @@ public interface StoreApi  {
     @Path("/store/order/{orderId}")
     
     @Produces({ "application/xml", "application/json" })
-    public Response deleteOrder(@PathParam("orderId") Long orderId);
+    public Response deleteOrder(@PathParam("orderId") String orderId);
     @GET
     @Path("/store/inventory")
     
diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/ApiResponse.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/ApiResponse.java
index 68908204335..e6100b2fc6a 100644
--- a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/ApiResponse.java
+++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/ApiResponse.java
@@ -24,7 +24,6 @@ public class ApiResponse  {
 
   private String message = null;
 
-  
   /**
    **/
   
@@ -34,7 +33,6 @@ public class ApiResponse  {
   public void setCode(Integer code) {
     this.code = code;
   }
-  
   /**
    **/
   
@@ -44,7 +42,6 @@ public class ApiResponse  {
   public void setType(String type) {
     this.type = type;
   }
-  
   /**
    **/
   
@@ -54,7 +51,6 @@ public class ApiResponse  {
   public void setMessage(String message) {
     this.message = message;
   }
-  
 
   @Override
   public String toString() {
diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Category.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Category.java
index d34537dc435..f2d34f77367 100644
--- a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Category.java
+++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Category.java
@@ -22,7 +22,6 @@ public class Category  {
 
   private String name = null;
 
-  
   /**
    **/
   
@@ -32,7 +31,6 @@ public class Category  {
   public void setId(Long id) {
     this.id = id;
   }
-  
   /**
    **/
   
@@ -42,7 +40,6 @@ public class Category  {
   public void setName(String name) {
     this.name = name;
   }
-  
 
   @Override
   public String toString() {
diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Order.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Order.java
index 93c120e6c5a..3a9cbf3c130 100644
--- a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Order.java
+++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Order.java
@@ -32,7 +32,7 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name="Order")
 @XmlEnum
 public enum Order {
-    {values=[placed, approved, delivered], enumVars=[{name=PLACED, value=placed}, {name=APPROVED, value=approved}, {name=DELIVERED, value=delivered}]}, 
+    {values&#x3D;[placed, approved, delivered], enumVars&#x3D;[{name&#x3D;PLACED, value&#x3D;placed}, {name&#x3D;APPROVED, value&#x3D;approved}, {name&#x3D;DELIVERED, value&#x3D;delivered}]}, 
     
     public String value() {
         return name();
@@ -47,7 +47,6 @@ public enum Order {
 
   private Boolean complete = false;
 
-  
   /**
    **/
   
@@ -57,7 +56,6 @@ public enum Order {
   public void setId(Long id) {
     this.id = id;
   }
-  
   /**
    **/
   
@@ -67,7 +65,6 @@ public enum Order {
   public void setPetId(Long petId) {
     this.petId = petId;
   }
-  
   /**
    **/
   
@@ -77,7 +74,6 @@ public enum Order {
   public void setQuantity(Integer quantity) {
     this.quantity = quantity;
   }
-  
   /**
    **/
   
@@ -87,7 +83,6 @@ public enum Order {
   public void setShipDate(javax.xml.datatype.XMLGregorianCalendar shipDate) {
     this.shipDate = shipDate;
   }
-  
   /**
    * Order Status
    **/
@@ -98,7 +93,6 @@ public enum Order {
   public void setStatus(StatusEnum status) {
     this.status = status;
   }
-  
   /**
    **/
   
@@ -108,7 +102,6 @@ public enum Order {
   public void setComplete(Boolean complete) {
     this.complete = complete;
   }
-  
 
   @Override
   public String toString() {
diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Pet.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Pet.java
index 979781f19e0..707f90a3af8 100644
--- a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Pet.java
+++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Pet.java
@@ -38,7 +38,7 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name="Pet")
 @XmlEnum
 public enum Pet {
-    {values=[available, pending, sold], enumVars=[{name=AVAILABLE, value=available}, {name=PENDING, value=pending}, {name=SOLD, value=sold}]}, 
+    {values&#x3D;[available, pending, sold], enumVars&#x3D;[{name&#x3D;AVAILABLE, value&#x3D;available}, {name&#x3D;PENDING, value&#x3D;pending}, {name&#x3D;SOLD, value&#x3D;sold}]}, 
     
     public String value() {
         return name();
@@ -51,7 +51,6 @@ public enum Pet {
 
   private StatusEnum status = null;
 
-  
   /**
    **/
   
@@ -61,7 +60,6 @@ public enum Pet {
   public void setId(Long id) {
     this.id = id;
   }
-  
   /**
    **/
   
@@ -71,7 +69,6 @@ public enum Pet {
   public void setCategory(Category category) {
     this.category = category;
   }
-  
   /**
    **/
   
@@ -81,7 +78,6 @@ public enum Pet {
   public void setName(String name) {
     this.name = name;
   }
-  
   /**
    **/
   
@@ -91,7 +87,6 @@ public enum Pet {
   public void setPhotoUrls(List<String> photoUrls) {
     this.photoUrls = photoUrls;
   }
-  
   /**
    **/
   
@@ -101,7 +96,6 @@ public enum Pet {
   public void setTags(List<Tag> tags) {
     this.tags = tags;
   }
-  
   /**
    * pet status in the store
    **/
@@ -112,7 +106,6 @@ public enum Pet {
   public void setStatus(StatusEnum status) {
     this.status = status;
   }
-  
 
   @Override
   public String toString() {
diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Tag.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Tag.java
index b2a2bcaaff9..1912fa6f731 100644
--- a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Tag.java
+++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Tag.java
@@ -22,7 +22,6 @@ public class Tag  {
 
   private String name = null;
 
-  
   /**
    **/
   
@@ -32,7 +31,6 @@ public class Tag  {
   public void setId(Long id) {
     this.id = id;
   }
-  
   /**
    **/
   
@@ -42,7 +40,6 @@ public class Tag  {
   public void setName(String name) {
     this.name = name;
   }
-  
 
   @Override
   public String toString() {
diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/User.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/User.java
index 8683a630e5c..c35af076cf6 100644
--- a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/User.java
+++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/User.java
@@ -34,7 +34,6 @@ public class User  {
 
   private Integer userStatus = null;
 
-  
   /**
    **/
   
@@ -44,7 +43,6 @@ public class User  {
   public void setId(Long id) {
     this.id = id;
   }
-  
   /**
    **/
   
@@ -54,7 +52,6 @@ public class User  {
   public void setUsername(String username) {
     this.username = username;
   }
-  
   /**
    **/
   
@@ -64,7 +61,6 @@ public class User  {
   public void setFirstName(String firstName) {
     this.firstName = firstName;
   }
-  
   /**
    **/
   
@@ -74,7 +70,6 @@ public class User  {
   public void setLastName(String lastName) {
     this.lastName = lastName;
   }
-  
   /**
    **/
   
@@ -84,7 +79,6 @@ public class User  {
   public void setEmail(String email) {
     this.email = email;
   }
-  
   /**
    **/
   
@@ -94,7 +88,6 @@ public class User  {
   public void setPassword(String password) {
     this.password = password;
   }
-  
   /**
    **/
   
@@ -104,7 +97,6 @@ public class User  {
   public void setPhone(String phone) {
     this.phone = phone;
   }
-  
   /**
    * User Status
    **/
@@ -115,7 +107,6 @@ public class User  {
   public void setUserStatus(Integer userStatus) {
     this.userStatus = userStatus;
   }
-  
 
   @Override
   public String toString() {
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/ApiException.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/ApiException.java
index bfeaf6571ad..2a519b09b8b 100644
--- a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/ApiException.java
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/ApiException.java
@@ -1,6 +1,6 @@
 package io.swagger.api;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-15T18:10:39.667+08:00")
 public class ApiException extends Exception{
 	private int code;
 	public ApiException (int code, String msg) {
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/ApiOriginFilter.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/ApiOriginFilter.java
index 419f9ebab09..a7a3a461a1d 100644
--- a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/ApiOriginFilter.java
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/ApiOriginFilter.java
@@ -5,7 +5,7 @@ import java.io.IOException;
 import javax.servlet.*;
 import javax.servlet.http.HttpServletResponse;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-15T18:10:39.667+08:00")
 public class ApiOriginFilter implements javax.servlet.Filter {
 	public void doFilter(ServletRequest request, ServletResponse response,
 			FilterChain chain) throws IOException, ServletException {
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/ApiResponseMessage.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/ApiResponseMessage.java
index 2e00645c336..07f1fd78fe0 100644
--- a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/ApiResponseMessage.java
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/ApiResponseMessage.java
@@ -3,7 +3,7 @@ package io.swagger.api;
 import javax.xml.bind.annotation.XmlTransient;
 
 @javax.xml.bind.annotation.XmlRootElement
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-15T18:10:39.667+08:00")
 public class ApiResponseMessage {
 	public static final int ERROR = 1;
 	public static final int WARNING = 2;
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/NotFoundException.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/NotFoundException.java
index 52d5224b7eb..a8a136f8760 100644
--- a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/NotFoundException.java
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/NotFoundException.java
@@ -1,6 +1,6 @@
 package io.swagger.api;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-15T18:10:39.667+08:00")
 public class NotFoundException extends ApiException {
 	private int code;
 	public NotFoundException (int code, String msg) {
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/PetApi.java
index 10d335c19bd..8beeb2b7a93 100644
--- a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/PetApi.java
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/PetApi.java
@@ -5,7 +5,7 @@ import io.swagger.api.PetApiService;
 import io.swagger.api.factories.PetApiServiceFactory;
 
 import io.swagger.model.Pet;
-import io.swagger.model.InlineResponse200;
+import io.swagger.model.ApiResponse;
 import java.io.File;
 
 import java.util.List;
@@ -22,14 +22,14 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput;
 @Path("/pet")
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-15T18:10:39.667+08:00")
 public class PetApi  {
    private final PetApiService delegate = PetApiServiceFactory.getPetApi();
 
     @POST
     
     @Consumes({ "application/json", "application/xml" })
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response addPet( Pet body,@Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.addPet(body,securityContext);
@@ -37,7 +37,7 @@ public class PetApi  {
     @DELETE
     @Path("/{petId}")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response deletePet( @PathParam("petId") Long petId,@HeaderParam("api_key") String apiKey,@Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.deletePet(petId,apiKey,securityContext);
@@ -45,7 +45,7 @@ public class PetApi  {
     @GET
     @Path("/findByStatus")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response findPetsByStatus( @QueryParam("status") List<String> status,@Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.findPetsByStatus(status,securityContext);
@@ -53,7 +53,7 @@ public class PetApi  {
     @GET
     @Path("/findByTags")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response findPetsByTags( @QueryParam("tags") List<String> tags,@Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.findPetsByTags(tags,securityContext);
@@ -61,31 +61,15 @@ public class PetApi  {
     @GET
     @Path("/{petId}")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response getPetById( @PathParam("petId") Long petId,@Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.getPetById(petId,securityContext);
     }
-    @GET
-    @Path("/{petId}?response=inline_arbitrary_object")
-    
-    @Produces({ "application/json", "application/xml" })
-    public Response getPetByIdInObject( @PathParam("petId") Long petId,@Context SecurityContext securityContext)
-    throws NotFoundException {
-        return delegate.getPetByIdInObject(petId,securityContext);
-    }
-    @GET
-    @Path("/{petId}?testing_byte_array=true")
-    
-    @Produces({ "application/json", "application/xml" })
-    public Response petPetIdtestingByteArraytrueGet( @PathParam("petId") Long petId,@Context SecurityContext securityContext)
-    throws NotFoundException {
-        return delegate.petPetIdtestingByteArraytrueGet(petId,securityContext);
-    }
     @PUT
     
     @Consumes({ "application/json", "application/xml" })
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response updatePet( Pet body,@Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.updatePet(body,securityContext);
@@ -93,15 +77,15 @@ public class PetApi  {
     @POST
     @Path("/{petId}")
     @Consumes({ "application/x-www-form-urlencoded" })
-    @Produces({ "application/json", "application/xml" })
-    public Response updatePetWithForm( @PathParam("petId") String petId,@FormParam("name")  String name,@FormParam("status")  String status,@Context SecurityContext securityContext)
+    @Produces({ "application/xml", "application/json" })
+    public Response updatePetWithForm( @PathParam("petId") Long petId,@FormParam("name")  String name,@FormParam("status")  String status,@Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.updatePetWithForm(petId,name,status,securityContext);
     }
     @POST
     @Path("/{petId}/uploadImage")
     @Consumes({ "multipart/form-data" })
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/json" })
     public Response uploadFile(MultipartFormDataInput input, @PathParam("petId") Long petId,@Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.uploadFile(input,petId,securityContext);
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/PetApiService.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/PetApiService.java
index 47ed65af8ab..4d65977483c 100644
--- a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/PetApiService.java
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/PetApiService.java
@@ -6,7 +6,7 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput;
 
 
 import io.swagger.model.Pet;
-import io.swagger.model.InlineResponse200;
+import io.swagger.model.ApiResponse;
 import java.io.File;
 
 import java.util.List;
@@ -17,37 +17,22 @@ import java.io.InputStream;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-15T18:10:39.667+08:00")
 public abstract class PetApiService {
-  
       public abstract Response addPet(Pet body,SecurityContext securityContext)
       throws NotFoundException;
-  
       public abstract Response deletePet(Long petId,String apiKey,SecurityContext securityContext)
       throws NotFoundException;
-  
       public abstract Response findPetsByStatus(List<String> status,SecurityContext securityContext)
       throws NotFoundException;
-  
       public abstract Response findPetsByTags(List<String> tags,SecurityContext securityContext)
       throws NotFoundException;
-  
       public abstract Response getPetById(Long petId,SecurityContext securityContext)
       throws NotFoundException;
-  
-      public abstract Response getPetByIdInObject(Long petId,SecurityContext securityContext)
-      throws NotFoundException;
-  
-      public abstract Response petPetIdtestingByteArraytrueGet(Long petId,SecurityContext securityContext)
-      throws NotFoundException;
-  
       public abstract Response updatePet(Pet body,SecurityContext securityContext)
       throws NotFoundException;
-  
-      public abstract Response updatePetWithForm(String petId,String name,String status,SecurityContext securityContext)
+      public abstract Response updatePetWithForm(Long petId,String name,String status,SecurityContext securityContext)
       throws NotFoundException;
-  
       public abstract Response uploadFile(MultipartFormDataInput input,Long petId,SecurityContext securityContext)
       throws NotFoundException;
-  
 }
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/StoreApi.java
index 945b73e32f3..e6ab3511835 100644
--- a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/StoreApi.java
@@ -4,8 +4,8 @@ import io.swagger.model.*;
 import io.swagger.api.StoreApiService;
 import io.swagger.api.factories.StoreApiServiceFactory;
 
-import io.swagger.model.Order;
 import java.util.Map;
+import io.swagger.model.Order;
 
 import java.util.List;
 import io.swagger.api.NotFoundException;
@@ -20,54 +20,38 @@ import javax.ws.rs.*;
 @Path("/store")
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-15T18:10:39.667+08:00")
 public class StoreApi  {
    private final StoreApiService delegate = StoreApiServiceFactory.getStoreApi();
 
     @DELETE
     @Path("/order/{orderId}")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response deleteOrder( @PathParam("orderId") String orderId,@Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.deleteOrder(orderId,securityContext);
     }
     @GET
-    @Path("/findByStatus")
-    
-    @Produces({ "application/json", "application/xml" })
-    public Response findOrdersByStatus( @QueryParam("status") String status,@Context SecurityContext securityContext)
-    throws NotFoundException {
-        return delegate.findOrdersByStatus(status,securityContext);
-    }
-    @GET
     @Path("/inventory")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/json" })
     public Response getInventory(@Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.getInventory(securityContext);
     }
     @GET
-    @Path("/inventory?response=arbitrary_object")
-    
-    @Produces({ "application/json", "application/xml" })
-    public Response getInventoryInObject(@Context SecurityContext securityContext)
-    throws NotFoundException {
-        return delegate.getInventoryInObject(securityContext);
-    }
-    @GET
     @Path("/order/{orderId}")
     
-    @Produces({ "application/json", "application/xml" })
-    public Response getOrderById( @PathParam("orderId") String orderId,@Context SecurityContext securityContext)
+    @Produces({ "application/xml", "application/json" })
+    public Response getOrderById( @PathParam("orderId") Long orderId,@Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.getOrderById(orderId,securityContext);
     }
     @POST
     @Path("/order")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response placeOrder( Order body,@Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.placeOrder(body,securityContext);
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/StoreApiService.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/StoreApiService.java
index 61ad4fd923b..c246af6e58e 100644
--- a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/StoreApiService.java
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/StoreApiService.java
@@ -4,8 +4,8 @@ import io.swagger.api.*;
 import io.swagger.model.*;
 
 
-import io.swagger.model.Order;
 import java.util.Map;
+import io.swagger.model.Order;
 
 import java.util.List;
 import io.swagger.api.NotFoundException;
@@ -15,25 +15,14 @@ import java.io.InputStream;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-15T18:10:39.667+08:00")
 public abstract class StoreApiService {
-  
       public abstract Response deleteOrder(String orderId,SecurityContext securityContext)
       throws NotFoundException;
-  
-      public abstract Response findOrdersByStatus(String status,SecurityContext securityContext)
-      throws NotFoundException;
-  
       public abstract Response getInventory(SecurityContext securityContext)
       throws NotFoundException;
-  
-      public abstract Response getInventoryInObject(SecurityContext securityContext)
+      public abstract Response getOrderById(Long orderId,SecurityContext securityContext)
       throws NotFoundException;
-  
-      public abstract Response getOrderById(String orderId,SecurityContext securityContext)
-      throws NotFoundException;
-  
       public abstract Response placeOrder(Order body,SecurityContext securityContext)
       throws NotFoundException;
-  
 }
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/StringUtil.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/StringUtil.java
index 87d9317396e..c358c74b469 100644
--- a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/StringUtil.java
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/StringUtil.java
@@ -1,6 +1,6 @@
 package io.swagger.api;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-15T18:10:39.667+08:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/UserApi.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/UserApi.java
index be7af49cefa..966965db529 100644
--- a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/UserApi.java
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/UserApi.java
@@ -20,14 +20,14 @@ import javax.ws.rs.*;
 @Path("/user")
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-15T18:10:39.667+08:00")
 public class UserApi  {
    private final UserApiService delegate = UserApiServiceFactory.getUserApi();
 
     @POST
     
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response createUser( User body,@Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.createUser(body,securityContext);
@@ -35,7 +35,7 @@ public class UserApi  {
     @POST
     @Path("/createWithArray")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response createUsersWithArrayInput( List<User> body,@Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.createUsersWithArrayInput(body,securityContext);
@@ -43,7 +43,7 @@ public class UserApi  {
     @POST
     @Path("/createWithList")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response createUsersWithListInput( List<User> body,@Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.createUsersWithListInput(body,securityContext);
@@ -51,7 +51,7 @@ public class UserApi  {
     @DELETE
     @Path("/{username}")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response deleteUser( @PathParam("username") String username,@Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.deleteUser(username,securityContext);
@@ -59,7 +59,7 @@ public class UserApi  {
     @GET
     @Path("/{username}")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response getUserByName( @PathParam("username") String username,@Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.getUserByName(username,securityContext);
@@ -67,7 +67,7 @@ public class UserApi  {
     @GET
     @Path("/login")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response loginUser( @QueryParam("username") String username, @QueryParam("password") String password,@Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.loginUser(username,password,securityContext);
@@ -75,7 +75,7 @@ public class UserApi  {
     @GET
     @Path("/logout")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response logoutUser(@Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.logoutUser(securityContext);
@@ -83,7 +83,7 @@ public class UserApi  {
     @PUT
     @Path("/{username}")
     
-    @Produces({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Response updateUser( @PathParam("username") String username, User body,@Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.updateUser(username,body,securityContext);
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/UserApiService.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/UserApiService.java
index d28f14c07c0..a656efd6f72 100644
--- a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/UserApiService.java
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/api/UserApiService.java
@@ -15,31 +15,22 @@ import java.io.InputStream;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-15T18:10:39.667+08:00")
 public abstract class UserApiService {
-  
       public abstract Response createUser(User body,SecurityContext securityContext)
       throws NotFoundException;
-  
       public abstract Response createUsersWithArrayInput(List<User> body,SecurityContext securityContext)
       throws NotFoundException;
-  
       public abstract Response createUsersWithListInput(List<User> body,SecurityContext securityContext)
       throws NotFoundException;
-  
       public abstract Response deleteUser(String username,SecurityContext securityContext)
       throws NotFoundException;
-  
       public abstract Response getUserByName(String username,SecurityContext securityContext)
       throws NotFoundException;
-  
       public abstract Response loginUser(String username,String password,SecurityContext securityContext)
       throws NotFoundException;
-  
       public abstract Response logoutUser(SecurityContext securityContext)
       throws NotFoundException;
-  
       public abstract Response updateUser(String username,User body,SecurityContext securityContext)
       throws NotFoundException;
-  
 }
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/ApiResponse.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/ApiResponse.java
new file mode 100644
index 00000000000..f67a16b28e6
--- /dev/null
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/ApiResponse.java
@@ -0,0 +1,94 @@
+package io.swagger.model;
+
+import java.util.Objects;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-15T18:10:39.667+08:00")
+public class ApiResponse   {
+  
+  private Integer code = null;
+  private String type = null;
+  private String message = null;
+
+  /**
+   **/
+  
+  @JsonProperty("code")
+  public Integer getCode() {
+    return code;
+  }
+  public void setCode(Integer code) {
+    this.code = code;
+  }
+
+  /**
+   **/
+  
+  @JsonProperty("type")
+  public String getType() {
+    return type;
+  }
+  public void setType(String type) {
+    this.type = type;
+  }
+
+  /**
+   **/
+  
+  @JsonProperty("message")
+  public String getMessage() {
+    return message;
+  }
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ApiResponse apiResponse = (ApiResponse) o;
+    return Objects.equals(code, apiResponse.code) &&
+        Objects.equals(type, apiResponse.type) &&
+        Objects.equals(message, apiResponse.message);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(code, type, message);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ApiResponse {\n");
+    
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    type: ").append(toIndentedString(type)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Category.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Category.java
index 3786c816887..c74992a36ba 100644
--- a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Category.java
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Category.java
@@ -8,13 +8,12 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-15T18:10:39.667+08:00")
 public class Category   {
   
   private Long id = null;
   private String name = null;
 
-  
   /**
    **/
   
@@ -26,7 +25,6 @@ public class Category   {
     this.id = id;
   }
 
-  
   /**
    **/
   
@@ -38,7 +36,6 @@ public class Category   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Order.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Order.java
index 1d40f9c3359..7d1093ec0e2 100644
--- a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Order.java
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Order.java
@@ -9,7 +9,7 @@ import java.util.Date;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-15T18:10:39.667+08:00")
 public class Order   {
   
   private Long id = null;
@@ -37,9 +37,8 @@ public class Order   {
   }
 
   private StatusEnum status = null;
-  private Boolean complete = null;
+  private Boolean complete = false;
 
-  
   /**
    **/
   
@@ -51,7 +50,6 @@ public class Order   {
     this.id = id;
   }
 
-  
   /**
    **/
   
@@ -63,7 +61,6 @@ public class Order   {
     this.petId = petId;
   }
 
-  
   /**
    **/
   
@@ -75,7 +72,6 @@ public class Order   {
     this.quantity = quantity;
   }
 
-  
   /**
    **/
   
@@ -87,7 +83,6 @@ public class Order   {
     this.shipDate = shipDate;
   }
 
-  
   /**
    * Order Status
    **/
@@ -100,7 +95,6 @@ public class Order   {
     this.status = status;
   }
 
-  
   /**
    **/
   
@@ -112,7 +106,6 @@ public class Order   {
     this.complete = complete;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Pet.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Pet.java
index 51f31e982ef..c763a801181 100644
--- a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Pet.java
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Pet.java
@@ -11,7 +11,7 @@ import java.util.List;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-15T18:10:39.667+08:00")
 public class Pet   {
   
   private Long id = null;
@@ -41,7 +41,6 @@ public class Pet   {
 
   private StatusEnum status = null;
 
-  
   /**
    **/
   
@@ -53,7 +52,6 @@ public class Pet   {
     this.id = id;
   }
 
-  
   /**
    **/
   
@@ -65,7 +63,6 @@ public class Pet   {
     this.category = category;
   }
 
-  
   /**
    **/
   
@@ -77,7 +74,6 @@ public class Pet   {
     this.name = name;
   }
 
-  
   /**
    **/
   
@@ -89,7 +85,6 @@ public class Pet   {
     this.photoUrls = photoUrls;
   }
 
-  
   /**
    **/
   
@@ -101,7 +96,6 @@ public class Pet   {
     this.tags = tags;
   }
 
-  
   /**
    * pet status in the store
    **/
@@ -114,7 +108,6 @@ public class Pet   {
     this.status = status;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Tag.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Tag.java
index 9f231bfabcd..3046b9ff951 100644
--- a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Tag.java
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/Tag.java
@@ -8,13 +8,12 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-15T18:10:39.667+08:00")
 public class Tag   {
   
   private Long id = null;
   private String name = null;
 
-  
   /**
    **/
   
@@ -26,7 +25,6 @@ public class Tag   {
     this.id = id;
   }
 
-  
   /**
    **/
   
@@ -38,7 +36,6 @@ public class Tag   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
diff --git a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/User.java b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/User.java
index 16b2b78a9f3..924d72b9bcc 100644
--- a/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/User.java
+++ b/samples/server/petstore/jaxrs-resteasy/src/gen/java/io/swagger/model/User.java
@@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
 
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-03-16T14:27:58.108+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaResteasyServerCodegen", date = "2016-04-15T18:10:39.667+08:00")
 public class User   {
   
   private Long id = null;
@@ -20,7 +20,6 @@ public class User   {
   private String phone = null;
   private Integer userStatus = null;
 
-  
   /**
    **/
   
@@ -32,7 +31,6 @@ public class User   {
     this.id = id;
   }
 
-  
   /**
    **/
   
@@ -44,7 +42,6 @@ public class User   {
     this.username = username;
   }
 
-  
   /**
    **/
   
@@ -56,7 +53,6 @@ public class User   {
     this.firstName = firstName;
   }
 
-  
   /**
    **/
   
@@ -68,7 +64,6 @@ public class User   {
     this.lastName = lastName;
   }
 
-  
   /**
    **/
   
@@ -80,7 +75,6 @@ public class User   {
     this.email = email;
   }
 
-  
   /**
    **/
   
@@ -92,7 +86,6 @@ public class User   {
     this.password = password;
   }
 
-  
   /**
    **/
   
@@ -104,7 +97,6 @@ public class User   {
     this.phone = phone;
   }
 
-  
   /**
    * User Status
    **/
@@ -117,7 +109,6 @@ public class User   {
     this.userStatus = userStatus;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
diff --git a/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java
index 1e4b479b32f..c1192247ba3 100644
--- a/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java
@@ -51,14 +51,18 @@ public class PetApiServiceImpl extends PetApiService {
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
 
+    /*
+     * comment out as the method (for testing) does not exit in the original swagger spec
+     * we'll uncomment this code block later if we update the petstore server
     @Override
     public Response getPetByIdInObject(Long petId,SecurityContext securityContext) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
+    */
 
     @Override
-    public Response updatePetWithForm(String petId,String name,String status,SecurityContext securityContext) throws NotFoundException {
+    public Response updatePetWithForm(Long petId,String name,String status,SecurityContext securityContext) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
@@ -75,11 +79,15 @@ public class PetApiServiceImpl extends PetApiService {
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
 
+    /*
+     * comment out as the method (for testing) does not exit in the original swagger spec
+     * we'll uncomment this code block later if we update the petstore server
     @Override
     public Response petPetIdtestingByteArraytrueGet(Long petId,SecurityContext securityContext) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
+    */
 
 }
 
diff --git a/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java
index 0bb503589cb..b19e9003af5 100644
--- a/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-resteasy/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java
@@ -26,11 +26,15 @@ public class StoreApiServiceImpl extends StoreApiService {
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
 
+    /*
+     *      * comment out as the method (for testing) does not exit in the original swagger spec
+     *           * we'll uncomment this code block later if we update the petstore server
     @Override
     public Response getInventoryInObject(SecurityContext securityContext) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
+    */
 
     @Override
     public Response placeOrder(Order body,SecurityContext securityContext) throws NotFoundException {
@@ -39,7 +43,7 @@ public class StoreApiServiceImpl extends StoreApiService {
     }
 
     @Override
-    public Response getOrderById(String orderId,SecurityContext securityContext) throws NotFoundException {
+    public Response getOrderById(Long orderId,SecurityContext securityContext) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
@@ -50,11 +54,15 @@ public class StoreApiServiceImpl extends StoreApiService {
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
 
+    /*
+     *      * comment out as the method (for testing) does not exit in the original swagger spec
+     *           * we'll uncomment this code block later if we update the petstore server
     @Override
     public Response findOrdersByStatus(String status, SecurityContext securityContext) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
+    */
 
 }
 
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApi.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApi.java
index 500451add3a..e439e48d212 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
@@ -62,8 +62,7 @@ public class PetApi  {
         })
     }, tags={ "pet",  })
     @io.swagger.annotations.ApiResponses(value = { 
-        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = void.class),
-        @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = void.class) })
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid pet value", response = void.class) })
     public Response deletePet(
         @ApiParam(value = "Pet id to delete",required=true) @PathParam("petId") Long petId,
         @ApiParam(value = "" )@HeaderParam("api_key") String apiKey,
@@ -94,7 +93,7 @@ public class PetApi  {
     @Path("/findByTags")
     
     @Produces({ "application/xml", "application/json" })
-    @io.swagger.annotations.ApiOperation(value = "Finds Pets by tags", notes = "Muliple tags can be provided with comma separated strings. Use\ntag1, tag2, tag3 for testing.\n", response = Pet.class, responseContainer = "List", authorizations = {
+    @io.swagger.annotations.ApiOperation(value = "Finds Pets by tags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = {
         @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
             @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
             @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets")
@@ -150,7 +149,7 @@ public class PetApi  {
     @Path("/{petId}")
     @Consumes({ "application/x-www-form-urlencoded" })
     @Produces({ "application/xml", "application/json" })
-    @io.swagger.annotations.ApiOperation(value = "Updates a pet in the store with form data", notes = "null", response = void.class, authorizations = {
+    @io.swagger.annotations.ApiOperation(value = "Updates a pet in the store with form data", notes = "", response = void.class, authorizations = {
         @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
             @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
             @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets")
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 2aa3ab0cd34..7a2d8b60585 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
@@ -22,29 +22,20 @@ import javax.ws.rs.core.SecurityContext;
 
 
 public abstract class PetApiService {
-  
       public abstract Response addPet(Pet body,SecurityContext securityContext)
       throws NotFoundException;
-  
       public abstract Response deletePet(Long petId,String apiKey,SecurityContext securityContext)
       throws NotFoundException;
-  
       public abstract Response findPetsByStatus(List<String> status,SecurityContext securityContext)
       throws NotFoundException;
-  
       public abstract Response findPetsByTags(List<String> tags,SecurityContext securityContext)
       throws NotFoundException;
-  
       public abstract Response getPetById(Long petId,SecurityContext securityContext)
       throws NotFoundException;
-  
       public abstract Response updatePet(Pet body,SecurityContext securityContext)
       throws NotFoundException;
-  
       public abstract Response updatePetWithForm(Long petId,String name,String status,SecurityContext securityContext)
       throws NotFoundException;
-  
       public abstract Response uploadFile(Long petId,String additionalMetadata,InputStream inputStream, FormDataContentDisposition fileDetail,SecurityContext securityContext)
       throws NotFoundException;
-  
 }
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApi.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApi.java
index c9d9a17aec7..91c37506181 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
@@ -36,12 +36,12 @@ public class StoreApi  {
     @Path("/order/{orderId}")
     
     @Produces({ "application/xml", "application/json" })
-    @io.swagger.annotations.ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with positive integer value.\\ \\ Negative or non-integer values will generate API errors", response = void.class, tags={ "store",  })
+    @io.swagger.annotations.ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = void.class, tags={ "store",  })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = void.class),
         @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = void.class) })
     public Response deleteOrder(
-        @ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathParam("orderId") Long orderId,
+        @ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathParam("orderId") String orderId,
         @Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.deleteOrder(orderId,securityContext);
@@ -64,7 +64,7 @@ public class StoreApi  {
     @Path("/order/{orderId}")
     
     @Produces({ "application/xml", "application/json" })
-    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value >= 1 and <= 10.\nOther values will generated exceptions\n", response = Order.class, tags={ "store",  })
+    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, tags={ "store",  })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Order.class),
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 643a46d6596..c065b6c780c 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
@@ -21,17 +21,12 @@ import javax.ws.rs.core.SecurityContext;
 
 
 public abstract class StoreApiService {
-  
-      public abstract Response deleteOrder(Long orderId,SecurityContext securityContext)
+      public abstract Response deleteOrder(String orderId,SecurityContext securityContext)
       throws NotFoundException;
-  
       public abstract Response getInventory(SecurityContext securityContext)
       throws NotFoundException;
-  
       public abstract Response getOrderById(Long orderId,SecurityContext securityContext)
       throws NotFoundException;
-  
       public abstract Response placeOrder(Order body,SecurityContext securityContext)
       throws NotFoundException;
-  
 }
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApi.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApi.java
index 43728481866..5c53e751c4f 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
@@ -95,7 +95,7 @@ public class UserApi  {
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = User.class),
         @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = User.class) })
     public Response getUserByName(
-        @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.",required=true) @PathParam("username") String username,
+        @ApiParam(value = "The name that needs to be fetched. Use user1 for testing. ",required=true) @PathParam("username") String username,
         @Context SecurityContext securityContext)
     throws NotFoundException {
         return delegate.getUserByName(username,securityContext);
@@ -119,7 +119,7 @@ public class UserApi  {
     @Path("/logout")
     
     @Produces({ "application/xml", "application/json" })
-    @io.swagger.annotations.ApiOperation(value = "Logs out current logged in user session", notes = "null", response = void.class, tags={ "user",  })
+    @io.swagger.annotations.ApiOperation(value = "Logs out current logged in user session", notes = "", response = void.class, tags={ "user",  })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = void.class) })
     public Response logoutUser(
@@ -136,7 +136,7 @@ public class UserApi  {
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid user supplied", response = void.class),
         @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = void.class) })
     public Response updateUser(
-        @ApiParam(value = "name that need to be updated",required=true) @PathParam("username") String username,
+        @ApiParam(value = "name that need to be deleted",required=true) @PathParam("username") String username,
         @ApiParam(value = "Updated user object" ,required=true) User body,
         @Context SecurityContext securityContext)
     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 334bfa1164b..f2f03f7c327 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
@@ -21,29 +21,20 @@ import javax.ws.rs.core.SecurityContext;
 
 
 public abstract class UserApiService {
-  
       public abstract Response createUser(User body,SecurityContext securityContext)
       throws NotFoundException;
-  
       public abstract Response createUsersWithArrayInput(List<User> body,SecurityContext securityContext)
       throws NotFoundException;
-  
       public abstract Response createUsersWithListInput(List<User> body,SecurityContext securityContext)
       throws NotFoundException;
-  
       public abstract Response deleteUser(String username,SecurityContext securityContext)
       throws NotFoundException;
-  
       public abstract Response getUserByName(String username,SecurityContext securityContext)
       throws NotFoundException;
-  
       public abstract Response loginUser(String username,String password,SecurityContext securityContext)
       throws NotFoundException;
-  
       public abstract Response logoutUser(SecurityContext securityContext)
       throws NotFoundException;
-  
       public abstract Response updateUser(String username,User body,SecurityContext securityContext)
       throws NotFoundException;
-  
 }
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/ApiResponse.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/ApiResponse.java
index dd6bcbf2cb1..ac9fb970f82 100644
--- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/ApiResponse.java
+++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/ApiResponse.java
@@ -16,7 +16,6 @@ public class ApiResponse   {
   private String type = null;
   private String message = null;
 
-  
   /**
    **/
   public ApiResponse code(Integer code) {
@@ -34,7 +33,6 @@ public class ApiResponse   {
     this.code = code;
   }
 
-  
   /**
    **/
   public ApiResponse type(String type) {
@@ -52,7 +50,6 @@ public class ApiResponse   {
     this.type = type;
   }
 
-  
   /**
    **/
   public ApiResponse message(String message) {
@@ -70,7 +67,6 @@ public class ApiResponse   {
     this.message = message;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
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 fd27ccac1c4..67bc75b3b10 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
@@ -15,7 +15,6 @@ public class Category   {
   private Long id = null;
   private String name = null;
 
-  
   /**
    **/
   public Category id(Long id) {
@@ -33,7 +32,6 @@ public class Category   {
     this.id = id;
   }
 
-  
   /**
    **/
   public Category name(String name) {
@@ -51,7 +49,6 @@ public class Category   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
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 0dd4222776c..825fa282b8b 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
@@ -41,7 +41,6 @@ public class Order   {
   private StatusEnum status = null;
   private Boolean complete = false;
 
-  
   /**
    **/
   public Order id(Long id) {
@@ -59,7 +58,6 @@ public class Order   {
     this.id = id;
   }
 
-  
   /**
    **/
   public Order petId(Long petId) {
@@ -77,7 +75,6 @@ public class Order   {
     this.petId = petId;
   }
 
-  
   /**
    **/
   public Order quantity(Integer quantity) {
@@ -95,7 +92,6 @@ public class Order   {
     this.quantity = quantity;
   }
 
-  
   /**
    **/
   public Order shipDate(Date shipDate) {
@@ -113,7 +109,6 @@ public class Order   {
     this.shipDate = shipDate;
   }
 
-  
   /**
    * Order Status
    **/
@@ -132,7 +127,6 @@ public class Order   {
     this.status = status;
   }
 
-  
   /**
    **/
   public Order complete(Boolean complete) {
@@ -150,7 +144,6 @@ public class Order   {
     this.complete = complete;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
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 514bb24508d..24092cbee25 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
@@ -44,7 +44,6 @@ public class Pet   {
 
   private StatusEnum status = null;
 
-  
   /**
    **/
   public Pet id(Long id) {
@@ -62,7 +61,6 @@ public class Pet   {
     this.id = id;
   }
 
-  
   /**
    **/
   public Pet category(Category category) {
@@ -80,7 +78,6 @@ public class Pet   {
     this.category = category;
   }
 
-  
   /**
    **/
   public Pet name(String name) {
@@ -98,7 +95,6 @@ public class Pet   {
     this.name = name;
   }
 
-  
   /**
    **/
   public Pet photoUrls(List<String> photoUrls) {
@@ -116,7 +112,6 @@ public class Pet   {
     this.photoUrls = photoUrls;
   }
 
-  
   /**
    **/
   public Pet tags(List<Tag> tags) {
@@ -134,7 +129,6 @@ public class Pet   {
     this.tags = tags;
   }
 
-  
   /**
    * pet status in the store
    **/
@@ -153,7 +147,6 @@ public class Pet   {
     this.status = status;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
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 b46638ccb69..f26d84e74b2 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
@@ -15,7 +15,6 @@ public class Tag   {
   private Long id = null;
   private String name = null;
 
-  
   /**
    **/
   public Tag id(Long id) {
@@ -33,7 +32,6 @@ public class Tag   {
     this.id = id;
   }
 
-  
   /**
    **/
   public Tag name(String name) {
@@ -51,7 +49,6 @@ public class Tag   {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
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 7f18c02f599..5dc291a7889 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
@@ -21,7 +21,6 @@ public class User   {
   private String phone = null;
   private Integer userStatus = null;
 
-  
   /**
    **/
   public User id(Long id) {
@@ -39,7 +38,6 @@ public class User   {
     this.id = id;
   }
 
-  
   /**
    **/
   public User username(String username) {
@@ -57,7 +55,6 @@ public class User   {
     this.username = username;
   }
 
-  
   /**
    **/
   public User firstName(String firstName) {
@@ -75,7 +72,6 @@ public class User   {
     this.firstName = firstName;
   }
 
-  
   /**
    **/
   public User lastName(String lastName) {
@@ -93,7 +89,6 @@ public class User   {
     this.lastName = lastName;
   }
 
-  
   /**
    **/
   public User email(String email) {
@@ -111,7 +106,6 @@ public class User   {
     this.email = email;
   }
 
-  
   /**
    **/
   public User password(String password) {
@@ -129,7 +123,6 @@ public class User   {
     this.password = password;
   }
 
-  
   /**
    **/
   public User phone(String phone) {
@@ -147,7 +140,6 @@ public class User   {
     this.phone = phone;
   }
 
-  
   /**
    * User Status
    **/
@@ -166,7 +158,6 @@ public class User   {
     this.userStatus = userStatus;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/Bootstrap.java b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/Bootstrap.java
index 0651af80f18..1f60ed6cf4b 100644
--- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/Bootstrap.java
+++ b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/Bootstrap.java
@@ -15,7 +15,7 @@ public class Bootstrap extends HttpServlet {
   public void init(ServletConfig config) throws ServletException {
     Info info = new Info()
       .title("Swagger Server")
-      .description("This is a sample server Petstore server.  You can find out more about\nSwagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).\nFor this sample, you can use the api key `special-key` to test the authorization filters.\n")
+      .description("This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.")
       .termsOfService("http://swagger.io/terms/")
       .contact(new Contact()
         .email("apiteam@swagger.io"))
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 e54a128b242..d347d2b8f1f 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
@@ -23,7 +23,7 @@ import javax.ws.rs.core.SecurityContext;
 public class StoreApiServiceImpl extends StoreApiService {
     
     @Override
-    public Response deleteOrder(Long orderId, SecurityContext securityContext)
+    public Response deleteOrder(String orderId, SecurityContext securityContext)
     throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
diff --git a/samples/server/petstore/nodejs/api/swagger.yaml b/samples/server/petstore/nodejs/api/swagger.yaml
index 7f6eada7d8c..1aad0a1d4f4 100644
--- a/samples/server/petstore/nodejs/api/swagger.yaml
+++ b/samples/server/petstore/nodejs/api/swagger.yaml
@@ -1,23 +1,37 @@
 ---
 swagger: "2.0"
 info:
-  description: "This is a sample server Petstore server.\n\n[Learn about Swagger](http://swagger.io)\
-    \ or join the IRC channel `#swagger` on irc.freenode.net.\n\nFor this sample,\
-    \ you can use the api key `special-key` to test the authorization filters\n"
+  description: "This is a sample server Petstore server.  You can find out more about\
+    \ Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).\
+    \  For this sample, you can use the api key `special-key` to test the authorization\
+    \ filters."
   version: "1.0.0"
   title: "Swagger Petstore"
   termsOfService: "http://swagger.io/terms/"
   contact:
-    name: "apiteam@swagger.io"
+    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"
+tags:
+- name: "pet"
+  description: "Everything about your Pets"
+  externalDocs:
+    description: "Find out more"
+    url: "http://swagger.io"
+- name: "store"
+  description: "Access to Petstore orders"
+- name: "user"
+  description: "Operations about user"
+  externalDocs:
+    description: "Find out more about our store"
+    url: "http://swagger.io"
 schemes:
 - "http"
 paths:
-  /pets:
+  /pet:
     post:
       tags:
       - "pet"
@@ -28,13 +42,13 @@ paths:
       - "application/json"
       - "application/xml"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "Pet object that needs to be added to the store"
-        required: false
+        required: true
         schema:
           $ref: "#/definitions/Pet"
       responses:
@@ -42,8 +56,8 @@ paths:
           description: "Invalid input"
       security:
       - petstore_auth:
-        - "write_pets"
-        - "read_pets"
+        - "write:pets"
+        - "read:pets"
       x-swagger-router-controller: "Pet"
     put:
       tags:
@@ -55,13 +69,13 @@ paths:
       - "application/json"
       - "application/xml"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "Pet object that needs to be added to the store"
-        required: false
+        required: true
         schema:
           $ref: "#/definitions/Pet"
       responses:
@@ -73,28 +87,33 @@ paths:
           description: "Validation exception"
       security:
       - petstore_auth:
-        - "write_pets"
-        - "read_pets"
+        - "write:pets"
+        - "read:pets"
       x-swagger-router-controller: "Pet"
-  /pets/findByStatus:
+  /pet/findByStatus:
     get:
       tags:
       - "pet"
       summary: "Finds Pets by status"
-      description: "Multiple status values can be provided with comma seperated strings"
+      description: "Multiple status values can be provided with comma separated strings"
       operationId: "findPetsByStatus"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "status"
         in: "query"
         description: "Status values that need to be considered for filter"
-        required: false
+        required: true
         type: "array"
         items:
           type: "string"
-        collectionFormat: "multi"
+          default: "available"
+          enum:
+          - "available"
+          - "pending"
+          - "sold"
+        collectionFormat: "csv"
       responses:
         200:
           description: "successful operation"
@@ -106,29 +125,29 @@ paths:
           description: "Invalid status value"
       security:
       - petstore_auth:
-        - "write_pets"
-        - "read_pets"
+        - "write:pets"
+        - "read:pets"
       x-swagger-router-controller: "Pet"
-  /pets/findByTags:
+  /pet/findByTags:
     get:
       tags:
       - "pet"
       summary: "Finds Pets by tags"
-      description: "Muliple tags can be provided with comma seperated strings. Use\
+      description: "Multiple tags can be provided with comma separated strings. Use\
         \ tag1, tag2, tag3 for testing."
       operationId: "findPetsByTags"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "tags"
         in: "query"
         description: "Tags to filter by"
-        required: false
+        required: true
         type: "array"
         items:
           type: "string"
-        collectionFormat: "multi"
+        collectionFormat: "csv"
       responses:
         200:
           description: "successful operation"
@@ -140,24 +159,23 @@ paths:
           description: "Invalid tag value"
       security:
       - petstore_auth:
-        - "write_pets"
-        - "read_pets"
+        - "write:pets"
+        - "read:pets"
       x-swagger-router-controller: "Pet"
-  /pets/{petId}:
+  /pet/{petId}:
     get:
       tags:
       - "pet"
       summary: "Find pet by ID"
-      description: "Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate\
-        \ API error conditions"
+      description: "Returns a single pet"
       operationId: "getPetById"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "petId"
         in: "path"
-        description: "ID of pet that needs to be fetched"
+        description: "ID of pet to return"
         required: true
         type: "integer"
         format: "int64"
@@ -172,9 +190,6 @@ paths:
           description: "Pet not found"
       security:
       - api_key: []
-      - petstore_auth:
-        - "write_pets"
-        - "read_pets"
       x-swagger-router-controller: "Pet"
     post:
       tags:
@@ -185,31 +200,32 @@ paths:
       consumes:
       - "application/x-www-form-urlencoded"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "petId"
         in: "path"
         description: "ID of pet that needs to be updated"
         required: true
-        type: "string"
+        type: "integer"
+        format: "int64"
       - name: "name"
         in: "formData"
         description: "Updated name of the pet"
-        required: true
+        required: false
         type: "string"
       - name: "status"
         in: "formData"
         description: "Updated status of the pet"
-        required: true
+        required: false
         type: "string"
       responses:
         405:
           description: "Invalid input"
       security:
       - petstore_auth:
-        - "write_pets"
-        - "read_pets"
+        - "write:pets"
+        - "read:pets"
       x-swagger-router-controller: "Pet"
     delete:
       tags:
@@ -218,13 +234,12 @@ paths:
       description: ""
       operationId: "deletePet"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "api_key"
         in: "header"
-        description: ""
-        required: true
+        required: false
         type: "string"
       - name: "petId"
         in: "path"
@@ -237,10 +252,69 @@ paths:
           description: "Invalid pet value"
       security:
       - petstore_auth:
-        - "write_pets"
-        - "read_pets"
+        - "write:pets"
+        - "read:pets"
       x-swagger-router-controller: "Pet"
-  /stores/order:
+  /pet/{petId}/uploadImage:
+    post:
+      tags:
+      - "pet"
+      summary: "uploads an image"
+      description: ""
+      operationId: "uploadFile"
+      consumes:
+      - "multipart/form-data"
+      produces:
+      - "application/json"
+      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:
+        200:
+          description: "successful operation"
+          schema:
+            $ref: "#/definitions/ApiResponse"
+      security:
+      - petstore_auth:
+        - "write:pets"
+        - "read:pets"
+      x-swagger-router-controller: "Pet"
+  /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"
+      parameters: []
+      responses:
+        200:
+          description: "successful operation"
+          schema:
+            type: "object"
+            additionalProperties:
+              type: "integer"
+              format: "int32"
+      security:
+      - api_key: []
+      x-swagger-router-controller: "Store"
+  /store/order:
     post:
       tags:
       - "store"
@@ -248,13 +322,13 @@ paths:
       description: ""
       operationId: "placeOrder"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "order placed for purchasing the pet"
-        required: false
+        required: true
         schema:
           $ref: "#/definitions/Order"
       responses:
@@ -265,7 +339,7 @@ paths:
         400:
           description: "Invalid Order"
       x-swagger-router-controller: "Store"
-  /stores/order/{orderId}:
+  /store/order/{orderId}:
     get:
       tags:
       - "store"
@@ -274,14 +348,17 @@ paths:
         \ values will generated exceptions"
       operationId: "getOrderById"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "orderId"
         in: "path"
         description: "ID of pet that needs to be fetched"
         required: true
-        type: "string"
+        type: "integer"
+        maximum: 5
+        minimum: 1
+        format: "int64"
       responses:
         200:
           description: "successful operation"
@@ -300,21 +377,22 @@ paths:
         \ above 1000 or nonintegers will generate API errors"
       operationId: "deleteOrder"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "orderId"
         in: "path"
         description: "ID of the order that needs to be deleted"
         required: true
         type: "string"
+        minimum: 1
       responses:
         400:
           description: "Invalid ID supplied"
         404:
           description: "Order not found"
       x-swagger-router-controller: "Store"
-  /users:
+  /user:
     post:
       tags:
       - "user"
@@ -322,20 +400,20 @@ paths:
       description: "This can only be done by the logged in user."
       operationId: "createUser"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "Created user object"
-        required: false
+        required: true
         schema:
           $ref: "#/definitions/User"
       responses:
         default:
           description: "successful operation"
       x-swagger-router-controller: "User"
-  /users/createWithArray:
+  /user/createWithArray:
     post:
       tags:
       - "user"
@@ -343,13 +421,13 @@ paths:
       description: ""
       operationId: "createUsersWithArrayInput"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "List of user object"
-        required: false
+        required: true
         schema:
           type: "array"
           items:
@@ -358,7 +436,7 @@ paths:
         default:
           description: "successful operation"
       x-swagger-router-controller: "User"
-  /users/createWithList:
+  /user/createWithList:
     post:
       tags:
       - "user"
@@ -366,13 +444,13 @@ paths:
       description: ""
       operationId: "createUsersWithListInput"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "List of user object"
-        required: false
+        required: true
         schema:
           type: "array"
           items:
@@ -381,7 +459,7 @@ paths:
         default:
           description: "successful operation"
       x-swagger-router-controller: "User"
-  /users/login:
+  /user/login:
     get:
       tags:
       - "user"
@@ -389,28 +467,37 @@ paths:
       description: ""
       operationId: "loginUser"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "username"
         in: "query"
         description: "The user name for login"
-        required: false
+        required: true
         type: "string"
       - name: "password"
         in: "query"
         description: "The password for login in clear text"
-        required: false
+        required: true
         type: "string"
       responses:
         200:
           description: "successful operation"
           schema:
             type: "string"
+          headers:
+            X-Rate-Limit:
+              type: "integer"
+              format: "int32"
+              description: "calls per hour allowed by the user"
+            X-Expires-After:
+              type: "string"
+              format: "date-time"
+              description: "date in UTC when toekn expires"
         400:
           description: "Invalid username/password supplied"
       x-swagger-router-controller: "User"
-  /users/logout:
+  /user/logout:
     get:
       tags:
       - "user"
@@ -418,14 +505,14 @@ paths:
       description: ""
       operationId: "logoutUser"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters: []
       responses:
         default:
           description: "successful operation"
       x-swagger-router-controller: "User"
-  /users/{username}:
+  /user/{username}:
     get:
       tags:
       - "user"
@@ -433,12 +520,12 @@ paths:
       description: ""
       operationId: "getUserByName"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "username"
         in: "path"
-        description: "The name that needs to be fetched. Use user1 for testing."
+        description: "The name that needs to be fetched. Use user1 for testing. "
         required: true
         type: "string"
       responses:
@@ -458,8 +545,8 @@ paths:
       description: "This can only be done by the logged in user."
       operationId: "updateUser"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "username"
         in: "path"
@@ -469,7 +556,7 @@ paths:
       - in: "body"
         name: "body"
         description: "Updated user object"
-        required: false
+        required: true
         schema:
           $ref: "#/definitions/User"
       responses:
@@ -485,8 +572,8 @@ paths:
       description: "This can only be done by the logged in user."
       operationId: "deleteUser"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "username"
         in: "path"
@@ -509,9 +596,46 @@ securityDefinitions:
     authorizationUrl: "http://petstore.swagger.io/api/oauth/dialog"
     flow: "implicit"
     scopes:
-      write_pets: "modify pets in your account"
-      read_pets: "read your pets"
+      write:pets: "modify pets in your account"
+      read:pets: "read your pets"
 definitions:
+  Order:
+    type: "object"
+    properties:
+      id:
+        type: "integer"
+        format: "int64"
+      petId:
+        type: "integer"
+        format: "int64"
+      quantity:
+        type: "integer"
+        format: "int32"
+      shipDate:
+        type: "string"
+        format: "date-time"
+      status:
+        type: "string"
+        description: "Order Status"
+        enum:
+        - "placed"
+        - "approved"
+        - "delivered"
+      complete:
+        type: "boolean"
+        default: false
+    xml:
+      name: "Order"
+  Category:
+    type: "object"
+    properties:
+      id:
+        type: "integer"
+        format: "int64"
+      name:
+        type: "string"
+    xml:
+      name: "Category"
   User:
     type: "object"
     properties:
@@ -534,7 +658,9 @@ definitions:
         type: "integer"
         format: "int32"
         description: "User Status"
-  Category:
+    xml:
+      name: "User"
+  Tag:
     type: "object"
     properties:
       id:
@@ -542,6 +668,8 @@ definitions:
         format: "int64"
       name:
         type: "string"
+    xml:
+      name: "Tag"
   Pet:
     type: "object"
     required:
@@ -558,40 +686,37 @@ definitions:
         example: "doggie"
       photoUrls:
         type: "array"
+        xml:
+          name: "photoUrl"
+          wrapped: true
         items:
           type: "string"
       tags:
         type: "array"
+        xml:
+          name: "tag"
+          wrapped: true
         items:
           $ref: "#/definitions/Tag"
       status:
         type: "string"
         description: "pet status in the store"
-  Tag:
+        enum:
+        - "available"
+        - "pending"
+        - "sold"
+    xml:
+      name: "Pet"
+  ApiResponse:
     type: "object"
     properties:
-      id:
-        type: "integer"
-        format: "int64"
-      name:
-        type: "string"
-  Order:
-    type: "object"
-    properties:
-      id:
-        type: "integer"
-        format: "int64"
-      petId:
-        type: "integer"
-        format: "int64"
-      quantity:
+      code:
         type: "integer"
         format: "int32"
-      shipDate:
+      type:
         type: "string"
-        format: "date-time"
-      status:
+      message:
         type: "string"
-        description: "Order Status"
-      complete:
-        type: "boolean"
+externalDocs:
+  description: "Find out more about Swagger"
+  url: "http://swagger.io"
diff --git a/samples/server/petstore/nodejs/controllers/Pet.js b/samples/server/petstore/nodejs/controllers/Pet.js
index a7d196faa7c..3748305bfbe 100644
--- a/samples/server/petstore/nodejs/controllers/Pet.js
+++ b/samples/server/petstore/nodejs/controllers/Pet.js
@@ -33,3 +33,7 @@ module.exports.updatePet = function updatePet (req, res, next) {
 module.exports.updatePetWithForm = function updatePetWithForm (req, res, next) {
   Pet.updatePetWithForm(req.swagger.params, res, next);
 };
+
+module.exports.uploadFile = function uploadFile (req, res, next) {
+  Pet.uploadFile(req.swagger.params, res, next);
+};
diff --git a/samples/server/petstore/nodejs/controllers/PetService.js b/samples/server/petstore/nodejs/controllers/PetService.js
index 29a51e31a2b..95f42f6a038 100644
--- a/samples/server/petstore/nodejs/controllers/PetService.js
+++ b/samples/server/petstore/nodejs/controllers/PetService.js
@@ -12,8 +12,8 @@ exports.addPet = function(args, res, next) {
 exports.deletePet = function(args, res, next) {
   /**
    * parameters expected in the args:
-  * apiKey (String)
   * petId (Long)
+  * apiKey (String)
   **/
   // no response value expected for this operation
   res.end();
@@ -121,7 +121,7 @@ exports.updatePet = function(args, res, next) {
 exports.updatePetWithForm = function(args, res, next) {
   /**
    * parameters expected in the args:
-  * petId (String)
+  * petId (Long)
   * name (String)
   * status (String)
   **/
@@ -129,3 +129,26 @@ exports.updatePetWithForm = function(args, res, next) {
   res.end();
 }
 
+exports.uploadFile = function(args, res, next) {
+  /**
+   * parameters expected in the args:
+  * petId (Long)
+  * additionalMetadata (String)
+  * file (file)
+  **/
+    var examples = {};
+  examples['application/json'] = {
+  "message" : "aeiou",
+  "code" : 123,
+  "type" : "aeiou"
+};
+  if(Object.keys(examples).length > 0) {
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify(examples[Object.keys(examples)[0]] || {}, null, 2));
+  }
+  else {
+    res.end();
+  }
+  
+}
+
diff --git a/samples/server/petstore/nodejs/controllers/Store.js b/samples/server/petstore/nodejs/controllers/Store.js
index 95fcb02711e..ac67c740d29 100644
--- a/samples/server/petstore/nodejs/controllers/Store.js
+++ b/samples/server/petstore/nodejs/controllers/Store.js
@@ -10,6 +10,10 @@ module.exports.deleteOrder = function deleteOrder (req, res, next) {
   Store.deleteOrder(req.swagger.params, res, next);
 };
 
+module.exports.getInventory = function getInventory (req, res, next) {
+  Store.getInventory(req.swagger.params, res, next);
+};
+
 module.exports.getOrderById = function getOrderById (req, res, next) {
   Store.getOrderById(req.swagger.params, res, next);
 };
diff --git a/samples/server/petstore/nodejs/controllers/StoreService.js b/samples/server/petstore/nodejs/controllers/StoreService.js
index 6ee8ff36f94..01759173bd4 100644
--- a/samples/server/petstore/nodejs/controllers/StoreService.js
+++ b/samples/server/petstore/nodejs/controllers/StoreService.js
@@ -9,10 +9,28 @@ exports.deleteOrder = function(args, res, next) {
   res.end();
 }
 
+exports.getInventory = function(args, res, next) {
+  /**
+   * parameters expected in the args:
+  **/
+    var examples = {};
+  examples['application/json'] = {
+  "key" : 123
+};
+  if(Object.keys(examples).length > 0) {
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify(examples[Object.keys(examples)[0]] || {}, null, 2));
+  }
+  else {
+    res.end();
+  }
+  
+}
+
 exports.getOrderById = function(args, res, next) {
   /**
    * parameters expected in the args:
-  * orderId (String)
+  * orderId (Long)
   **/
     var examples = {};
   examples['application/json'] = {
diff --git a/samples/server/petstore/nodejs/package.json b/samples/server/petstore/nodejs/package.json
index 2ebddec5e2e..293316dac0e 100644
--- a/samples/server/petstore/nodejs/package.json
+++ b/samples/server/petstore/nodejs/package.json
@@ -1,7 +1,7 @@
 {
   "name": "swagger-petstore",
   "version": "1.0.0",
-  "description": "This is a sample server Petstore server.\n\n[Learn about Swagger](http://swagger.io) or join the IRC channel `#swagger` on irc.freenode.net.\n\nFor this sample, you can use the api key `special-key` to test the authorization filters\n",
+  "description": "This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.",
   "main": "index.js",
   "keywords": [
     "swagger"
diff --git a/samples/server/petstore/scalatra/README.md b/samples/server/petstore/scalatra/README.md
index 3ffa01fb257..327870827fd 100644
--- a/samples/server/petstore/scalatra/README.md
+++ b/samples/server/petstore/scalatra/README.md
@@ -2,7 +2,7 @@
 
 ## Overview
 This server was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project.  By using the 
-[swagger-spec](https://github.com/swagger-api/swagger-core/wiki) from a remote server, you can easily generate a server stub.  This
+[OpenAPI-Spec](https://github.com/swagger-api/swagger-core/wiki) from a remote server, you can easily generate a server stub.  This
 is an example of building a swagger-enabled scalatra server.
 
 This example uses the [scalatra](http://scalatra.org/) framework.  To see how to make this your own, look here:
diff --git a/samples/server/petstore/scalatra/src/main/scala/ScalatraBootstrap.scala b/samples/server/petstore/scalatra/src/main/scala/ScalatraBootstrap.scala
index 1129a77d3c8..9dceb9fc302 100644
--- a/samples/server/petstore/scalatra/src/main/scala/ScalatraBootstrap.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/ScalatraBootstrap.scala
@@ -1,6 +1,6 @@
 import com.wordnik.client.api._
 import akka.actor.ActorSystem
-import io.swagger.app.{ResourcesApp, SwaggerApp}
+import io.swagger.app.{ ResourcesApp, SwaggerApp }
 import javax.servlet.ServletContext
 import org.scalatra.LifeCycle
 
@@ -10,10 +10,10 @@ class ScalatraBootstrap extends LifeCycle {
   override def init(context: ServletContext) {
     implicit val system = ActorSystem("appActorSystem")
     try {
-      context mount (new UserApi, "/User/*")
       context mount (new PetApi, "/Pet/*")
       context mount (new StoreApi, "/Store/*")
-      
+      context mount (new UserApi, "/User/*")
+
       context mount (new ResourcesApp, "/api-docs/*")
     } catch {
       case e: Throwable => e.printStackTrace()
diff --git a/samples/server/petstore/scalatra/src/main/scala/ServletApp.scala b/samples/server/petstore/scalatra/src/main/scala/ServletApp.scala
index 6631eb98cc1..e5063473ebe 100644
--- a/samples/server/petstore/scalatra/src/main/scala/ServletApp.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/ServletApp.scala
@@ -3,26 +3,26 @@ package io.swagger.app
 import _root_.akka.actor.ActorSystem
 
 import org.scalatra.swagger.{ ApiInfo, SwaggerWithAuth, Swagger }
-import org.scalatra.swagger.{JacksonSwaggerBase, Swagger}
+import org.scalatra.swagger.{ JacksonSwaggerBase, Swagger }
 import org.scalatra.ScalatraServlet
-import org.json4s.{DefaultFormats, Formats}
+import org.json4s.{ DefaultFormats, Formats }
 
 class ResourcesApp(implicit protected val system: ActorSystem, val swagger: SwaggerApp)
-  extends ScalatraServlet with JacksonSwaggerBase {
+    extends ScalatraServlet with JacksonSwaggerBase {
   before() {
     response.headers += ("Access-Control-Allow-Origin" -> "*")
   }
 
   protected def buildFullUrl(path: String) = if (path.startsWith("http")) path else {
-   val port = request.getServerPort
-   val h = request.getServerName
-   val prot = if (port == 443) "https" else "http"
-   val (proto, host) = if (port != 80 && port != 443) ("http", h+":"+port.toString) else (prot, h)
-   "%s://%s%s%s".format(
-     proto,
-     host,
-     request.getContextPath,
-     path)
+    val port = request.getServerPort
+    val h = request.getServerName
+    val prot = if (port == 443) "https" else "http"
+    val (proto, host) = if (port != 80 && port != 443) ("http", h + ":" + port.toString) else (prot, h)
+    "%s://%s%s%s".format(
+      proto,
+      host,
+      request.getContextPath,
+      path)
   }
 }
 
@@ -31,7 +31,7 @@ class SwaggerApp extends Swagger(apiInfo = ApiSwagger.apiInfo, apiVersion = "1.0
 object ApiSwagger {
   val apiInfo = ApiInfo(
     """Swagger Petstore""",
-    """This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters""",
+    """This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.""",
     """""",
     """apiteam@swagger.io""",
     """Apache 2.0""",
diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/PetApi.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/PetApi.scala
index 7e0a438db1e..58984f1783c 100644
--- a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/PetApi.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/PetApi.scala
@@ -1,6 +1,7 @@
 package com.wordnik.client.api
 
 import com.wordnik.client.model.Pet
+import com.wordnik.client.model.ApiResponse
 import java.io.File
 
 import java.io.File
@@ -29,156 +30,16 @@ class PetApi (implicit val swagger: Swagger) extends ScalatraServlet
   }
   
 
-  val updatePetOperation = (apiOperation[Unit]("updatePet")
-      summary "Update an existing pet"
-      parameters(bodyParam[Pet]("body").description("").optional)
-  )
-
-  put("/pet",operation(updatePetOperation)) {
-    
-    
-    
-                
-bodyParam[Pet]("body").description("").optional
-    
-    println("body: " + body)
-  
-  }
-
-  
-
   val addPetOperation = (apiOperation[Unit]("addPet")
       summary "Add a new pet to the store"
-      parameters(bodyParam[Pet]("body").description("").optional)
+      parameters(bodyParam[Pet]("body").description(""))
   )
 
   post("/pet",operation(addPetOperation)) {
     
     
-    
-                
-bodyParam[Pet]("body").description("").optional
-    
+    bodyParam[Pet]("body").description("")
     println("body: " + body)
-  
-  }
-
-  
-
-  val findPetsByStatusOperation = (apiOperation[List[Pet]]("findPetsByStatus")
-      summary "Finds Pets by status"
-      parameters(queryParam[List[String]]("status").description("").optional.defaultValue(available))
-  )
-
-  get("/pet/findByStatus",operation(findPetsByStatusOperation)) {
-    
-    
-    
-        
-      val statusString = params.getAs[String]("status")
-      val status = if("multi".equals("default")) {
-        statusString match {
-          case Some(str) => str.split(",")
-          case None => List()
-        }
-      }
-      else
-        List()
-      
-      
-            
-
-    
-    println("status: " + status)
-  
-  }
-
-  
-
-  val findPetsByTagsOperation = (apiOperation[List[Pet]]("findPetsByTags")
-      summary "Finds Pets by tags"
-      parameters(queryParam[List[String]]("tags").description("").optional)
-  )
-
-  get("/pet/findByTags",operation(findPetsByTagsOperation)) {
-    
-    
-    
-        
-      val tagsString = params.getAs[String]("tags")
-      val tags = if("multi".equals("default")) {
-        tagsString match {
-          case Some(str) => str.split(",")
-          case None => List()
-        }
-      }
-      else
-        List()
-      
-      
-            
-
-    
-    println("tags: " + tags)
-  
-  }
-
-  
-
-  val getPetByIdOperation = (apiOperation[Pet]("getPetById")
-      summary "Find pet by ID"
-      parameters(pathParam[Long]("petId").description(""))
-  )
-
-  get("/pet/{petId}",operation(getPetByIdOperation)) {
-    
-    
-    
-      val petId = params.getOrElse("petId", halt(400))
-                
-
-    
-    println("petId: " + petId)
-  
-  }
-
-  
-
-  val updatePetWithFormOperation = (apiOperation[Unit]("updatePetWithForm")
-      summary "Updates a pet in the store with form data"
-      parameters(pathParam[String]("petId").description(""),
-        formParam[String]("name").description("").optional,
-        formParam[String]("status").description("").optional)
-  )
-
-  post("/pet/{petId}",operation(updatePetWithFormOperation)) {
-    
-    
-    
-      val petId = params.getOrElse("petId", halt(400))
-                
-
-    
-    println("petId: " + petId)
-  
-    
-    
-                
-      val name = params.getAs[String]("name")
-    
-
-    
-    println("name: " + name)
-  
-    
-    
-                
-      val status = params.getAs[String]("status")
-    
-
-    
-    println("status: " + status)
-  
   }
 
   
@@ -192,27 +53,123 @@ bodyParam[Pet]("body").description("").optional
   delete("/pet/{petId}",operation(deletePetOperation)) {
     
     
-    
       val petId = params.getOrElse("petId", halt(400))
-                
-
     
     println("petId: " + petId)
-  
     
     
-            
-      val apiKey = request.getHeader("apiKey")
-        
+          val apiKey = request.getHeader("apiKey")
 
-    
     println("apiKey: " + apiKey)
-  
   }
 
   
 
-  val uploadFileOperation = (apiOperation[Unit]("uploadFile")
+  val findPetsByStatusOperation = (apiOperation[List[Pet]]("findPetsByStatus")
+      summary "Finds Pets by status"
+      parameters(queryParam[List[String]]("status").description(""))
+  )
+
+  get("/pet/findByStatus",operation(findPetsByStatusOperation)) {
+    
+    
+          val statusString = params.getAs[String]("status")
+      val status = if("csv".equals("default")) {
+        statusString match {
+          case Some(str) => str.split(",")
+          case None => List()
+        }
+      }
+      else
+        List()
+      
+
+    println("status: " + status)
+  }
+
+  
+
+  val findPetsByTagsOperation = (apiOperation[List[Pet]]("findPetsByTags")
+      summary "Finds Pets by tags"
+      parameters(queryParam[List[String]]("tags").description(""))
+  )
+
+  get("/pet/findByTags",operation(findPetsByTagsOperation)) {
+    
+    
+          val tagsString = params.getAs[String]("tags")
+      val tags = if("csv".equals("default")) {
+        tagsString match {
+          case Some(str) => str.split(",")
+          case None => List()
+        }
+      }
+      else
+        List()
+      
+
+    println("tags: " + tags)
+  }
+
+  
+
+  val getPetByIdOperation = (apiOperation[Pet]("getPetById")
+      summary "Find pet by ID"
+      parameters(pathParam[Long]("petId").description(""))
+  )
+
+  get("/pet/{petId}",operation(getPetByIdOperation)) {
+    
+    
+      val petId = params.getOrElse("petId", halt(400))
+    
+    println("petId: " + petId)
+  }
+
+  
+
+  val updatePetOperation = (apiOperation[Unit]("updatePet")
+      summary "Update an existing pet"
+      parameters(bodyParam[Pet]("body").description(""))
+  )
+
+  put("/pet",operation(updatePetOperation)) {
+    
+    
+    bodyParam[Pet]("body").description("")
+    println("body: " + body)
+  }
+
+  
+
+  val updatePetWithFormOperation = (apiOperation[Unit]("updatePetWithForm")
+      summary "Updates a pet in the store with form data"
+      parameters(pathParam[Long]("petId").description(""),
+        formParam[String]("name").description("").optional,
+        formParam[String]("status").description("").optional)
+  )
+
+  post("/pet/{petId}",operation(updatePetWithFormOperation)) {
+    
+    
+      val petId = params.getOrElse("petId", halt(400))
+    
+    println("petId: " + petId)
+    
+    
+          val name = params.getAs[String]("name")
+
+    println("name: " + name)
+    
+    
+          val status = params.getAs[String]("status")
+
+    println("status: " + status)
+  }
+
+  
+
+  val uploadFileOperation = (apiOperation[ApiResponse]("uploadFile")
       summary "uploads an image"
       parameters(pathParam[Long]("petId").description(""),
         formParam[String]("additionalMetadata").description("").optional,
@@ -222,26 +179,16 @@ bodyParam[Pet]("body").description("").optional
   post("/pet/{petId}/uploadImage",operation(uploadFileOperation)) {
     
     
-    
       val petId = params.getOrElse("petId", halt(400))
-                
-
     
     println("petId: " + petId)
-  
     
     
-                
-      val additionalMetadata = params.getAs[String]("additionalMetadata")
-    
+          val additionalMetadata = params.getAs[String]("additionalMetadata")
 
-    
     println("additionalMetadata: " + additionalMetadata)
-  
     val file = fileParams("file")
-    
-    println("file: " + file)
-  
+        println("file: " + file)
   }
 
 }
\ No newline at end of file
diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/StoreApi.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/StoreApi.scala
index 27fbc08e2c2..934eb329fca 100644
--- a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/StoreApi.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/StoreApi.scala
@@ -9,11 +9,11 @@ import org.scalatra.swagger._
 import org.json4s._
 import org.json4s.JsonDSL._
 import org.scalatra.json.{ JValueResult, JacksonJsonSupport }
-import org.scalatra.servlet.{FileUploadSupport, MultipartConfig, SizeConstraintExceededException}
+import org.scalatra.servlet.{ FileUploadSupport, MultipartConfig, SizeConstraintExceededException }
 
 import scala.collection.JavaConverters._
 
-class StoreApi (implicit val swagger: Swagger) extends ScalatraServlet 
+class StoreApi(implicit val swagger: Swagger) extends ScalatraServlet
     with FileUploadSupport
     with JacksonJsonSupport
     with SwaggerSupport {
@@ -26,71 +26,48 @@ class StoreApi (implicit val swagger: Swagger) extends ScalatraServlet
     contentType = formats("json")
     response.headers += ("Access-Control-Allow-Origin" -> "*")
   }
-  
-
-  val getInventoryOperation = (apiOperation[Map[String, Int]]("getInventory")
-      summary "Returns pet inventories by status"
-      parameters()
-  )
-
-  get("/store/inventory",operation(getInventoryOperation)) {
-    
-  }
-
-  
-
-  val placeOrderOperation = (apiOperation[Order]("placeOrder")
-      summary "Place an order for a pet"
-      parameters(bodyParam[Order]("body").description("").optional)
-  )
-
-  post("/store/order",operation(placeOrderOperation)) {
-    
-    
-    
-                
-bodyParam[Order]("body").description("").optional
-    
-    println("body: " + body)
-  
-  }
-
-  
-
-  val getOrderByIdOperation = (apiOperation[Order]("getOrderById")
-      summary "Find purchase order by ID"
-      parameters(pathParam[String]("orderId").description(""))
-  )
-
-  get("/store/order/{orderId}",operation(getOrderByIdOperation)) {
-    
-    
-    
-      val orderId = params.getOrElse("orderId", halt(400))
-                
-
-    
-    println("orderId: " + orderId)
-  
-  }
-
-  
 
   val deleteOrderOperation = (apiOperation[Unit]("deleteOrder")
-      summary "Delete purchase order by ID"
-      parameters(pathParam[String]("orderId").description(""))
+    summary "Delete purchase order by ID"
+    parameters (pathParam[String]("orderId").description(""))
   )
 
-  delete("/store/order/{orderId}",operation(deleteOrderOperation)) {
-    
-    
-    
-      val orderId = params.getOrElse("orderId", halt(400))
-                
+  delete("/store/order/{orderId}", operation(deleteOrderOperation)) {
+
+    val orderId = params.getOrElse("orderId", halt(400))
 
-    
     println("orderId: " + orderId)
-  
+  }
+
+  val getInventoryOperation = (apiOperation[Map[String, Int]]("getInventory")
+    summary "Returns pet inventories by status"
+    parameters ()
+  )
+
+  get("/store/inventory", operation(getInventoryOperation)) {
+  }
+
+  val getOrderByIdOperation = (apiOperation[Order]("getOrderById")
+    summary "Find purchase order by ID"
+    parameters (pathParam[Long]("orderId").description(""))
+  )
+
+  get("/store/order/{orderId}", operation(getOrderByIdOperation)) {
+
+    val orderId = params.getOrElse("orderId", halt(400))
+
+    println("orderId: " + orderId)
+  }
+
+  val placeOrderOperation = (apiOperation[Order]("placeOrder")
+    summary "Place an order for a pet"
+    parameters (bodyParam[Order]("body").description(""))
+  )
+
+  post("/store/order", operation(placeOrderOperation)) {
+
+    bodyParam[Order]("body").description("")
+    println("body: " + body)
   }
 
 }
\ No newline at end of file
diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/UserApi.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/UserApi.scala
index c63151a8d38..0d5bc6c276b 100644
--- a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/UserApi.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/UserApi.scala
@@ -9,11 +9,11 @@ import org.scalatra.swagger._
 import org.json4s._
 import org.json4s.JsonDSL._
 import org.scalatra.json.{ JValueResult, JacksonJsonSupport }
-import org.scalatra.servlet.{FileUploadSupport, MultipartConfig, SizeConstraintExceededException}
+import org.scalatra.servlet.{ FileUploadSupport, MultipartConfig, SizeConstraintExceededException }
 
 import scala.collection.JavaConverters._
 
-class UserApi (implicit val swagger: Swagger) extends ScalatraServlet 
+class UserApi(implicit val swagger: Swagger) extends ScalatraServlet
     with FileUploadSupport
     with JacksonJsonSupport
     with SwaggerSupport {
@@ -26,166 +26,103 @@ class UserApi (implicit val swagger: Swagger) extends ScalatraServlet
     contentType = formats("json")
     response.headers += ("Access-Control-Allow-Origin" -> "*")
   }
-  
 
   val createUserOperation = (apiOperation[Unit]("createUser")
-      summary "Create user"
-      parameters(bodyParam[User]("body").description("").optional)
+    summary "Create user"
+    parameters (bodyParam[User]("body").description(""))
   )
 
-  post("/user",operation(createUserOperation)) {
-    
-    
-    
-                
-bodyParam[User]("body").description("").optional
-    
-    println("body: " + body)
-  
-  }
+  post("/user", operation(createUserOperation)) {
 
-  
+    bodyParam[User]("body").description("")
+    println("body: " + body)
+  }
 
   val createUsersWithArrayInputOperation = (apiOperation[Unit]("createUsersWithArrayInput")
-      summary "Creates list of users with given input array"
-      parameters(bodyParam[List[User]]("body").description("").optional)
+    summary "Creates list of users with given input array"
+    parameters (bodyParam[List[User]]("body").description(""))
   )
 
-  post("/user/createWithArray",operation(createUsersWithArrayInputOperation)) {
-    
-    
-    
-                
-bodyParam[List[User]]("body").description("").optional
-    
-    println("body: " + body)
-  
-  }
+  post("/user/createWithArray", operation(createUsersWithArrayInputOperation)) {
 
-  
+    bodyParam[List[User]]("body").description("")
+    println("body: " + body)
+  }
 
   val createUsersWithListInputOperation = (apiOperation[Unit]("createUsersWithListInput")
-      summary "Creates list of users with given input array"
-      parameters(bodyParam[List[User]]("body").description("").optional)
+    summary "Creates list of users with given input array"
+    parameters (bodyParam[List[User]]("body").description(""))
   )
 
-  post("/user/createWithList",operation(createUsersWithListInputOperation)) {
-    
-    
-    
-                
-bodyParam[List[User]]("body").description("").optional
-    
+  post("/user/createWithList", operation(createUsersWithListInputOperation)) {
+
+    bodyParam[List[User]]("body").description("")
     println("body: " + body)
-  
   }
 
-  
-
-  val loginUserOperation = (apiOperation[String]("loginUser")
-      summary "Logs user into the system"
-      parameters(queryParam[String]("username").description("").optional,
-        queryParam[String]("password").description("").optional)
-  )
-
-  get("/user/login",operation(loginUserOperation)) {
-    
-    
-    
-        
-      
-      val username = params.getAs[String]("username")
-            
-
-    
-    println("username: " + username)
-  
-    
-    
-        
-      
-      val password = params.getAs[String]("password")
-            
-
-    
-    println("password: " + password)
-  
-  }
-
-  
-
-  val logoutUserOperation = (apiOperation[Unit]("logoutUser")
-      summary "Logs out current logged in user session"
-      parameters()
-  )
-
-  get("/user/logout",operation(logoutUserOperation)) {
-    
-  }
-
-  
-
-  val getUserByNameOperation = (apiOperation[User]("getUserByName")
-      summary "Get user by user name"
-      parameters(pathParam[String]("username").description(""))
-  )
-
-  get("/user/{username}",operation(getUserByNameOperation)) {
-    
-    
-    
-      val username = params.getOrElse("username", halt(400))
-                
-
-    
-    println("username: " + username)
-  
-  }
-
-  
-
-  val updateUserOperation = (apiOperation[Unit]("updateUser")
-      summary "Updated user"
-      parameters(pathParam[String]("username").description(""),
-        bodyParam[User]("body").description("").optional)
-  )
-
-  put("/user/{username}",operation(updateUserOperation)) {
-    
-    
-    
-      val username = params.getOrElse("username", halt(400))
-                
-
-    
-    println("username: " + username)
-  
-    
-    
-                
-bodyParam[User]("body").description("").optional
-    
-    println("body: " + body)
-  
-  }
-
-  
-
   val deleteUserOperation = (apiOperation[Unit]("deleteUser")
-      summary "Delete user"
-      parameters(pathParam[String]("username").description(""))
+    summary "Delete user"
+    parameters (pathParam[String]("username").description(""))
   )
 
-  delete("/user/{username}",operation(deleteUserOperation)) {
-    
-    
-    
-      val username = params.getOrElse("username", halt(400))
-                
+  delete("/user/{username}", operation(deleteUserOperation)) {
+
+    val username = params.getOrElse("username", halt(400))
 
-    
     println("username: " + username)
-  
+  }
+
+  val getUserByNameOperation = (apiOperation[User]("getUserByName")
+    summary "Get user by user name"
+    parameters (pathParam[String]("username").description(""))
+  )
+
+  get("/user/{username}", operation(getUserByNameOperation)) {
+
+    val username = params.getOrElse("username", halt(400))
+
+    println("username: " + username)
+  }
+
+  val loginUserOperation = (apiOperation[String]("loginUser")
+    summary "Logs user into the system"
+    parameters (queryParam[String]("username").description(""),
+      queryParam[String]("password").description(""))
+  )
+
+  get("/user/login", operation(loginUserOperation)) {
+
+    val username = params.getAs[String]("username")
+
+    println("username: " + username)
+
+    val password = params.getAs[String]("password")
+
+    println("password: " + password)
+  }
+
+  val logoutUserOperation = (apiOperation[Unit]("logoutUser")
+    summary "Logs out current logged in user session"
+    parameters ()
+  )
+
+  get("/user/logout", operation(logoutUserOperation)) {
+  }
+
+  val updateUserOperation = (apiOperation[Unit]("updateUser")
+    summary "Updated user"
+    parameters (pathParam[String]("username").description(""),
+      bodyParam[User]("body").description(""))
+  )
+
+  put("/user/{username}", operation(updateUserOperation)) {
+
+    val username = params.getOrElse("username", halt(400))
+
+    println("username: " + username)
+
+    bodyParam[User]("body").description("")
+    println("body: " + body)
   }
 
 }
\ No newline at end of file
diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/ApiResponse.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/ApiResponse.scala
new file mode 100644
index 00000000000..9020d9e3d50
--- /dev/null
+++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/ApiResponse.scala
@@ -0,0 +1,9 @@
+package com.wordnik.client.model
+
+
+
+case class ApiResponse (
+  code: Option[Int],
+type: Option[String],
+message: Option[String]
+)
diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Category.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Category.scala
index d4ee7a692e6..bb77cbc1771 100644
--- a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Category.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Category.scala
@@ -1,8 +1,5 @@
 package com.wordnik.client.model
 
-
-
-case class Category (
-  id: Long,
-  name: String
-)
+case class Category(
+  id: Option[Long],
+  name: Option[String])
diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Order.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Order.scala
index 918cf132d2c..763803bc4b9 100644
--- a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Order.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Order.scala
@@ -2,12 +2,10 @@ package com.wordnik.client.model
 
 import java.util.Date
 
-
-case class Order (
-  id: Long,
-  petId: Long,
-  quantity: Int,
-  shipDate: Date,
-  status: String,
-  complete: Boolean
-)
+case class Order(
+  id: Option[Long],
+  petId: Option[Long],
+  quantity: Option[Int],
+  shipDate: Option[Date],
+  status: Option[String], // Order Status
+  complete: Option[Boolean])
diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Pet.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Pet.scala
index cea17dedae7..0f8fdddfed2 100644
--- a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Pet.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Pet.scala
@@ -3,12 +3,11 @@ package com.wordnik.client.model
 import com.wordnik.client.model.Category
 import com.wordnik.client.model.Tag
 
-
-case class Pet (
-  id: Long,
-  category: Category,
+case class Pet(
+  id: Option[Long],
+  category: Option[Category],
   name: String,
   photoUrls: List[String],
-  tags: List[Tag],
-  status: String
-)
+  tags: Option[List[Tag]],
+  status: Option[String] // pet status in the store
+  )
diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Tag.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Tag.scala
index bd28dd4d44d..0e803adca38 100644
--- a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Tag.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Tag.scala
@@ -1,8 +1,5 @@
 package com.wordnik.client.model
 
-
-
-case class Tag (
-  id: Long,
-  name: String
-)
+case class Tag(
+  id: Option[Long],
+  name: Option[String])
diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/User.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/User.scala
index acadf78f7a1..77b7ec5d70c 100644
--- a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/User.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/User.scala
@@ -1,14 +1,12 @@
 package com.wordnik.client.model
 
-
-
-case class User (
-  id: Long,
-  username: String,
-  firstName: String,
-  lastName: String,
-  email: String,
-  password: String,
-  phone: String,
-  userStatus: Int
-)
+case class User(
+  id: Option[Long],
+  username: Option[String],
+  firstName: Option[String],
+  lastName: Option[String],
+  email: Option[String],
+  password: Option[String],
+  phone: Option[String],
+  userStatus: Option[Int] // User Status
+  )
diff --git a/samples/server/petstore/silex/SwaggerServer/index.php b/samples/server/petstore/silex/SwaggerServer/index.php
index 450b8e74967..aba755a883a 100644
--- a/samples/server/petstore/silex/SwaggerServer/index.php
+++ b/samples/server/petstore/silex/SwaggerServer/index.php
@@ -7,85 +7,6 @@ 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) {
             
@@ -93,39 +14,6 @@ $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) {
             
@@ -133,7 +21,41 @@ $app->DELETE('/pet/{petId}', function(Application $app, Request $request, $pet_i
             return new Response('How about implementing deletePet as a DELETE 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->PUT('/pet', function(Application $app, Request $request) {
+            
+            
+            return new Response('How about implementing updatePet as a PUT 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->POST('/pet/{petId}/uploadImage', function(Application $app, Request $request, $pet_id) {
             
@@ -141,51 +63,6 @@ $app->POST('/pet/{petId}/uploadImage', function(Application $app, Request $reque
             return new Response('How about implementing uploadFile as a POST method ?');
             });
 
-            
-
-$app->GET('/pet/{petId}?testing_byte_array=true', function(Application $app, Request $request, $pet_id) {
-            
-            
-            return new Response('How about implementing getPetByIdWithByteArray as a GET method ?');
-            });
-
-            
-
-$app->POST('/pet?testing_byte_array=true', function(Application $app, Request $request) {
-            
-            
-            return new Response('How about implementing addPetUsingByteArray as a POST method ?');
-            });
-
-            
-        
-    
-        
-            
-
-$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) {
             
@@ -193,8 +70,82 @@ $app->DELETE('/store/order/{orderId}', function(Application $app, Request $reque
             return new Response('How about implementing deleteOrder as a DELETE method ?');
             });
 
+
+$app->GET('/store/inventory', function(Application $app, Request $request) {
             
-        
-    
+            
+            return new Response('How about implementing getInventory as a GET 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->POST('/store/order', function(Application $app, Request $request) {
+            
+            
+            return new Response('How about implementing placeOrder as a POST method ?');
+            });
+
+
+$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->DELETE('/user/{username}', function(Application $app, Request $request, $username) {
+            
+            
+            return new Response('How about implementing deleteUser as a DELETE method ?');
+            });
+
+
+$app->GET('/user/{username}', function(Application $app, Request $request, $username) {
+            
+            
+            return new Response('How about implementing getUserByName as a GET 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->PUT('/user/{username}', function(Application $app, Request $request, $username) {
+            
+            
+            return new Response('How about implementing updateUser as a PUT method ?');
+            });
+
 
 $app->run();
diff --git a/samples/server/petstore/sinatra/api/pet_api.rb b/samples/server/petstore/sinatra/api/pet_api.rb
index 3ca40f568d3..e2bb229218b 100644
--- a/samples/server/petstore/sinatra/api/pet_api.rb
+++ b/samples/server/petstore/sinatra/api/pet_api.rb
@@ -1,25 +1,20 @@
 require 'json'
 
 
-MyApp.add_route('POST', '/v2/pets', {
+MyApp.add_route('POST', '/v2/pet', {
   "resourcePath" => "/Pet",
   "summary" => "Add a new pet to the store",
   "nickname" => "add_pet", 
   "responseClass" => "void", 
-  "endpoint" => "/pets", 
+  "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
@@ -28,32 +23,26 @@ MyApp.add_route('POST', '/v2/pets', {
 end
 
 
-MyApp.add_route('DELETE', '/v2/pets/{petId}', {
+MyApp.add_route('DELETE', '/v2/pet/{petId}', {
   "resourcePath" => "/Pet",
   "summary" => "Deletes a pet",
   "nickname" => "delete_pet", 
   "responseClass" => "void", 
-  "endpoint" => "/pets/{petId}", 
+  "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
@@ -62,28 +51,23 @@ MyApp.add_route('DELETE', '/v2/pets/{petId}', {
 end
 
 
-MyApp.add_route('GET', '/v2/pets/findByStatus', {
+MyApp.add_route('GET', '/v2/pet/findByStatus', {
   "resourcePath" => "/Pet",
   "summary" => "Finds Pets by status",
   "nickname" => "find_pets_by_status", 
   "responseClass" => "array[Pet]", 
-  "endpoint" => "/pets/findByStatus", 
-  "notes" => "Multiple status values can be provided with comma seperated strings",
+  "endpoint" => "/pet/findByStatus", 
+  "notes" => "Multiple status values can be provided with comma separated strings",
   "parameters" => [
-    
     {
       "name" => "status",
       "description" => "Status values that need to be considered for filter",
       "dataType" => "array[string]",
       "paramType" => "query",
-      "collectionFormat" => "multi",
+      "collectionFormat" => "csv",
       "allowableValues" => "",
       
     },
-    
-    
-    
-    
     ]}) do
   cross_origin
   # the guts live here
@@ -92,28 +76,23 @@ MyApp.add_route('GET', '/v2/pets/findByStatus', {
 end
 
 
-MyApp.add_route('GET', '/v2/pets/findByTags', {
+MyApp.add_route('GET', '/v2/pet/findByTags', {
   "resourcePath" => "/Pet",
   "summary" => "Finds Pets by tags",
   "nickname" => "find_pets_by_tags", 
   "responseClass" => "array[Pet]", 
-  "endpoint" => "/pets/findByTags", 
-  "notes" => "Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.",
+  "endpoint" => "/pet/findByTags", 
+  "notes" => "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.",
   "parameters" => [
-    
     {
       "name" => "tags",
       "description" => "Tags to filter by",
       "dataType" => "array[string]",
       "paramType" => "query",
-      "collectionFormat" => "multi",
+      "collectionFormat" => "csv",
       "allowableValues" => "",
       
     },
-    
-    
-    
-    
     ]}) do
   cross_origin
   # the guts live here
@@ -122,25 +101,20 @@ MyApp.add_route('GET', '/v2/pets/findByTags', {
 end
 
 
-MyApp.add_route('GET', '/v2/pets/{petId}', {
+MyApp.add_route('GET', '/v2/pet/{petId}', {
   "resourcePath" => "/Pet",
   "summary" => "Find pet by ID",
   "nickname" => "get_pet_by_id", 
   "responseClass" => "Pet", 
-  "endpoint" => "/pets/{petId}", 
-  "notes" => "Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions",
+  "endpoint" => "/pet/{petId}", 
+  "notes" => "Returns a single pet",
   "parameters" => [
-    
-    
     {
       "name" => "pet_id",
-      "description" => "ID of pet that needs to be fetched",
+      "description" => "ID of pet to return",
       "dataType" => "int",
       "paramType" => "path",
     },
-    
-    
-    
     ]}) do
   cross_origin
   # the guts live here
@@ -149,25 +123,20 @@ MyApp.add_route('GET', '/v2/pets/{petId}', {
 end
 
 
-MyApp.add_route('PUT', '/v2/pets', {
+MyApp.add_route('PUT', '/v2/pet', {
   "resourcePath" => "/Pet",
   "summary" => "Update an existing pet",
   "nickname" => "update_pet", 
   "responseClass" => "void", 
-  "endpoint" => "/pets", 
+  "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
@@ -176,25 +145,42 @@ MyApp.add_route('PUT', '/v2/pets', {
 end
 
 
-MyApp.add_route('POST', '/v2/pets/{petId}', {
+MyApp.add_route('POST', '/v2/pet/{petId}', {
   "resourcePath" => "/Pet",
   "summary" => "Updates a pet in the store with form data",
   "nickname" => "update_pet_with_form", 
   "responseClass" => "void", 
-  "endpoint" => "/pets/{petId}", 
+  "endpoint" => "/pet/{petId}", 
   "notes" => "",
   "parameters" => [
-    
-    
     {
       "name" => "pet_id",
       "description" => "ID of pet that needs to be updated",
-      "dataType" => "string",
+      "dataType" => "int",
+      "paramType" => "path",
+    },
+    ]}) do
+  cross_origin
+  # the guts live here
+
+  {"message" => "yes, it worked"}.to_json
+end
+
+
+MyApp.add_route('POST', '/v2/pet/{petId}/uploadImage', {
+  "resourcePath" => "/Pet",
+  "summary" => "uploads an image",
+  "nickname" => "upload_file", 
+  "responseClass" => "ApiResponse", 
+  "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
diff --git a/samples/server/petstore/sinatra/api/store_api.rb b/samples/server/petstore/sinatra/api/store_api.rb
index 26ac567759b..e6fa2551e3a 100644
--- a/samples/server/petstore/sinatra/api/store_api.rb
+++ b/samples/server/petstore/sinatra/api/store_api.rb
@@ -1,25 +1,20 @@
 require 'json'
 
 
-MyApp.add_route('DELETE', '/v2/stores/order/{orderId}', {
+MyApp.add_route('DELETE', '/v2/store/order/{orderId}', {
   "resourcePath" => "/Store",
   "summary" => "Delete purchase order by ID",
   "nickname" => "delete_order", 
   "responseClass" => "void", 
-  "endpoint" => "/stores/order/{orderId}", 
+  "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
@@ -28,25 +23,36 @@ MyApp.add_route('DELETE', '/v2/stores/order/{orderId}', {
 end
 
 
-MyApp.add_route('GET', '/v2/stores/order/{orderId}', {
+MyApp.add_route('GET', '/v2/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('GET', '/v2/store/order/{orderId}', {
   "resourcePath" => "/Store",
   "summary" => "Find purchase order by ID",
   "nickname" => "get_order_by_id", 
   "responseClass" => "Order", 
-  "endpoint" => "/stores/order/{orderId}", 
+  "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",
+      "dataType" => "int",
       "paramType" => "path",
     },
-    
-    
-    
     ]}) do
   cross_origin
   # the guts live here
@@ -55,25 +61,20 @@ MyApp.add_route('GET', '/v2/stores/order/{orderId}', {
 end
 
 
-MyApp.add_route('POST', '/v2/stores/order', {
+MyApp.add_route('POST', '/v2/store/order', {
   "resourcePath" => "/Store",
   "summary" => "Place an order for a pet",
   "nickname" => "place_order", 
   "responseClass" => "Order", 
-  "endpoint" => "/stores/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
diff --git a/samples/server/petstore/sinatra/api/user_api.rb b/samples/server/petstore/sinatra/api/user_api.rb
index aaa76430310..bfec8909586 100644
--- a/samples/server/petstore/sinatra/api/user_api.rb
+++ b/samples/server/petstore/sinatra/api/user_api.rb
@@ -1,25 +1,20 @@
 require 'json'
 
 
-MyApp.add_route('POST', '/v2/users', {
+MyApp.add_route('POST', '/v2/user', {
   "resourcePath" => "/User",
   "summary" => "Create user",
   "nickname" => "create_user", 
   "responseClass" => "void", 
-  "endpoint" => "/users", 
+  "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
@@ -28,25 +23,20 @@ MyApp.add_route('POST', '/v2/users', {
 end
 
 
-MyApp.add_route('POST', '/v2/users/createWithArray', {
+MyApp.add_route('POST', '/v2/user/createWithArray', {
   "resourcePath" => "/User",
   "summary" => "Creates list of users with given input array",
   "nickname" => "create_users_with_array_input", 
   "responseClass" => "void", 
-  "endpoint" => "/users/createWithArray", 
+  "endpoint" => "/user/createWithArray", 
   "notes" => "",
   "parameters" => [
-    
-    
-    
-    
     {
       "name" => "body",
       "description" => "List of user object",
       "dataType" => "array[User]",
       "paramType" => "body",
     }
-    
     ]}) do
   cross_origin
   # the guts live here
@@ -55,25 +45,20 @@ MyApp.add_route('POST', '/v2/users/createWithArray', {
 end
 
 
-MyApp.add_route('POST', '/v2/users/createWithList', {
+MyApp.add_route('POST', '/v2/user/createWithList', {
   "resourcePath" => "/User",
   "summary" => "Creates list of users with given input array",
   "nickname" => "create_users_with_list_input", 
   "responseClass" => "void", 
-  "endpoint" => "/users/createWithList", 
+  "endpoint" => "/user/createWithList", 
   "notes" => "",
   "parameters" => [
-    
-    
-    
-    
     {
       "name" => "body",
       "description" => "List of user object",
       "dataType" => "array[User]",
       "paramType" => "body",
     }
-    
     ]}) do
   cross_origin
   # the guts live here
@@ -82,25 +67,20 @@ MyApp.add_route('POST', '/v2/users/createWithList', {
 end
 
 
-MyApp.add_route('DELETE', '/v2/users/{username}', {
+MyApp.add_route('DELETE', '/v2/user/{username}', {
   "resourcePath" => "/User",
   "summary" => "Delete user",
   "nickname" => "delete_user", 
   "responseClass" => "void", 
-  "endpoint" => "/users/{username}", 
+  "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
@@ -109,25 +89,20 @@ MyApp.add_route('DELETE', '/v2/users/{username}', {
 end
 
 
-MyApp.add_route('GET', '/v2/users/{username}', {
+MyApp.add_route('GET', '/v2/user/{username}', {
   "resourcePath" => "/User",
   "summary" => "Get user by user name",
   "nickname" => "get_user_by_name", 
   "responseClass" => "User", 
-  "endpoint" => "/users/{username}", 
+  "endpoint" => "/user/{username}", 
   "notes" => "",
   "parameters" => [
-    
-    
     {
       "name" => "username",
-      "description" => "The name that needs to be fetched. Use user1 for testing.",
+      "description" => "The name that needs to be fetched. Use user1 for testing. ",
       "dataType" => "string",
       "paramType" => "path",
     },
-    
-    
-    
     ]}) do
   cross_origin
   # the guts live here
@@ -136,15 +111,14 @@ MyApp.add_route('GET', '/v2/users/{username}', {
 end
 
 
-MyApp.add_route('GET', '/v2/users/login', {
+MyApp.add_route('GET', '/v2/user/login', {
   "resourcePath" => "/User",
   "summary" => "Logs user into the system",
   "nickname" => "login_user", 
   "responseClass" => "string", 
-  "endpoint" => "/users/login", 
+  "endpoint" => "/user/login", 
   "notes" => "",
   "parameters" => [
-    
     {
       "name" => "username",
       "description" => "The user name for login",
@@ -154,7 +128,6 @@ MyApp.add_route('GET', '/v2/users/login', {
       "allowableValues" => "",
       
     },
-    
     {
       "name" => "password",
       "description" => "The password for login in clear text",
@@ -164,10 +137,6 @@ MyApp.add_route('GET', '/v2/users/login', {
       "allowableValues" => "",
       
     },
-    
-    
-    
-    
     ]}) do
   cross_origin
   # the guts live here
@@ -176,18 +145,14 @@ MyApp.add_route('GET', '/v2/users/login', {
 end
 
 
-MyApp.add_route('GET', '/v2/users/logout', {
+MyApp.add_route('GET', '/v2/user/logout', {
   "resourcePath" => "/User",
   "summary" => "Logs out current logged in user session",
   "nickname" => "logout_user", 
   "responseClass" => "void", 
-  "endpoint" => "/users/logout", 
+  "endpoint" => "/user/logout", 
   "notes" => "",
   "parameters" => [
-    
-    
-    
-    
     ]}) do
   cross_origin
   # the guts live here
@@ -196,32 +161,26 @@ MyApp.add_route('GET', '/v2/users/logout', {
 end
 
 
-MyApp.add_route('PUT', '/v2/users/{username}', {
+MyApp.add_route('PUT', '/v2/user/{username}', {
   "resourcePath" => "/User",
   "summary" => "Updated user",
   "nickname" => "update_user", 
   "responseClass" => "void", 
-  "endpoint" => "/users/{username}", 
+  "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
diff --git a/samples/server/petstore/sinatra/swagger.yaml b/samples/server/petstore/sinatra/swagger.yaml
index 4aa26a9539c..e6a9add869d 100644
--- a/samples/server/petstore/sinatra/swagger.yaml
+++ b/samples/server/petstore/sinatra/swagger.yaml
@@ -1,23 +1,37 @@
 ---
 swagger: "2.0"
 info:
-  description: "This is a sample server Petstore server.\n\n[Learn about Swagger](http://swagger.io)\
-    \ or join the IRC channel `#swagger` on irc.freenode.net.\n\nFor this sample,\
-    \ you can use the api key `special-key` to test the authorization filters\n"
+  description: "This is a sample server Petstore server.  You can find out more about\
+    \ Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).\
+    \  For this sample, you can use the api key `special-key` to test the authorization\
+    \ filters."
   version: "1.0.0"
   title: "Swagger Petstore"
-  termsOfService: "http://helloreverb.com/terms/"
+  termsOfService: "http://swagger.io/terms/"
   contact:
-    name: "apiteam@swagger.io"
+    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"
+tags:
+- name: "pet"
+  description: "Everything about your Pets"
+  externalDocs:
+    description: "Find out more"
+    url: "http://swagger.io"
+- name: "store"
+  description: "Access to Petstore orders"
+- name: "user"
+  description: "Operations about user"
+  externalDocs:
+    description: "Find out more about our store"
+    url: "http://swagger.io"
 schemes:
 - "http"
 paths:
-  /pets:
+  /pet:
     post:
       tags:
       - "pet"
@@ -28,13 +42,13 @@ paths:
       - "application/json"
       - "application/xml"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "Pet object that needs to be added to the store"
-        required: false
+        required: true
         schema:
           $ref: "#/definitions/Pet"
       responses:
@@ -42,8 +56,8 @@ paths:
           description: "Invalid input"
       security:
       - petstore_auth:
-        - "write_pets"
-        - "read_pets"
+        - "write:pets"
+        - "read:pets"
     put:
       tags:
       - "pet"
@@ -54,13 +68,13 @@ paths:
       - "application/json"
       - "application/xml"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "Pet object that needs to be added to the store"
-        required: false
+        required: true
         schema:
           $ref: "#/definitions/Pet"
       responses:
@@ -72,27 +86,32 @@ paths:
           description: "Validation exception"
       security:
       - petstore_auth:
-        - "write_pets"
-        - "read_pets"
-  /pets/findByStatus:
+        - "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"
+      description: "Multiple status values can be provided with comma separated strings"
       operationId: "findPetsByStatus"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "status"
         in: "query"
         description: "Status values that need to be considered for filter"
-        required: false
+        required: true
         type: "array"
         items:
           type: "string"
-        collectionFormat: "multi"
+          default: "available"
+          enum:
+          - "available"
+          - "pending"
+          - "sold"
+        collectionFormat: "csv"
       responses:
         200:
           description: "successful operation"
@@ -104,28 +123,28 @@ paths:
           description: "Invalid status value"
       security:
       - petstore_auth:
-        - "write_pets"
-        - "read_pets"
-  /pets/findByTags:
+        - "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\
+      description: "Multiple tags can be provided with comma separated strings. Use\
         \ tag1, tag2, tag3 for testing."
       operationId: "findPetsByTags"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "tags"
         in: "query"
         description: "Tags to filter by"
-        required: false
+        required: true
         type: "array"
         items:
           type: "string"
-        collectionFormat: "multi"
+        collectionFormat: "csv"
       responses:
         200:
           description: "successful operation"
@@ -137,23 +156,22 @@ paths:
           description: "Invalid tag value"
       security:
       - petstore_auth:
-        - "write_pets"
-        - "read_pets"
-  /pets/{petId}:
+        - "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"
+      description: "Returns a single pet"
       operationId: "getPetById"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "petId"
         in: "path"
-        description: "ID of pet that needs to be fetched"
+        description: "ID of pet to return"
         required: true
         type: "integer"
         format: "int64"
@@ -168,9 +186,6 @@ paths:
           description: "Pet not found"
       security:
       - api_key: []
-      - petstore_auth:
-        - "write_pets"
-        - "read_pets"
     post:
       tags:
       - "pet"
@@ -180,31 +195,32 @@ paths:
       consumes:
       - "application/x-www-form-urlencoded"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "petId"
         in: "path"
         description: "ID of pet that needs to be updated"
         required: true
-        type: "string"
+        type: "integer"
+        format: "int64"
       - name: "name"
         in: "formData"
         description: "Updated name of the pet"
-        required: true
+        required: false
         type: "string"
       - name: "status"
         in: "formData"
         description: "Updated status of the pet"
-        required: true
+        required: false
         type: "string"
       responses:
         405:
           description: "Invalid input"
       security:
       - petstore_auth:
-        - "write_pets"
-        - "read_pets"
+        - "write:pets"
+        - "read:pets"
     delete:
       tags:
       - "pet"
@@ -212,13 +228,12 @@ paths:
       description: ""
       operationId: "deletePet"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "api_key"
         in: "header"
-        description: ""
-        required: true
+        required: false
         type: "string"
       - name: "petId"
         in: "path"
@@ -231,9 +246,66 @@ paths:
           description: "Invalid pet value"
       security:
       - petstore_auth:
-        - "write_pets"
-        - "read_pets"
-  /stores/order:
+        - "write:pets"
+        - "read:pets"
+  /pet/{petId}/uploadImage:
+    post:
+      tags:
+      - "pet"
+      summary: "uploads an image"
+      description: ""
+      operationId: "uploadFile"
+      consumes:
+      - "multipart/form-data"
+      produces:
+      - "application/json"
+      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:
+        200:
+          description: "successful operation"
+          schema:
+            $ref: "#/definitions/ApiResponse"
+      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"
+      parameters: []
+      responses:
+        200:
+          description: "successful operation"
+          schema:
+            type: "object"
+            additionalProperties:
+              type: "integer"
+              format: "int32"
+      security:
+      - api_key: []
+  /store/order:
     post:
       tags:
       - "store"
@@ -241,13 +313,13 @@ paths:
       description: ""
       operationId: "placeOrder"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "order placed for purchasing the pet"
-        required: false
+        required: true
         schema:
           $ref: "#/definitions/Order"
       responses:
@@ -257,7 +329,7 @@ paths:
             $ref: "#/definitions/Order"
         400:
           description: "Invalid Order"
-  /stores/order/{orderId}:
+  /store/order/{orderId}:
     get:
       tags:
       - "store"
@@ -266,14 +338,17 @@ paths:
         \ values will generated exceptions"
       operationId: "getOrderById"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "orderId"
         in: "path"
         description: "ID of pet that needs to be fetched"
         required: true
-        type: "string"
+        type: "integer"
+        maximum: 5.0
+        minimum: 1.0
+        format: "int64"
       responses:
         200:
           description: "successful operation"
@@ -291,20 +366,21 @@ paths:
         \ above 1000 or nonintegers will generate API errors"
       operationId: "deleteOrder"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "orderId"
         in: "path"
         description: "ID of the order that needs to be deleted"
         required: true
         type: "string"
+        minimum: 1.0
       responses:
         400:
           description: "Invalid ID supplied"
         404:
           description: "Order not found"
-  /users:
+  /user:
     post:
       tags:
       - "user"
@@ -312,19 +388,19 @@ paths:
       description: "This can only be done by the logged in user."
       operationId: "createUser"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "Created user object"
-        required: false
+        required: true
         schema:
           $ref: "#/definitions/User"
       responses:
         default:
           description: "successful operation"
-  /users/createWithArray:
+  /user/createWithArray:
     post:
       tags:
       - "user"
@@ -332,13 +408,13 @@ paths:
       description: ""
       operationId: "createUsersWithArrayInput"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "List of user object"
-        required: false
+        required: true
         schema:
           type: "array"
           items:
@@ -346,7 +422,7 @@ paths:
       responses:
         default:
           description: "successful operation"
-  /users/createWithList:
+  /user/createWithList:
     post:
       tags:
       - "user"
@@ -354,13 +430,13 @@ paths:
       description: ""
       operationId: "createUsersWithListInput"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - in: "body"
         name: "body"
         description: "List of user object"
-        required: false
+        required: true
         schema:
           type: "array"
           items:
@@ -368,7 +444,7 @@ paths:
       responses:
         default:
           description: "successful operation"
-  /users/login:
+  /user/login:
     get:
       tags:
       - "user"
@@ -376,27 +452,36 @@ paths:
       description: ""
       operationId: "loginUser"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "username"
         in: "query"
         description: "The user name for login"
-        required: false
+        required: true
         type: "string"
       - name: "password"
         in: "query"
         description: "The password for login in clear text"
-        required: false
+        required: true
         type: "string"
       responses:
         200:
           description: "successful operation"
           schema:
             type: "string"
+          headers:
+            X-Rate-Limit:
+              type: "integer"
+              format: "int32"
+              description: "calls per hour allowed by the user"
+            X-Expires-After:
+              type: "string"
+              format: "date-time"
+              description: "date in UTC when toekn expires"
         400:
           description: "Invalid username/password supplied"
-  /users/logout:
+  /user/logout:
     get:
       tags:
       - "user"
@@ -404,13 +489,13 @@ paths:
       description: ""
       operationId: "logoutUser"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters: []
       responses:
         default:
           description: "successful operation"
-  /users/{username}:
+  /user/{username}:
     get:
       tags:
       - "user"
@@ -418,12 +503,12 @@ paths:
       description: ""
       operationId: "getUserByName"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "username"
         in: "path"
-        description: "The name that needs to be fetched. Use user1 for testing."
+        description: "The name that needs to be fetched. Use user1 for testing. "
         required: true
         type: "string"
       responses:
@@ -442,8 +527,8 @@ paths:
       description: "This can only be done by the logged in user."
       operationId: "updateUser"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "username"
         in: "path"
@@ -453,7 +538,7 @@ paths:
       - in: "body"
         name: "body"
         description: "Updated user object"
-        required: false
+        required: true
         schema:
           $ref: "#/definitions/User"
       responses:
@@ -468,8 +553,8 @@ paths:
       description: "This can only be done by the logged in user."
       operationId: "deleteUser"
       produces:
-      - "application/json"
       - "application/xml"
+      - "application/json"
       parameters:
       - name: "username"
         in: "path"
@@ -491,9 +576,46 @@ securityDefinitions:
     authorizationUrl: "http://petstore.swagger.io/api/oauth/dialog"
     flow: "implicit"
     scopes:
-      write_pets: "modify pets in your account"
-      read_pets: "read your pets"
+      write:pets: "modify pets in your account"
+      read:pets: "read your pets"
 definitions:
+  Order:
+    type: "object"
+    properties:
+      id:
+        type: "integer"
+        format: "int64"
+      petId:
+        type: "integer"
+        format: "int64"
+      quantity:
+        type: "integer"
+        format: "int32"
+      shipDate:
+        type: "string"
+        format: "date-time"
+      status:
+        type: "string"
+        description: "Order Status"
+        enum:
+        - "placed"
+        - "approved"
+        - "delivered"
+      complete:
+        type: "boolean"
+        default: false
+    xml:
+      name: "Order"
+  Category:
+    type: "object"
+    properties:
+      id:
+        type: "integer"
+        format: "int64"
+      name:
+        type: "string"
+    xml:
+      name: "Category"
   User:
     type: "object"
     properties:
@@ -516,7 +638,9 @@ definitions:
         type: "integer"
         format: "int32"
         description: "User Status"
-  Category:
+    xml:
+      name: "User"
+  Tag:
     type: "object"
     properties:
       id:
@@ -524,6 +648,8 @@ definitions:
         format: "int64"
       name:
         type: "string"
+    xml:
+      name: "Tag"
   Pet:
     type: "object"
     required:
@@ -540,40 +666,37 @@ definitions:
         example: "doggie"
       photoUrls:
         type: "array"
+        xml:
+          name: "photoUrl"
+          wrapped: true
         items:
           type: "string"
       tags:
         type: "array"
+        xml:
+          name: "tag"
+          wrapped: true
         items:
           $ref: "#/definitions/Tag"
       status:
         type: "string"
         description: "pet status in the store"
-  Tag:
+        enum:
+        - "available"
+        - "pending"
+        - "sold"
+    xml:
+      name: "Pet"
+  ApiResponse:
     type: "object"
     properties:
-      id:
-        type: "integer"
-        format: "int64"
-      name:
-        type: "string"
-  Order:
-    type: "object"
-    properties:
-      id:
-        type: "integer"
-        format: "int64"
-      petId:
-        type: "integer"
-        format: "int64"
-      quantity:
+      code:
         type: "integer"
         format: "int32"
-      shipDate:
+      type:
         type: "string"
-        format: "date-time"
-      status:
+      message:
         type: "string"
-        description: "Order Status"
-      complete:
-        type: "boolean"
+externalDocs:
+  description: "Find out more about Swagger"
+  url: "http://swagger.io"
diff --git a/samples/server/petstore/slim/SwaggerServer/index.php b/samples/server/petstore/slim/SwaggerServer/index.php
index 2ee51c0d71f..0138feb1d55 100644
--- a/samples/server/petstore/slim/SwaggerServer/index.php
+++ b/samples/server/petstore/slim/SwaggerServer/index.php
@@ -9,11 +9,205 @@ require_once __DIR__ . '/vendor/autoload.php';
 $app = new Slim\App();
 
 
+/**
+ * POST addPet
+ * Summary: Add a new pet to the store
+ * Notes: 
+ * Output-Formats: [application/xml, application/json]
+ */
+$app->POST('/pet', function($request, $response, $args) {
+            
+            
+            
+            $body = $request->getParsedBody();
+            $response->write('How about implementing addPet as a POST method ?');
+            return $response;
+            });
+
+
+/**
+ * DELETE deletePet
+ * Summary: Deletes a pet
+ * Notes: 
+ * Output-Formats: [application/xml, application/json]
+ */
+$app->DELETE('/pet/{petId}', function($request, $response, $args) {
+            $headers = $request->getHeaders();
+            
+            
+            
+            $response->write('How about implementing deletePet as a DELETE method ?');
+            return $response;
+            });
+
+
+/**
+ * GET findPetsByStatus
+ * Summary: Finds Pets by status
+ * Notes: Multiple status values can be provided with comma separated strings
+ * Output-Formats: [application/xml, application/json]
+ */
+$app->GET('/pet/findByStatus', function($request, $response, $args) {
+            
+            $queryParams = $request->getQueryParams();
+            $status = $queryParams['status'];    
+            
+            
+            $response->write('How about implementing findPetsByStatus as a GET method ?');
+            return $response;
+            });
+
+
+/**
+ * GET findPetsByTags
+ * Summary: Finds Pets by tags
+ * Notes: Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+ * Output-Formats: [application/xml, application/json]
+ */
+$app->GET('/pet/findByTags', function($request, $response, $args) {
+            
+            $queryParams = $request->getQueryParams();
+            $tags = $queryParams['tags'];    
+            
+            
+            $response->write('How about implementing findPetsByTags as a GET method ?');
+            return $response;
+            });
+
+
+/**
+ * GET getPetById
+ * Summary: Find pet by ID
+ * Notes: Returns a single pet
+ * Output-Formats: [application/xml, application/json]
+ */
+$app->GET('/pet/{petId}', function($request, $response, $args) {
+            
+            
+            
+            
+            $response->write('How about implementing getPetById as a GET method ?');
+            return $response;
+            });
+
+
+/**
+ * PUT updatePet
+ * Summary: Update an existing pet
+ * Notes: 
+ * Output-Formats: [application/xml, application/json]
+ */
+$app->PUT('/pet', function($request, $response, $args) {
+            
+            
+            
+            $body = $request->getParsedBody();
+            $response->write('How about implementing updatePet as a PUT method ?');
+            return $response;
+            });
+
+
+/**
+ * POST updatePetWithForm
+ * Summary: Updates a pet in the store with form data
+ * Notes: 
+ * Output-Formats: [application/xml, application/json]
+ */
+$app->POST('/pet/{petId}', function($request, $response, $args) {
+            
+            
+            $name = $args['name'];    $status = $args['status'];    
+            
+            $response->write('How about implementing updatePetWithForm as a POST method ?');
+            return $response;
+            });
+
+
+/**
+ * POST uploadFile
+ * Summary: uploads an image
+ * Notes: 
+ * Output-Formats: [application/json]
+ */
+$app->POST('/pet/{petId}/uploadImage', function($request, $response, $args) {
+            
+            
+            $additionalMetadata = $args['additionalMetadata'];    $file = $args['file'];    
+            
+            $response->write('How about implementing uploadFile as a POST method ?');
+            return $response;
+            });
+
+
+/**
+ * DELETE deleteOrder
+ * Summary: Delete purchase order by ID
+ * Notes: For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+ * Output-Formats: [application/xml, application/json]
+ */
+$app->DELETE('/store/order/{orderId}', function($request, $response, $args) {
+            
+            
+            
+            
+            $response->write('How about implementing deleteOrder as a DELETE method ?');
+            return $response;
+            });
+
+
+/**
+ * GET getInventory
+ * Summary: Returns pet inventories by status
+ * Notes: Returns a map of status codes to quantities
+ * Output-Formats: [application/json]
+ */
+$app->GET('/store/inventory', function($request, $response, $args) {
+            
+            
+            
+            
+            $response->write('How about implementing getInventory as a GET method ?');
+            return $response;
+            });
+
+
+/**
+ * GET getOrderById
+ * Summary: Find purchase order by ID
+ * Notes: For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+ * Output-Formats: [application/xml, application/json]
+ */
+$app->GET('/store/order/{orderId}', function($request, $response, $args) {
+            
+            
+            
+            
+            $response->write('How about implementing getOrderById as a GET method ?');
+            return $response;
+            });
+
+
+/**
+ * POST placeOrder
+ * Summary: Place an order for a pet
+ * Notes: 
+ * Output-Formats: [application/xml, application/json]
+ */
+$app->POST('/store/order', function($request, $response, $args) {
+            
+            
+            
+            $body = $request->getParsedBody();
+            $response->write('How about implementing placeOrder as a POST method ?');
+            return $response;
+            });
+
+
 /**
  * POST createUser
  * Summary: Create user
  * Notes: This can only be done by the logged in user.
- * Output-Formats: [application/json, application/xml]
+ * Output-Formats: [application/xml, application/json]
  */
 $app->POST('/user', function($request, $response, $args) {
             
@@ -29,7 +223,7 @@ $app->POST('/user', function($request, $response, $args) {
  * POST createUsersWithArrayInput
  * Summary: Creates list of users with given input array
  * Notes: 
- * Output-Formats: [application/json, application/xml]
+ * Output-Formats: [application/xml, application/json]
  */
 $app->POST('/user/createWithArray', function($request, $response, $args) {
             
@@ -45,7 +239,7 @@ $app->POST('/user/createWithArray', function($request, $response, $args) {
  * POST createUsersWithListInput
  * Summary: Creates list of users with given input array
  * Notes: 
- * Output-Formats: [application/json, application/xml]
+ * Output-Formats: [application/xml, application/json]
  */
 $app->POST('/user/createWithList', function($request, $response, $args) {
             
@@ -57,11 +251,43 @@ $app->POST('/user/createWithList', function($request, $response, $args) {
             });
 
 
+/**
+ * DELETE deleteUser
+ * Summary: Delete user
+ * Notes: This can only be done by the logged in user.
+ * Output-Formats: [application/xml, application/json]
+ */
+$app->DELETE('/user/{username}', function($request, $response, $args) {
+            
+            
+            
+            
+            $response->write('How about implementing deleteUser as a DELETE method ?');
+            return $response;
+            });
+
+
+/**
+ * GET getUserByName
+ * Summary: Get user by user name
+ * Notes: 
+ * Output-Formats: [application/xml, application/json]
+ */
+$app->GET('/user/{username}', function($request, $response, $args) {
+            
+            
+            
+            
+            $response->write('How about implementing getUserByName as a GET method ?');
+            return $response;
+            });
+
+
 /**
  * GET loginUser
  * Summary: Logs user into the system
  * Notes: 
- * Output-Formats: [application/json, application/xml]
+ * Output-Formats: [application/xml, application/json]
  */
 $app->GET('/user/login', function($request, $response, $args) {
             
@@ -78,7 +304,7 @@ $app->GET('/user/login', function($request, $response, $args) {
  * GET logoutUser
  * Summary: Logs out current logged in user session
  * Notes: 
- * Output-Formats: [application/json, application/xml]
+ * Output-Formats: [application/xml, application/json]
  */
 $app->GET('/user/logout', function($request, $response, $args) {
             
@@ -90,27 +316,11 @@ $app->GET('/user/logout', function($request, $response, $args) {
             });
 
 
-/**
- * GET getUserByName
- * Summary: Get user by user name
- * Notes: 
- * Output-Formats: [application/json, application/xml]
- */
-$app->GET('/user/{username}', function($request, $response, $args) {
-            
-            
-            
-            
-            $response->write('How about implementing getUserByName as a GET method ?');
-            return $response;
-            });
-
-
 /**
  * PUT updateUser
  * Summary: Updated user
  * Notes: This can only be done by the logged in user.
- * Output-Formats: [application/json, application/xml]
+ * Output-Formats: [application/xml, application/json]
  */
 $app->PUT('/user/{username}', function($request, $response, $args) {
             
@@ -122,247 +332,5 @@ $app->PUT('/user/{username}', function($request, $response, $args) {
             });
 
 
-/**
- * DELETE deleteUser
- * Summary: Delete user
- * Notes: This can only be done by the logged in user.
- * Output-Formats: [application/json, application/xml]
- */
-$app->DELETE('/user/{username}', function($request, $response, $args) {
-            
-            
-            
-            
-            $response->write('How about implementing deleteUser as a DELETE method ?');
-            return $response;
-            });
-
-
-/**
- * PUT updatePet
- * Summary: Update an existing pet
- * Notes: 
- * Output-Formats: [application/json, application/xml]
- */
-$app->PUT('/pet', function($request, $response, $args) {
-            
-            
-            
-            $body = $request->getParsedBody();
-            $response->write('How about implementing updatePet as a PUT method ?');
-            return $response;
-            });
-
-
-/**
- * POST addPet
- * Summary: Add a new pet to the store
- * Notes: 
- * Output-Formats: [application/json, application/xml]
- */
-$app->POST('/pet', function($request, $response, $args) {
-            
-            
-            
-            $body = $request->getParsedBody();
-            $response->write('How about implementing addPet as a POST method ?');
-            return $response;
-            });
-
-
-/**
- * GET findPetsByStatus
- * Summary: Finds Pets by status
- * Notes: Multiple status values can be provided with comma seperated strings
- * Output-Formats: [application/json, application/xml]
- */
-$app->GET('/pet/findByStatus', function($request, $response, $args) {
-            
-            $queryParams = $request->getQueryParams();
-            $status = $queryParams['status'];    
-            
-            
-            $response->write('How about implementing findPetsByStatus as a GET method ?');
-            return $response;
-            });
-
-
-/**
- * GET findPetsByTags
- * Summary: Finds Pets by tags
- * Notes: Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
- * Output-Formats: [application/json, application/xml]
- */
-$app->GET('/pet/findByTags', function($request, $response, $args) {
-            
-            $queryParams = $request->getQueryParams();
-            $tags = $queryParams['tags'];    
-            
-            
-            $response->write('How about implementing findPetsByTags as a GET method ?');
-            return $response;
-            });
-
-
-/**
- * GET getPetById
- * Summary: Find pet by ID
- * Notes: Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
- * Output-Formats: [application/json, application/xml]
- */
-$app->GET('/pet/{petId}', function($request, $response, $args) {
-            
-            
-            
-            
-            $response->write('How about implementing getPetById as a GET method ?');
-            return $response;
-            });
-
-
-/**
- * POST updatePetWithForm
- * Summary: Updates a pet in the store with form data
- * Notes: 
- * Output-Formats: [application/json, application/xml]
- */
-$app->POST('/pet/{petId}', function($request, $response, $args) {
-            
-            
-            $name = $args['name'];    $status = $args['status'];    
-            
-            $response->write('How about implementing updatePetWithForm as a POST method ?');
-            return $response;
-            });
-
-
-/**
- * DELETE deletePet
- * Summary: Deletes a pet
- * Notes: 
- * Output-Formats: [application/json, application/xml]
- */
-$app->DELETE('/pet/{petId}', function($request, $response, $args) {
-            $headers = $request->getHeaders();
-            
-            
-            
-            $response->write('How about implementing deletePet as a DELETE method ?');
-            return $response;
-            });
-
-
-/**
- * POST uploadFile
- * Summary: uploads an image
- * Notes: 
- * Output-Formats: [application/json, application/xml]
- */
-$app->POST('/pet/{petId}/uploadImage', function($request, $response, $args) {
-            
-            
-            $additionalMetadata = $args['additionalMetadata'];    $file = $args['file'];    
-            
-            $response->write('How about implementing uploadFile as a POST method ?');
-            return $response;
-            });
-
-
-/**
- * GET getPetByIdWithByteArray
- * Summary: Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
- * Notes: Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
- * Output-Formats: [application/json, application/xml]
- */
-$app->GET('/pet/{petId}?testing_byte_array=true', function($request, $response, $args) {
-            
-            
-            
-            
-            $response->write('How about implementing getPetByIdWithByteArray as a GET method ?');
-            return $response;
-            });
-
-
-/**
- * POST addPetUsingByteArray
- * Summary: Fake endpoint to test byte array in body parameter for adding a new pet to the store
- * Notes: 
- * Output-Formats: [application/json, application/xml]
- */
-$app->POST('/pet?testing_byte_array=true', function($request, $response, $args) {
-            
-            
-            
-            $body = $request->getParsedBody();
-            $response->write('How about implementing addPetUsingByteArray as a POST method ?');
-            return $response;
-            });
-
-
-/**
- * GET getInventory
- * Summary: Returns pet inventories by status
- * Notes: Returns a map of status codes to quantities
- * Output-Formats: [application/json, application/xml]
- */
-$app->GET('/store/inventory', function($request, $response, $args) {
-            
-            
-            
-            
-            $response->write('How about implementing getInventory as a GET method ?');
-            return $response;
-            });
-
-
-/**
- * POST placeOrder
- * Summary: Place an order for a pet
- * Notes: 
- * Output-Formats: [application/json, application/xml]
- */
-$app->POST('/store/order', function($request, $response, $args) {
-            
-            
-            
-            $body = $request->getParsedBody();
-            $response->write('How about implementing placeOrder as a POST method ?');
-            return $response;
-            });
-
-
-/**
- * GET getOrderById
- * Summary: Find purchase order by ID
- * Notes: For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
- * Output-Formats: [application/json, application/xml]
- */
-$app->GET('/store/order/{orderId}', function($request, $response, $args) {
-            
-            
-            
-            
-            $response->write('How about implementing getOrderById as a GET method ?');
-            return $response;
-            });
-
-
-/**
- * DELETE deleteOrder
- * Summary: Delete purchase order by ID
- * Notes: For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
- * Output-Formats: [application/json, application/xml]
- */
-$app->DELETE('/store/order/{orderId}', function($request, $response, $args) {
-            
-            
-            
-            
-            $response->write('How about implementing deleteOrder as a DELETE method ?');
-            return $response;
-            });
-
-
 
 $app->run();
diff --git a/samples/server/petstore/spring-mvc-j8-async/pom.xml b/samples/server/petstore/spring-mvc-j8-async/pom.xml
index cc78851ae30..1c535f34084 100644
--- a/samples/server/petstore/spring-mvc-j8-async/pom.xml
+++ b/samples/server/petstore/spring-mvc-j8-async/pom.xml
@@ -159,7 +159,7 @@
     </repository>
   </repositories>
   <properties>
-    <swagger-core-version>1.5.7</swagger-core-version>
+    <swagger-core-version>1.5.8</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey-version>1.13</jersey-version>
     <slf4j-version>1.6.3</slf4j-version>
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiException.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiException.java
index 5cba2d3db86..20930979750 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiException.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiException.java
@@ -1,6 +1,6 @@
 package io.swagger.api;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:50:52.711+08:00")
 public class ApiException extends Exception{
 	private int code;
 	public ApiException (int code, String msg) {
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiOriginFilter.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiOriginFilter.java
index 81dbc940508..c8a46b8ac99 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiOriginFilter.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiOriginFilter.java
@@ -5,7 +5,7 @@ import java.io.IOException;
 import javax.servlet.*;
 import javax.servlet.http.HttpServletResponse;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:50:52.711+08:00")
 public class ApiOriginFilter implements javax.servlet.Filter {
 	@Override
 	public void doFilter(ServletRequest request, ServletResponse response,
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiResponseMessage.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiResponseMessage.java
index 51d9bb1e2d0..91b3d9d6d36 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiResponseMessage.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiResponseMessage.java
@@ -3,7 +3,7 @@ package io.swagger.api;
 import javax.xml.bind.annotation.XmlTransient;
 
 @javax.xml.bind.annotation.XmlRootElement
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:50:52.711+08:00")
 public class ApiResponseMessage {
 	public static final int ERROR = 1;
 	public static final int WARNING = 2;
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/NotFoundException.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/NotFoundException.java
index 0e298e5c443..40471f4716f 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/NotFoundException.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/NotFoundException.java
@@ -1,6 +1,6 @@
 package io.swagger.api;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:50:52.711+08:00")
 public class NotFoundException extends ApiException {
 	private int code;
 	public NotFoundException (int code, String msg) {
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/PetApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/PetApi.java
index ff793304ac5..df8a67686b6 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/PetApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/PetApi.java
@@ -3,6 +3,7 @@ package io.swagger.api;
 import io.swagger.model.*;
 
 import io.swagger.model.Pet;
+import io.swagger.model.ApiResponse;
 import java.io.File;
 
 import java.util.concurrent.Callable;
@@ -34,9 +35,123 @@ import static org.springframework.http.MediaType.*;
 @Controller
 @RequestMapping(value = "/pet", produces = {APPLICATION_JSON_VALUE})
 @Api(value = "/pet", description = "the pet API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:50:52.711+08:00")
 public interface PetApi {
-  
+
+  @ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class, authorizations = {
+    @Authorization(value = "petstore_auth", scopes = {
+      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+      @AuthorizationScope(scope = "read:pets", description = "read your pets")
+      })
+  })
+  @ApiResponses(value = { 
+    @ApiResponse(code = 405, message = "Invalid input") })
+  @RequestMapping(value = "", 
+    produces = { "application/xml", "application/json" }, 
+    consumes = { "application/json", "application/xml" },
+    method = RequestMethod.POST)
+  default Callable<ResponseEntity<Void>> addPet(
+
+@ApiParam(value = "Pet object that needs to be added to the store" ,required=true ) @RequestBody Pet body
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+
+  @ApiOperation(value = "Deletes a pet", notes = "", response = Void.class, authorizations = {
+    @Authorization(value = "petstore_auth", scopes = {
+      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+      @AuthorizationScope(scope = "read:pets", description = "read your pets")
+      })
+  })
+  @ApiResponses(value = { 
+    @ApiResponse(code = 400, message = "Invalid pet value") })
+  @RequestMapping(value = "/{petId}", 
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.DELETE)
+  default Callable<ResponseEntity<Void>> deletePet(
+@ApiParam(value = "Pet id to delete",required=true ) @PathVariable("petId") Long petId
+
+,
+    
+@ApiParam(value = ""  ) @RequestHeader(value="api_key", required=false) String apiKey
+
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+
+  @ApiOperation(value = "Finds Pets by status", notes = "Multiple status values can be provided with comma separated strings", response = Pet.class, responseContainer = "List", authorizations = {
+    @Authorization(value = "petstore_auth", scopes = {
+      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+      @AuthorizationScope(scope = "read:pets", description = "read your pets")
+      })
+  })
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation"),
+    @ApiResponse(code = 400, message = "Invalid status value") })
+  @RequestMapping(value = "/findByStatus", 
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.GET)
+  default Callable<ResponseEntity<List<Pet>>> findPetsByStatus(@ApiParam(value = "Status values that need to be considered for filter", required = true) @RequestParam(value = "status", required = true) List<String> status
+
+
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<List<Pet>>(HttpStatus.OK);
+  }
+
+
+  @ApiOperation(value = "Finds Pets by tags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = {
+    @Authorization(value = "petstore_auth", scopes = {
+      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+      @AuthorizationScope(scope = "read:pets", description = "read your pets")
+      })
+  })
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation"),
+    @ApiResponse(code = 400, message = "Invalid tag value") })
+  @RequestMapping(value = "/findByTags", 
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.GET)
+  default Callable<ResponseEntity<List<Pet>>> findPetsByTags(@ApiParam(value = "Tags to filter by", required = true) @RequestParam(value = "tags", required = true) List<String> tags
+
+
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<List<Pet>>(HttpStatus.OK);
+  }
+
+
+  @ApiOperation(value = "Find pet by ID", notes = "Returns a single pet", response = Pet.class, authorizations = {
+    @Authorization(value = "api_key")
+  })
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation"),
+    @ApiResponse(code = 400, message = "Invalid ID supplied"),
+    @ApiResponse(code = 404, message = "Pet not found") })
+  @RequestMapping(value = "/{petId}", 
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.GET)
+  default Callable<ResponseEntity<Pet>> getPetById(
+@ApiParam(value = "ID of pet to return",required=true ) @PathVariable("petId") Long petId
+
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<Pet>(HttpStatus.OK);
+  }
+
 
   @ApiOperation(value = "Update an existing pet", notes = "", response = Void.class, authorizations = {
     @Authorization(value = "petstore_auth", scopes = {
@@ -49,116 +164,18 @@ public interface PetApi {
     @ApiResponse(code = 404, message = "Pet not found"),
     @ApiResponse(code = 405, message = "Validation exception") })
   @RequestMapping(value = "", 
-    produces = { "application/json", "application/xml" }, 
+    produces = { "application/xml", "application/json" }, 
     consumes = { "application/json", "application/xml" },
     method = RequestMethod.PUT)
   default Callable<ResponseEntity<Void>> updatePet(
 
-@ApiParam(value = "Pet object that needs to be added to the store"  ) @RequestBody Pet body
+@ApiParam(value = "Pet object that needs to be added to the store" ,required=true ) @RequestBody Pet body
 )
       throws NotFoundException {
       // do some magic!
       return () -> new ResponseEntity<Void>(HttpStatus.OK);
   }
 
-  
-
-  @ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class, authorizations = {
-    @Authorization(value = "petstore_auth", scopes = {
-      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-      @AuthorizationScope(scope = "read:pets", description = "read your pets")
-      })
-  })
-  @ApiResponses(value = { 
-    @ApiResponse(code = 405, message = "Invalid input") })
-  @RequestMapping(value = "", 
-    produces = { "application/json", "application/xml" }, 
-    consumes = { "application/json", "application/xml" },
-    method = RequestMethod.POST)
-  default Callable<ResponseEntity<Void>> addPet(
-
-@ApiParam(value = "Pet object that needs to be added to the store"  ) @RequestBody Pet body
-)
-      throws NotFoundException {
-      // do some magic!
-      return () -> new ResponseEntity<Void>(HttpStatus.OK);
-  }
-
-  
-
-  @ApiOperation(value = "Finds Pets by status", notes = "Multiple status values can be provided with comma seperated strings", response = Pet.class, responseContainer = "List", authorizations = {
-    @Authorization(value = "petstore_auth", scopes = {
-      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-      @AuthorizationScope(scope = "read:pets", description = "read your pets")
-      })
-  })
-  @ApiResponses(value = { 
-    @ApiResponse(code = 200, message = "successful operation"),
-    @ApiResponse(code = 400, message = "Invalid status value") })
-  @RequestMapping(value = "/findByStatus", 
-    produces = { "application/json", "application/xml" }, 
-    
-    method = RequestMethod.GET)
-  default Callable<ResponseEntity<List<Pet>>> findPetsByStatus(@ApiParam(value = "Status values that need to be considered for filter", defaultValue = "available") @RequestParam(value = "status", required = false, defaultValue="available") List<String> status
-
-
-)
-      throws NotFoundException {
-      // do some magic!
-      return () -> new ResponseEntity<List<Pet>>(HttpStatus.OK);
-  }
-
-  
-
-  @ApiOperation(value = "Finds Pets by tags", notes = "Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = {
-    @Authorization(value = "petstore_auth", scopes = {
-      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-      @AuthorizationScope(scope = "read:pets", description = "read your pets")
-      })
-  })
-  @ApiResponses(value = { 
-    @ApiResponse(code = 200, message = "successful operation"),
-    @ApiResponse(code = 400, message = "Invalid tag value") })
-  @RequestMapping(value = "/findByTags", 
-    produces = { "application/json", "application/xml" }, 
-    
-    method = RequestMethod.GET)
-  default Callable<ResponseEntity<List<Pet>>> findPetsByTags(@ApiParam(value = "Tags to filter by") @RequestParam(value = "tags", required = false) List<String> tags
-
-
-)
-      throws NotFoundException {
-      // do some magic!
-      return () -> new ResponseEntity<List<Pet>>(HttpStatus.OK);
-  }
-
-  
-
-  @ApiOperation(value = "Find pet by ID", notes = "Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions", response = Pet.class, authorizations = {
-    @Authorization(value = "petstore_auth", scopes = {
-      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-      @AuthorizationScope(scope = "read:pets", description = "read your pets")
-      }),
-    @Authorization(value = "api_key")
-  })
-  @ApiResponses(value = { 
-    @ApiResponse(code = 200, message = "successful operation"),
-    @ApiResponse(code = 400, message = "Invalid ID supplied"),
-    @ApiResponse(code = 404, message = "Pet not found") })
-  @RequestMapping(value = "/{petId}", 
-    produces = { "application/json", "application/xml" }, 
-    
-    method = RequestMethod.GET)
-  default Callable<ResponseEntity<Pet>> getPetById(
-@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("petId") Long petId
-
-)
-      throws NotFoundException {
-      // do some magic!
-      return () -> new ResponseEntity<Pet>(HttpStatus.OK);
-  }
-
-  
 
   @ApiOperation(value = "Updates a pet in the store with form data", notes = "", response = Void.class, authorizations = {
     @Authorization(value = "petstore_auth", scopes = {
@@ -169,11 +186,11 @@ public interface PetApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 405, message = "Invalid input") })
   @RequestMapping(value = "/{petId}", 
-    produces = { "application/json", "application/xml" }, 
+    produces = { "application/xml", "application/json" }, 
     consumes = { "application/x-www-form-urlencoded" },
     method = RequestMethod.POST)
   default Callable<ResponseEntity<Void>> updatePetWithForm(
-@ApiParam(value = "ID of pet that needs to be updated",required=true ) @PathVariable("petId") String petId
+@ApiParam(value = "ID of pet that needs to be updated",required=true ) @PathVariable("petId") Long petId
 
 ,
     
@@ -191,36 +208,8 @@ public interface PetApi {
       return () -> new ResponseEntity<Void>(HttpStatus.OK);
   }
 
-  
 
-  @ApiOperation(value = "Deletes a pet", notes = "", response = Void.class, authorizations = {
-    @Authorization(value = "petstore_auth", scopes = {
-      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-      @AuthorizationScope(scope = "read:pets", description = "read your pets")
-      })
-  })
-  @ApiResponses(value = { 
-    @ApiResponse(code = 400, message = "Invalid pet value") })
-  @RequestMapping(value = "/{petId}", 
-    produces = { "application/json", "application/xml" }, 
-    
-    method = RequestMethod.DELETE)
-  default Callable<ResponseEntity<Void>> deletePet(
-@ApiParam(value = "Pet id to delete",required=true ) @PathVariable("petId") Long petId
-
-,
-    
-@ApiParam(value = ""  ) @RequestHeader(value="apiKey", required=false) String apiKey
-
-)
-      throws NotFoundException {
-      // do some magic!
-      return () -> new ResponseEntity<Void>(HttpStatus.OK);
-  }
-
-  
-
-  @ApiOperation(value = "uploads an image", notes = "", response = Void.class, authorizations = {
+  @ApiOperation(value = "uploads an image", notes = "", response = ApiResponse.class, authorizations = {
     @Authorization(value = "petstore_auth", scopes = {
       @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
       @AuthorizationScope(scope = "read:pets", description = "read your pets")
@@ -229,10 +218,10 @@ public interface PetApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation") })
   @RequestMapping(value = "/{petId}/uploadImage", 
-    produces = { "application/json", "application/xml" }, 
+    produces = { "application/json" }, 
     consumes = { "multipart/form-data" },
     method = RequestMethod.POST)
-  default Callable<ResponseEntity<Void>> uploadFile(
+  default Callable<ResponseEntity<ApiResponse>> uploadFile(
 @ApiParam(value = "ID of pet to update",required=true ) @PathVariable("petId") Long petId
 
 ,
@@ -247,34 +236,7 @@ public interface PetApi {
 )
       throws NotFoundException {
       // do some magic!
-      return () -> new ResponseEntity<Void>(HttpStatus.OK);
+      return () -> new ResponseEntity<ApiResponse>(HttpStatus.OK);
   }
 
-  
-
-  @ApiOperation(value = "Fake endpoint to test byte array return by 'Find pet by ID'", notes = "Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions", response = byte[].class, authorizations = {
-    @Authorization(value = "petstore_auth", scopes = {
-      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-      @AuthorizationScope(scope = "read:pets", description = "read your pets")
-      }),
-    @Authorization(value = "api_key")
-  })
-  @ApiResponses(value = { 
-    @ApiResponse(code = 200, message = "successful operation"),
-    @ApiResponse(code = 400, message = "Invalid ID supplied"),
-    @ApiResponse(code = 404, message = "Pet not found") })
-  @RequestMapping(value = "/{petId}?testing_byte_array=true", 
-    produces = { "application/json", "application/xml" }, 
-    
-    method = RequestMethod.GET)
-  default Callable<ResponseEntity<byte[]>> petPetIdtestingByteArraytrueGet(
-@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("petId") Long petId
-
-)
-      throws NotFoundException {
-      // do some magic!
-      return () -> new ResponseEntity<byte[]>(HttpStatus.OK);
-  }
-
-  
 }
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/StoreApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/StoreApi.java
index a664cac3c60..5063976abb9 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/StoreApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/StoreApi.java
@@ -34,78 +34,15 @@ import static org.springframework.http.MediaType.*;
 @Controller
 @RequestMapping(value = "/store", produces = {APPLICATION_JSON_VALUE})
 @Api(value = "/store", description = "the store API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:50:52.711+08:00")
 public interface StoreApi {
-  
-
-  @ApiOperation(value = "Returns pet inventories by status", notes = "Returns a map of status codes to quantities", response = Integer.class, responseContainer = "Map", authorizations = {
-    @Authorization(value = "api_key")
-  })
-  @ApiResponses(value = { 
-    @ApiResponse(code = 200, message = "successful operation") })
-  @RequestMapping(value = "/inventory", 
-    produces = { "application/json", "application/xml" }, 
-    
-    method = RequestMethod.GET)
-  default Callable<ResponseEntity<Map<String, Integer>>> getInventory()
-      throws NotFoundException {
-      // do some magic!
-      return () -> new ResponseEntity<Map<String, Integer>>(HttpStatus.OK);
-  }
-
-  
-
-  @ApiOperation(value = "Place an order for a pet", notes = "", response = Order.class, authorizations = {
-    @Authorization(value = "test_api_client_id"),
-    @Authorization(value = "test_api_client_secret")
-  })
-  @ApiResponses(value = { 
-    @ApiResponse(code = 200, message = "successful operation"),
-    @ApiResponse(code = 400, message = "Invalid Order") })
-  @RequestMapping(value = "/order", 
-    produces = { "application/json", "application/xml" }, 
-    
-    method = RequestMethod.POST)
-  default Callable<ResponseEntity<Order>> placeOrder(
-
-@ApiParam(value = "order placed for purchasing the pet"  ) @RequestBody Order body
-)
-      throws NotFoundException {
-      // do some magic!
-      return () -> new ResponseEntity<Order>(HttpStatus.OK);
-  }
-
-  
-
-  @ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, authorizations = {
-    @Authorization(value = "test_api_key_query"),
-    @Authorization(value = "test_api_key_header")
-  })
-  @ApiResponses(value = { 
-    @ApiResponse(code = 200, message = "successful operation"),
-    @ApiResponse(code = 400, message = "Invalid ID supplied"),
-    @ApiResponse(code = 404, message = "Order not found") })
-  @RequestMapping(value = "/order/{orderId}", 
-    produces = { "application/json", "application/xml" }, 
-    
-    method = RequestMethod.GET)
-  default Callable<ResponseEntity<Order>> getOrderById(
-@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("orderId") String orderId
-
-)
-      throws NotFoundException {
-      // do some magic!
-      return () -> new ResponseEntity<Order>(HttpStatus.OK);
-  }
-
-  
 
   @ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class)
   @ApiResponses(value = { 
     @ApiResponse(code = 400, message = "Invalid ID supplied"),
     @ApiResponse(code = 404, message = "Order not found") })
   @RequestMapping(value = "/order/{orderId}", 
-    produces = { "application/json", "application/xml" }, 
+    produces = { "application/xml", "application/json" }, 
     
     method = RequestMethod.DELETE)
   default Callable<ResponseEntity<Void>> deleteOrder(
@@ -117,5 +54,57 @@ public interface StoreApi {
       return () -> new ResponseEntity<Void>(HttpStatus.OK);
   }
 
-  
+
+  @ApiOperation(value = "Returns pet inventories by status", notes = "Returns a map of status codes to quantities", response = Integer.class, responseContainer = "Map", authorizations = {
+    @Authorization(value = "api_key")
+  })
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation") })
+  @RequestMapping(value = "/inventory", 
+    produces = { "application/json" }, 
+    
+    method = RequestMethod.GET)
+  default Callable<ResponseEntity<Map<String, Integer>>> getInventory()
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<Map<String, Integer>>(HttpStatus.OK);
+  }
+
+
+  @ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation"),
+    @ApiResponse(code = 400, message = "Invalid ID supplied"),
+    @ApiResponse(code = 404, message = "Order not found") })
+  @RequestMapping(value = "/order/{orderId}", 
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.GET)
+  default Callable<ResponseEntity<Order>> getOrderById(
+@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("orderId") Long orderId
+
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<Order>(HttpStatus.OK);
+  }
+
+
+  @ApiOperation(value = "Place an order for a pet", notes = "", response = Order.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation"),
+    @ApiResponse(code = 400, message = "Invalid Order") })
+  @RequestMapping(value = "/order", 
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.POST)
+  default Callable<ResponseEntity<Order>> placeOrder(
+
+@ApiParam(value = "order placed for purchasing the pet" ,required=true ) @RequestBody Order body
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<Order>(HttpStatus.OK);
+  }
+
 }
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/UserApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/UserApi.java
index d0fb1070a6f..73c8893c5cf 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/UserApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/UserApi.java
@@ -34,151 +34,66 @@ import static org.springframework.http.MediaType.*;
 @Controller
 @RequestMapping(value = "/user", produces = {APPLICATION_JSON_VALUE})
 @Api(value = "/user", description = "the user API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:50:52.711+08:00")
 public interface UserApi {
-  
 
   @ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class)
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation") })
   @RequestMapping(value = "", 
-    produces = { "application/json", "application/xml" }, 
+    produces = { "application/xml", "application/json" }, 
     
     method = RequestMethod.POST)
   default Callable<ResponseEntity<Void>> createUser(
 
-@ApiParam(value = "Created user object"  ) @RequestBody User body
+@ApiParam(value = "Created user object" ,required=true ) @RequestBody User body
 )
       throws NotFoundException {
       // do some magic!
       return () -> new ResponseEntity<Void>(HttpStatus.OK);
   }
 
-  
 
   @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class)
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation") })
   @RequestMapping(value = "/createWithArray", 
-    produces = { "application/json", "application/xml" }, 
+    produces = { "application/xml", "application/json" }, 
     
     method = RequestMethod.POST)
   default Callable<ResponseEntity<Void>> createUsersWithArrayInput(
 
-@ApiParam(value = "List of user object"  ) @RequestBody List<User> body
+@ApiParam(value = "List of user object" ,required=true ) @RequestBody List<User> body
 )
       throws NotFoundException {
       // do some magic!
       return () -> new ResponseEntity<Void>(HttpStatus.OK);
   }
 
-  
 
   @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class)
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation") })
   @RequestMapping(value = "/createWithList", 
-    produces = { "application/json", "application/xml" }, 
+    produces = { "application/xml", "application/json" }, 
     
     method = RequestMethod.POST)
   default Callable<ResponseEntity<Void>> createUsersWithListInput(
 
-@ApiParam(value = "List of user object"  ) @RequestBody List<User> body
+@ApiParam(value = "List of user object" ,required=true ) @RequestBody List<User> body
 )
       throws NotFoundException {
       // do some magic!
       return () -> new ResponseEntity<Void>(HttpStatus.OK);
   }
 
-  
-
-  @ApiOperation(value = "Logs user into the system", notes = "", response = String.class)
-  @ApiResponses(value = { 
-    @ApiResponse(code = 200, message = "successful operation"),
-    @ApiResponse(code = 400, message = "Invalid username/password supplied") })
-  @RequestMapping(value = "/login", 
-    produces = { "application/json", "application/xml" }, 
-    
-    method = RequestMethod.GET)
-  default Callable<ResponseEntity<String>> loginUser(@ApiParam(value = "The user name for login") @RequestParam(value = "username", required = false) String username
-
-
-,
-    @ApiParam(value = "The password for login in clear text") @RequestParam(value = "password", required = false) String password
-
-
-)
-      throws NotFoundException {
-      // do some magic!
-      return () -> new ResponseEntity<String>(HttpStatus.OK);
-  }
-
-  
-
-  @ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class)
-  @ApiResponses(value = { 
-    @ApiResponse(code = 200, message = "successful operation") })
-  @RequestMapping(value = "/logout", 
-    produces = { "application/json", "application/xml" }, 
-    
-    method = RequestMethod.GET)
-  default Callable<ResponseEntity<Void>> logoutUser()
-      throws NotFoundException {
-      // do some magic!
-      return () -> new ResponseEntity<Void>(HttpStatus.OK);
-  }
-
-  
-
-  @ApiOperation(value = "Get user by user name", notes = "", response = User.class)
-  @ApiResponses(value = { 
-    @ApiResponse(code = 200, message = "successful operation"),
-    @ApiResponse(code = 400, message = "Invalid username supplied"),
-    @ApiResponse(code = 404, message = "User not found") })
-  @RequestMapping(value = "/{username}", 
-    produces = { "application/json", "application/xml" }, 
-    
-    method = RequestMethod.GET)
-  default Callable<ResponseEntity<User>> getUserByName(
-@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.",required=true ) @PathVariable("username") String username
-
-)
-      throws NotFoundException {
-      // do some magic!
-      return () -> new ResponseEntity<User>(HttpStatus.OK);
-  }
-
-  
-
-  @ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = Void.class)
-  @ApiResponses(value = { 
-    @ApiResponse(code = 400, message = "Invalid user supplied"),
-    @ApiResponse(code = 404, message = "User not found") })
-  @RequestMapping(value = "/{username}", 
-    produces = { "application/json", "application/xml" }, 
-    
-    method = RequestMethod.PUT)
-  default Callable<ResponseEntity<Void>> updateUser(
-@ApiParam(value = "name that need to be deleted",required=true ) @PathVariable("username") String username
-
-,
-    
-
-@ApiParam(value = "Updated user object"  ) @RequestBody User body
-)
-      throws NotFoundException {
-      // do some magic!
-      return () -> new ResponseEntity<Void>(HttpStatus.OK);
-  }
-
-  
 
   @ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", response = Void.class)
   @ApiResponses(value = { 
     @ApiResponse(code = 400, message = "Invalid username supplied"),
     @ApiResponse(code = 404, message = "User not found") })
   @RequestMapping(value = "/{username}", 
-    produces = { "application/json", "application/xml" }, 
+    produces = { "application/xml", "application/json" }, 
     
     method = RequestMethod.DELETE)
   default Callable<ResponseEntity<Void>> deleteUser(
@@ -190,5 +105,81 @@ public interface UserApi {
       return () -> new ResponseEntity<Void>(HttpStatus.OK);
   }
 
-  
+
+  @ApiOperation(value = "Get user by user name", notes = "", response = User.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation"),
+    @ApiResponse(code = 400, message = "Invalid username supplied"),
+    @ApiResponse(code = 404, message = "User not found") })
+  @RequestMapping(value = "/{username}", 
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.GET)
+  default Callable<ResponseEntity<User>> getUserByName(
+@ApiParam(value = "The name that needs to be fetched. Use user1 for testing. ",required=true ) @PathVariable("username") String username
+
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<User>(HttpStatus.OK);
+  }
+
+
+  @ApiOperation(value = "Logs user into the system", notes = "", response = String.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation"),
+    @ApiResponse(code = 400, message = "Invalid username/password supplied") })
+  @RequestMapping(value = "/login", 
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.GET)
+  default Callable<ResponseEntity<String>> loginUser(@ApiParam(value = "The user name for login", required = true) @RequestParam(value = "username", required = true) String username
+
+
+,
+    @ApiParam(value = "The password for login in clear text", required = true) @RequestParam(value = "password", required = true) String password
+
+
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<String>(HttpStatus.OK);
+  }
+
+
+  @ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation") })
+  @RequestMapping(value = "/logout", 
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.GET)
+  default Callable<ResponseEntity<Void>> logoutUser()
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+
+  @ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = Void.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 400, message = "Invalid user supplied"),
+    @ApiResponse(code = 404, message = "User not found") })
+  @RequestMapping(value = "/{username}", 
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.PUT)
+  default Callable<ResponseEntity<Void>> updateUser(
+@ApiParam(value = "name that need to be deleted",required=true ) @PathVariable("username") String username
+
+,
+    
+
+@ApiParam(value = "Updated user object" ,required=true ) @RequestBody User body
+)
+      throws NotFoundException {
+      // do some magic!
+      return () -> new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
 }
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/SwaggerConfig.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/SwaggerConfig.java
index 0069b4ee73e..9573f7880f8 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/SwaggerConfig.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/SwaggerConfig.java
@@ -18,13 +18,13 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @EnableSwagger2 //Loads the spring beans required by the framework
 @PropertySource("classpath:swagger.properties")
 @Import(SwaggerUiConfiguration.class)
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:50:52.711+08:00")
 public class SwaggerConfig {
     @Bean
     ApiInfo apiInfo() {
         ApiInfo apiInfo = new ApiInfo(
         "Swagger Petstore",
-        "This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters",
+        "This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.",
         "1.0.0",
         "",
         "apiteam@swagger.io",
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/SwaggerUiConfiguration.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/SwaggerUiConfiguration.java
index 491739a2ad0..7673f5afbcb 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/SwaggerUiConfiguration.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/SwaggerUiConfiguration.java
@@ -8,7 +8,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
 
 @Configuration
 @EnableWebMvc
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:50:52.711+08:00")
 public class SwaggerUiConfiguration extends WebMvcConfigurerAdapter {
   private static final String[] SERVLET_RESOURCE_LOCATIONS = { "/" };
 
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/WebApplication.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/WebApplication.java
index dfa0e46a747..f8658aaaa29 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/WebApplication.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/WebApplication.java
@@ -2,7 +2,7 @@ package io.swagger.configuration;
 
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:50:52.711+08:00")
 public class WebApplication extends AbstractAnnotationConfigDispatcherServletInitializer {
 
     @Override
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/WebMvcConfiguration.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/WebMvcConfiguration.java
index fd2cd4c5667..aab4bf2e7d1 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/WebMvcConfiguration.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/configuration/WebMvcConfiguration.java
@@ -3,7 +3,7 @@ package io.swagger.configuration;
 import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:50:52.711+08:00")
 public class WebMvcConfiguration extends WebMvcConfigurationSupport {
     @Override
     public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/ApiResponse.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/ApiResponse.java
new file mode 100644
index 00000000000..c7fe864003b
--- /dev/null
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/ApiResponse.java
@@ -0,0 +1,84 @@
+package io.swagger.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Objects;
+
+
+@ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:50:52.711+08:00")
+public class ApiResponse  {
+  
+  private Integer code = null;
+  private String type = null;
+  private String message = null;
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("code")
+  public Integer getCode() {
+    return code;
+  }
+  public void setCode(Integer code) {
+    this.code = code;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("type")
+  public String getType() {
+    return type;
+  }
+  public void setType(String type) {
+    this.type = type;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("message")
+  public String getMessage() {
+    return message;
+  }
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ApiResponse apiResponse = (ApiResponse) o;
+    return Objects.equals(code, apiResponse.code) &&
+        Objects.equals(type, apiResponse.type) &&
+        Objects.equals(message, apiResponse.message);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(code, type, message);
+  }
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ApiResponse {\n");
+    
+    sb.append("  code: ").append(code).append("\n");
+    sb.append("  type: ").append(type).append("\n");
+    sb.append("  message: ").append(message).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Category.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Category.java
index a88265302f8..f4690dd7900 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Category.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Category.java
@@ -10,13 +10,12 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:50:52.711+08:00")
 public class Category  {
   
   private Long id = null;
   private String name = null;
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -28,7 +27,6 @@ public class Category  {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -40,7 +38,6 @@ public class Category  {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Order.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Order.java
index 2d17233f461..8b5355db47f 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Order.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Order.java
@@ -11,7 +11,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:50:52.711+08:00")
 public class Order  {
   
   private Long id = null;
@@ -23,9 +23,8 @@ public class Order  {
   };
   
   private StatusEnum status = null;
-  private Boolean complete = null;
+  private Boolean complete = false;
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -37,7 +36,6 @@ public class Order  {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -49,7 +47,6 @@ public class Order  {
     this.petId = petId;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -61,7 +58,6 @@ public class Order  {
     this.quantity = quantity;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -73,7 +69,6 @@ public class Order  {
     this.shipDate = shipDate;
   }
 
-  
   /**
    * Order Status
    **/
@@ -86,7 +81,6 @@ public class Order  {
     this.status = status;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -98,7 +92,6 @@ public class Order  {
     this.complete = complete;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Pet.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Pet.java
index 0ef203c0e0b..e767e6f079c 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Pet.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Pet.java
@@ -14,7 +14,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:50:52.711+08:00")
 public class Pet  {
   
   private Long id = null;
@@ -28,7 +28,6 @@ public class Pet  {
   
   private StatusEnum status = null;
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -40,7 +39,6 @@ public class Pet  {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -52,7 +50,6 @@ public class Pet  {
     this.category = category;
   }
 
-  
   /**
    **/
   @ApiModelProperty(required = true, value = "")
@@ -64,7 +61,6 @@ public class Pet  {
     this.name = name;
   }
 
-  
   /**
    **/
   @ApiModelProperty(required = true, value = "")
@@ -76,7 +72,6 @@ public class Pet  {
     this.photoUrls = photoUrls;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -88,7 +83,6 @@ public class Pet  {
     this.tags = tags;
   }
 
-  
   /**
    * pet status in the store
    **/
@@ -101,7 +95,6 @@ public class Pet  {
     this.status = status;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Tag.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Tag.java
index 1cdbf92b021..9b7bd88ad3c 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Tag.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Tag.java
@@ -10,13 +10,12 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:50:52.711+08:00")
 public class Tag  {
   
   private Long id = null;
   private String name = null;
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -28,7 +27,6 @@ public class Tag  {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -40,7 +38,6 @@ public class Tag  {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/User.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/User.java
index 49c4e4c3b46..f05fe4b6099 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/User.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/User.java
@@ -10,7 +10,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:59:02.543Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:50:52.711+08:00")
 public class User  {
   
   private Long id = null;
@@ -22,7 +22,6 @@ public class User  {
   private String phone = null;
   private Integer userStatus = null;
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -34,7 +33,6 @@ public class User  {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -46,7 +44,6 @@ public class User  {
     this.username = username;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -58,7 +55,6 @@ public class User  {
     this.firstName = firstName;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -70,7 +66,6 @@ public class User  {
     this.lastName = lastName;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -82,7 +77,6 @@ public class User  {
     this.email = email;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -94,7 +88,6 @@ public class User  {
     this.password = password;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -106,7 +99,6 @@ public class User  {
     this.phone = phone;
   }
 
-  
   /**
    * User Status
    **/
@@ -119,7 +111,6 @@ public class User  {
     this.userStatus = userStatus;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
diff --git a/samples/server/petstore/spring-mvc/pom.xml b/samples/server/petstore/spring-mvc/pom.xml
index 65d216606a8..861cd47a031 100644
--- a/samples/server/petstore/spring-mvc/pom.xml
+++ b/samples/server/petstore/spring-mvc/pom.xml
@@ -118,7 +118,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <swagger-core-version>1.5.7</swagger-core-version>
+    <swagger-core-version>1.5.8</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey-version>1.13</jersey-version>
     <slf4j-version>1.6.3</slf4j-version>
diff --git a/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 b41beea3e3e..74ea4cbc4c7 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiException.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiException.java
@@ -1,6 +1,6 @@
 package io.swagger.api;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:49:05.879+08: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 c128b43b3ee..d174ef951f4 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiOriginFilter.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiOriginFilter.java
@@ -5,7 +5,7 @@ import java.io.IOException;
 import javax.servlet.*;
 import javax.servlet.http.HttpServletResponse;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:49:05.879+08: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 9b6e484b90b..d53fb5b1bf7 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiResponseMessage.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiResponseMessage.java
@@ -3,7 +3,7 @@ package io.swagger.api;
 import javax.xml.bind.annotation.XmlTransient;
 
 @javax.xml.bind.annotation.XmlRootElement
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:49:05.879+08: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 f7f196c51af..077573dfcd5 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/NotFoundException.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/NotFoundException.java
@@ -1,6 +1,6 @@
 package io.swagger.api;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:49:05.879+08: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 f907458e17a..3db41f8b7b1 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
@@ -3,6 +3,7 @@ package io.swagger.api;
 import io.swagger.model.*;
 
 import io.swagger.model.Pet;
+import io.swagger.model.ApiResponse;
 import java.io.File;
 
 import io.swagger.annotations.Api;
@@ -31,34 +32,8 @@ import static org.springframework.http.MediaType.*;
 @Controller
 @RequestMapping(value = "/pet", produces = {APPLICATION_JSON_VALUE})
 @Api(value = "/pet", description = "the pet API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:49:05.879+08:00")
 public class PetApi {
-  
-
-  @ApiOperation(value = "Update an existing pet", notes = "", response = Void.class, authorizations = {
-    @Authorization(value = "petstore_auth", scopes = {
-      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-      @AuthorizationScope(scope = "read:pets", description = "read your pets")
-      })
-  })
-  @io.swagger.annotations.ApiResponses(value = { 
-    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied"),
-    @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found"),
-    @io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception") })
-  @RequestMapping(value = "", 
-    produces = { "application/json", "application/xml" }, 
-    consumes = { "application/json", "application/xml" },
-    method = RequestMethod.PUT)
-  public ResponseEntity<Void> updatePet(
-
-@ApiParam(value = "Pet object that needs to be added to the store"  ) @RequestBody Pet body
-)
-      throws NotFoundException {
-      // do some magic!
-      return new ResponseEntity<Void>(HttpStatus.OK);
-  }
-
-  
 
   @ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class, authorizations = {
     @Authorization(value = "petstore_auth", scopes = {
@@ -67,36 +42,61 @@ public class PetApi {
       })
   })
   @io.swagger.annotations.ApiResponses(value = { 
-    @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input") })
-  @RequestMapping(value = "", 
-    produces = { "application/json", "application/xml" }, 
+    @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) })
+  @RequestMapping(value = "",
+    produces = { "application/xml", "application/json" }, 
     consumes = { "application/json", "application/xml" },
     method = RequestMethod.POST)
   public ResponseEntity<Void> addPet(
 
-@ApiParam(value = "Pet object that needs to be added to the store"  ) @RequestBody Pet body
+@ApiParam(value = "Pet object that needs to be added to the store" ,required=true ) @RequestBody Pet body
 )
       throws NotFoundException {
       // do some magic!
       return new ResponseEntity<Void>(HttpStatus.OK);
   }
 
-  
 
-  @ApiOperation(value = "Finds Pets by status", notes = "Multiple status values can be provided with comma seperated strings", response = Pet.class, responseContainer = "List", authorizations = {
+  @ApiOperation(value = "Deletes a pet", notes = "", response = Void.class, authorizations = {
     @Authorization(value = "petstore_auth", scopes = {
       @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
       @AuthorizationScope(scope = "read:pets", description = "read your pets")
       })
   })
   @io.swagger.annotations.ApiResponses(value = { 
-    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
-    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid status value") })
-  @RequestMapping(value = "/findByStatus", 
-    produces = { "application/json", "application/xml" }, 
+    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid pet value", response = Void.class) })
+  @RequestMapping(value = "/{petId}",
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.DELETE)
+  public ResponseEntity<Void> deletePet(
+@ApiParam(value = "Pet id to delete",required=true ) @PathVariable("petId") Long petId
+
+,
+    
+@ApiParam(value = ""  ) @RequestHeader(value="api_key", required=false) String apiKey
+
+)
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+
+  @ApiOperation(value = "Finds Pets by status", notes = "Multiple status values can be provided with comma separated strings", response = Pet.class, responseContainer = "List", authorizations = {
+    @Authorization(value = "petstore_auth", scopes = {
+      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+      @AuthorizationScope(scope = "read:pets", description = "read your pets")
+      })
+  })
+  @io.swagger.annotations.ApiResponses(value = { 
+    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class),
+    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid status value", response = Pet.class) })
+  @RequestMapping(value = "/findByStatus",
+    produces = { "application/xml", "application/json" }, 
     
     method = RequestMethod.GET)
-  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
+  public ResponseEntity<List<Pet>> findPetsByStatus(@ApiParam(value = "Status values that need to be considered for filter", required = true) @RequestParam(value = "status", required = true) List<String> status
 
 
 )
@@ -105,22 +105,21 @@ public class PetApi {
       return new ResponseEntity<List<Pet>>(HttpStatus.OK);
   }
 
-  
 
-  @ApiOperation(value = "Finds Pets by tags", notes = "Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = {
+  @ApiOperation(value = "Finds Pets by tags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = {
     @Authorization(value = "petstore_auth", scopes = {
       @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
       @AuthorizationScope(scope = "read:pets", description = "read your pets")
       })
   })
   @io.swagger.annotations.ApiResponses(value = { 
-    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
-    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid tag value") })
-  @RequestMapping(value = "/findByTags", 
-    produces = { "application/json", "application/xml" }, 
+    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class),
+    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid tag value", response = Pet.class) })
+  @RequestMapping(value = "/findByTags",
+    produces = { "application/xml", "application/json" }, 
     
     method = RequestMethod.GET)
-  public ResponseEntity<List<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", required = true) @RequestParam(value = "tags", required = true) List<String> tags
 
 
 )
@@ -129,25 +128,20 @@ public class PetApi {
       return new ResponseEntity<List<Pet>>(HttpStatus.OK);
   }
 
-  
 
-  @ApiOperation(value = "Find pet by ID", notes = "Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions", response = Pet.class, authorizations = {
-    @Authorization(value = "petstore_auth", scopes = {
-      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-      @AuthorizationScope(scope = "read:pets", description = "read your pets")
-      }),
+  @ApiOperation(value = "Find pet by ID", notes = "Returns a single pet", response = Pet.class, authorizations = {
     @Authorization(value = "api_key")
   })
   @io.swagger.annotations.ApiResponses(value = { 
-    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
-    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied"),
-    @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found") })
-  @RequestMapping(value = "/{petId}", 
-    produces = { "application/json", "application/xml" }, 
+    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class),
+    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Pet.class),
+    @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Pet.class) })
+  @RequestMapping(value = "/{petId}",
+    produces = { "application/xml", "application/json" }, 
     
     method = RequestMethod.GET)
   public ResponseEntity<Pet> getPetById(
-@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("petId") Long petId
+@ApiParam(value = "ID of pet to return",required=true ) @PathVariable("petId") Long petId
 
 )
       throws NotFoundException {
@@ -155,7 +149,30 @@ public class PetApi {
       return new ResponseEntity<Pet>(HttpStatus.OK);
   }
 
-  
+
+  @ApiOperation(value = "Update an existing pet", notes = "", response = Void.class, authorizations = {
+    @Authorization(value = "petstore_auth", scopes = {
+      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+      @AuthorizationScope(scope = "read:pets", description = "read your pets")
+      })
+  })
+  @io.swagger.annotations.ApiResponses(value = { 
+    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
+    @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Void.class),
+    @io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception", response = Void.class) })
+  @RequestMapping(value = "",
+    produces = { "application/xml", "application/json" }, 
+    consumes = { "application/json", "application/xml" },
+    method = RequestMethod.PUT)
+  public ResponseEntity<Void> updatePet(
+
+@ApiParam(value = "Pet object that needs to be added to the store" ,required=true ) @RequestBody Pet body
+)
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
 
   @ApiOperation(value = "Updates a pet in the store with form data", notes = "", response = Void.class, authorizations = {
     @Authorization(value = "petstore_auth", scopes = {
@@ -164,13 +181,13 @@ public class PetApi {
       })
   })
   @io.swagger.annotations.ApiResponses(value = { 
-    @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input") })
-  @RequestMapping(value = "/{petId}", 
-    produces = { "application/json", "application/xml" }, 
+    @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) })
+  @RequestMapping(value = "/{petId}",
+    produces = { "application/xml", "application/json" }, 
     consumes = { "application/x-www-form-urlencoded" },
     method = RequestMethod.POST)
   public ResponseEntity<Void> updatePetWithForm(
-@ApiParam(value = "ID of pet that needs to be updated",required=true ) @PathVariable("petId") String petId
+@ApiParam(value = "ID of pet that needs to be updated",required=true ) @PathVariable("petId") Long petId
 
 ,
     
@@ -188,48 +205,20 @@ public class PetApi {
       return new ResponseEntity<Void>(HttpStatus.OK);
   }
 
-  
 
-  @ApiOperation(value = "Deletes a pet", notes = "", response = Void.class, authorizations = {
+  @ApiOperation(value = "uploads an image", notes = "", response = ApiResponse.class, authorizations = {
     @Authorization(value = "petstore_auth", scopes = {
       @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
       @AuthorizationScope(scope = "read:pets", description = "read your pets")
       })
   })
   @io.swagger.annotations.ApiResponses(value = { 
-    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid pet value") })
-  @RequestMapping(value = "/{petId}", 
-    produces = { "application/json", "application/xml" }, 
-    
-    method = RequestMethod.DELETE)
-  public ResponseEntity<Void> deletePet(
-@ApiParam(value = "Pet id to delete",required=true ) @PathVariable("petId") Long petId
-
-,
-    
-@ApiParam(value = ""  ) @RequestHeader(value="apiKey", required=false) String apiKey
-
-)
-      throws NotFoundException {
-      // do some magic!
-      return new ResponseEntity<Void>(HttpStatus.OK);
-  }
-
-  
-
-  @ApiOperation(value = "uploads an image", notes = "", response = Void.class, authorizations = {
-    @Authorization(value = "petstore_auth", scopes = {
-      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-      @AuthorizationScope(scope = "read:pets", description = "read your pets")
-      })
-  })
-  @io.swagger.annotations.ApiResponses(value = { 
-    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation") })
-  @RequestMapping(value = "/{petId}/uploadImage", 
-    produces = { "application/json", "application/xml" }, 
+    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = ApiResponse.class) })
+  @RequestMapping(value = "/{petId}/uploadImage",
+    produces = { "application/json" }, 
     consumes = { "multipart/form-data" },
     method = RequestMethod.POST)
-  public ResponseEntity<Void> uploadFile(
+  public ResponseEntity<ApiResponse> uploadFile(
 @ApiParam(value = "ID of pet to update",required=true ) @PathVariable("petId") Long petId
 
 ,
@@ -244,34 +233,7 @@ public class PetApi {
 )
       throws NotFoundException {
       // do some magic!
-      return new ResponseEntity<Void>(HttpStatus.OK);
+      return new ResponseEntity<ApiResponse>(HttpStatus.OK);
   }
 
-  
-
-  @ApiOperation(value = "Fake endpoint to test byte array return by 'Find pet by ID'", notes = "Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions", response = byte[].class, authorizations = {
-    @Authorization(value = "petstore_auth", scopes = {
-      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-      @AuthorizationScope(scope = "read:pets", description = "read your pets")
-      }),
-    @Authorization(value = "api_key")
-  })
-  @io.swagger.annotations.ApiResponses(value = { 
-    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
-    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied"),
-    @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found") })
-  @RequestMapping(value = "/{petId}?testing_byte_array=true", 
-    produces = { "application/json", "application/xml" }, 
-    
-    method = RequestMethod.GET)
-  public ResponseEntity<byte[]> petPetIdtestingByteArraytrueGet(
-@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("petId") Long petId
-
-)
-      throws NotFoundException {
-      // do some magic!
-      return new ResponseEntity<byte[]>(HttpStatus.OK);
-  }
-
-  
 }
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PettestingByteArraytrueApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PettestingByteArraytrueApi.java
index 6151c000b82..f7912cb4d28 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PettestingByteArraytrueApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PettestingByteArraytrueApi.java
@@ -27,11 +27,10 @@ import java.util.List;
 import static org.springframework.http.MediaType.*;
 
 @Controller
-@RequestMapping(value = "/pet?testing_byte_array=true", produces = {APPLICATION_JSON_VALUE})
-@Api(value = "/pet?testing_byte_array=true", description = "the pet?testing_byte_array=true API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
+@RequestMapping(value = "/pet?testing_byte_array&#x3D;true", produces = {APPLICATION_JSON_VALUE})
+@Api(value = "/pet?testing_byte_array&#x3D;true", description = "the pet?testing_byte_array&#x3D;true API")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-15T00:36:54.567+08:00")
 public class PettestingByteArraytrueApi {
-  
 
   @ApiOperation(value = "Fake endpoint to test byte array in body parameter for adding a new pet to the store", notes = "", response = Void.class, authorizations = {
     @Authorization(value = "petstore_auth", scopes = {
@@ -54,5 +53,4 @@ public class PettestingByteArraytrueApi {
       return new ResponseEntity<Void>(HttpStatus.OK);
   }
 
-  
 }
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java
index bfd0765ecd6..916532b6bce 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
@@ -31,78 +31,15 @@ import static org.springframework.http.MediaType.*;
 @Controller
 @RequestMapping(value = "/store", produces = {APPLICATION_JSON_VALUE})
 @Api(value = "/store", description = "the store API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:49:05.879+08: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", authorizations = {
-    @Authorization(value = "api_key")
-  })
-  @io.swagger.annotations.ApiResponses(value = { 
-    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation") })
-  @RequestMapping(value = "/inventory", 
-    produces = { "application/json", "application/xml" }, 
-    
-    method = RequestMethod.GET)
-  public ResponseEntity<Map<String, Integer>> getInventory()
-      throws NotFoundException {
-      // do some magic!
-      return new ResponseEntity<Map<String, Integer>>(HttpStatus.OK);
-  }
-
-  
-
-  @ApiOperation(value = "Place an order for a pet", notes = "", response = Order.class, authorizations = {
-    @Authorization(value = "test_api_client_id"),
-    @Authorization(value = "test_api_client_secret")
-  })
-  @io.swagger.annotations.ApiResponses(value = { 
-    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
-    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order") })
-  @RequestMapping(value = "/order", 
-    produces = { "application/json", "application/xml" }, 
-    
-    method = RequestMethod.POST)
-  public ResponseEntity<Order> placeOrder(
-
-@ApiParam(value = "order placed for purchasing the pet"  ) @RequestBody Order body
-)
-      throws NotFoundException {
-      // do some magic!
-      return new ResponseEntity<Order>(HttpStatus.OK);
-  }
-
-  
-
-  @ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, authorizations = {
-    @Authorization(value = "test_api_key_query"),
-    @Authorization(value = "test_api_key_header")
-  })
-  @io.swagger.annotations.ApiResponses(value = { 
-    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
-    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied"),
-    @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found") })
-  @RequestMapping(value = "/order/{orderId}", 
-    produces = { "application/json", "application/xml" }, 
-    
-    method = RequestMethod.GET)
-  public ResponseEntity<Order> getOrderById(
-@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("orderId") String orderId
-
-)
-      throws NotFoundException {
-      // do some magic!
-      return new ResponseEntity<Order>(HttpStatus.OK);
-  }
-
-  
 
   @ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class)
   @io.swagger.annotations.ApiResponses(value = { 
-    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied"),
-    @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found") })
-  @RequestMapping(value = "/order/{orderId}", 
-    produces = { "application/json", "application/xml" }, 
+    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
+    @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = Void.class) })
+  @RequestMapping(value = "/order/{orderId}",
+    produces = { "application/xml", "application/json" }, 
     
     method = RequestMethod.DELETE)
   public ResponseEntity<Void> deleteOrder(
@@ -114,5 +51,57 @@ public class StoreApi {
       return new ResponseEntity<Void>(HttpStatus.OK);
   }
 
-  
+
+  @ApiOperation(value = "Returns pet inventories by status", notes = "Returns a map of status codes to quantities", response = Integer.class, responseContainer = "Map", authorizations = {
+    @Authorization(value = "api_key")
+  })
+  @io.swagger.annotations.ApiResponses(value = { 
+    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Integer.class) })
+  @RequestMapping(value = "/inventory",
+    produces = { "application/json" }, 
+    
+    method = RequestMethod.GET)
+  public ResponseEntity<Map<String, Integer>> getInventory()
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<Map<String, Integer>>(HttpStatus.OK);
+  }
+
+
+  @ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class)
+  @io.swagger.annotations.ApiResponses(value = { 
+    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
+    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Order.class),
+    @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = Order.class) })
+  @RequestMapping(value = "/order/{orderId}",
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.GET)
+  public ResponseEntity<Order> getOrderById(
+@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("orderId") Long orderId
+
+)
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<Order>(HttpStatus.OK);
+  }
+
+
+  @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", response = Order.class),
+    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order", response = Order.class) })
+  @RequestMapping(value = "/order",
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.POST)
+  public ResponseEntity<Order> placeOrder(
+
+@ApiParam(value = "order placed for purchasing the pet" ,required=true ) @RequestBody Order body
+)
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<Order>(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 eafb9a3356e..c7bd55fd05b 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
@@ -31,151 +31,66 @@ import static org.springframework.http.MediaType.*;
 @Controller
 @RequestMapping(value = "/user", produces = {APPLICATION_JSON_VALUE})
 @Api(value = "/user", description = "the user API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:49:05.879+08:00")
 public class UserApi {
-  
 
   @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 = 200, message = "successful operation") })
-  @RequestMapping(value = "", 
-    produces = { "application/json", "application/xml" }, 
+    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
+  @RequestMapping(value = "",
+    produces = { "application/xml", "application/json" }, 
     
     method = RequestMethod.POST)
   public ResponseEntity<Void> createUser(
 
-@ApiParam(value = "Created user object"  ) @RequestBody User body
+@ApiParam(value = "Created user object" ,required=true ) @RequestBody User body
 )
       throws NotFoundException {
       // do some magic!
       return new ResponseEntity<Void>(HttpStatus.OK);
   }
 
-  
 
   @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class)
   @io.swagger.annotations.ApiResponses(value = { 
-    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation") })
-  @RequestMapping(value = "/createWithArray", 
-    produces = { "application/json", "application/xml" }, 
+    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
+  @RequestMapping(value = "/createWithArray",
+    produces = { "application/xml", "application/json" }, 
     
     method = RequestMethod.POST)
   public ResponseEntity<Void> createUsersWithArrayInput(
 
-@ApiParam(value = "List of user object"  ) @RequestBody List<User> body
+@ApiParam(value = "List of user object" ,required=true ) @RequestBody List<User> body
 )
       throws NotFoundException {
       // do some magic!
       return new ResponseEntity<Void>(HttpStatus.OK);
   }
 
-  
 
   @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class)
   @io.swagger.annotations.ApiResponses(value = { 
-    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation") })
-  @RequestMapping(value = "/createWithList", 
-    produces = { "application/json", "application/xml" }, 
+    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
+  @RequestMapping(value = "/createWithList",
+    produces = { "application/xml", "application/json" }, 
     
     method = RequestMethod.POST)
   public ResponseEntity<Void> createUsersWithListInput(
 
-@ApiParam(value = "List of user object"  ) @RequestBody List<User> body
+@ApiParam(value = "List of user object" ,required=true ) @RequestBody List<User> body
 )
       throws NotFoundException {
       // do some magic!
       return new ResponseEntity<Void>(HttpStatus.OK);
   }
 
-  
-
-  @ApiOperation(value = "Logs user into the system", notes = "", response = String.class)
-  @io.swagger.annotations.ApiResponses(value = { 
-    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
-    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username/password supplied") })
-  @RequestMapping(value = "/login", 
-    produces = { "application/json", "application/xml" }, 
-    
-    method = RequestMethod.GET)
-  public ResponseEntity<String> loginUser(@ApiParam(value = "The user name for login") @RequestParam(value = "username", required = false) String username
-
-
-,
-    @ApiParam(value = "The password for login in clear text") @RequestParam(value = "password", required = false) String password
-
-
-)
-      throws NotFoundException {
-      // do some magic!
-      return new ResponseEntity<String>(HttpStatus.OK);
-  }
-
-  
-
-  @ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class)
-  @io.swagger.annotations.ApiResponses(value = { 
-    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation") })
-  @RequestMapping(value = "/logout", 
-    produces = { "application/json", "application/xml" }, 
-    
-    method = RequestMethod.GET)
-  public ResponseEntity<Void> logoutUser()
-      throws NotFoundException {
-      // do some magic!
-      return new ResponseEntity<Void>(HttpStatus.OK);
-  }
-
-  
-
-  @ApiOperation(value = "Get user by user name", notes = "", response = User.class)
-  @io.swagger.annotations.ApiResponses(value = { 
-    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
-    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied"),
-    @io.swagger.annotations.ApiResponse(code = 404, message = "User not found") })
-  @RequestMapping(value = "/{username}", 
-    produces = { "application/json", "application/xml" }, 
-    
-    method = RequestMethod.GET)
-  public ResponseEntity<User> getUserByName(
-@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.",required=true ) @PathVariable("username") String username
-
-)
-      throws NotFoundException {
-      // do some magic!
-      return new ResponseEntity<User>(HttpStatus.OK);
-  }
-
-  
-
-  @ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = Void.class)
-  @io.swagger.annotations.ApiResponses(value = { 
-    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid user supplied"),
-    @io.swagger.annotations.ApiResponse(code = 404, message = "User not found") })
-  @RequestMapping(value = "/{username}", 
-    produces = { "application/json", "application/xml" }, 
-    
-    method = RequestMethod.PUT)
-  public ResponseEntity<Void> updateUser(
-@ApiParam(value = "name that need to be deleted",required=true ) @PathVariable("username") String username
-
-,
-    
-
-@ApiParam(value = "Updated user object"  ) @RequestBody User body
-)
-      throws NotFoundException {
-      // do some magic!
-      return new ResponseEntity<Void>(HttpStatus.OK);
-  }
-
-  
 
   @ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", response = Void.class)
   @io.swagger.annotations.ApiResponses(value = { 
-    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied"),
-    @io.swagger.annotations.ApiResponse(code = 404, message = "User not found") })
-  @RequestMapping(value = "/{username}", 
-    produces = { "application/json", "application/xml" }, 
+    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
+    @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) })
+  @RequestMapping(value = "/{username}",
+    produces = { "application/xml", "application/json" }, 
     
     method = RequestMethod.DELETE)
   public ResponseEntity<Void> deleteUser(
@@ -187,5 +102,81 @@ public class UserApi {
       return new ResponseEntity<Void>(HttpStatus.OK);
   }
 
-  
+
+  @ApiOperation(value = "Get user by user name", notes = "", response = User.class)
+  @io.swagger.annotations.ApiResponses(value = { 
+    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = User.class),
+    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = User.class),
+    @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = User.class) })
+  @RequestMapping(value = "/{username}",
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.GET)
+  public ResponseEntity<User> getUserByName(
+@ApiParam(value = "The name that needs to be fetched. Use user1 for testing. ",required=true ) @PathVariable("username") String username
+
+)
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<User>(HttpStatus.OK);
+  }
+
+
+  @ApiOperation(value = "Logs user into the system", notes = "", response = String.class)
+  @io.swagger.annotations.ApiResponses(value = { 
+    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = String.class),
+    @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username/password supplied", response = String.class) })
+  @RequestMapping(value = "/login",
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.GET)
+  public ResponseEntity<String> loginUser(@ApiParam(value = "The user name for login", required = true) @RequestParam(value = "username", required = true) String username
+
+
+,
+    @ApiParam(value = "The password for login in clear text", required = true) @RequestParam(value = "password", required = true) String password
+
+
+)
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<String>(HttpStatus.OK);
+  }
+
+
+  @ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class)
+  @io.swagger.annotations.ApiResponses(value = { 
+    @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
+  @RequestMapping(value = "/logout",
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.GET)
+  public ResponseEntity<Void> logoutUser()
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+
+  @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 = 400, message = "Invalid user supplied", response = Void.class),
+    @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) })
+  @RequestMapping(value = "/{username}",
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.PUT)
+  public ResponseEntity<Void> updateUser(
+@ApiParam(value = "name that need to be deleted",required=true ) @PathVariable("username") String username
+
+,
+    
+
+@ApiParam(value = "Updated user object" ,required=true ) @RequestBody User body
+)
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
 }
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerConfig.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerConfig.java
index f9a4e70eedf..2e99e717296 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,13 +18,13 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @EnableSwagger2 //Loads the spring beans required by the framework
 @PropertySource("classpath:swagger.properties")
 @Import(SwaggerUiConfiguration.class)
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:49:05.879+08:00")
 public class SwaggerConfig {
     @Bean
     ApiInfo apiInfo() {
         ApiInfo apiInfo = new ApiInfo(
         "Swagger Petstore",
-        "This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters",
+        "This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.",
         "1.0.0",
         "",
         "apiteam@swagger.io",
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 d5f6abb5b58..e552ecc15fb 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerUiConfiguration.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerUiConfiguration.java
@@ -8,7 +8,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
 
 @Configuration
 @EnableWebMvc
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:49:05.879+08: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 ad7b104266e..ea9b029ba8d 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/WebApplication.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/WebApplication.java
@@ -2,7 +2,7 @@ package io.swagger.configuration;
 
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:49:05.879+08: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 67c3f82ac7a..61bfeda1555 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/WebMvcConfiguration.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/WebMvcConfiguration.java
@@ -3,7 +3,7 @@ package io.swagger.configuration;
 import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:49:05.879+08: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/Animal.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Animal.java
new file mode 100644
index 00000000000..ff0afdd4f86
--- /dev/null
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Animal.java
@@ -0,0 +1,57 @@
+package io.swagger.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Objects;
+
+
+@ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-15T00:36:54.567+08:00")
+public class Animal  {
+  
+  private String className = null;
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("className")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Animal animal = (Animal) o;
+    return Objects.equals(className, animal.className);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className);
+  }
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Animal {\n");
+    
+    sb.append("  className: ").append(className).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ApiResponse.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ApiResponse.java
index 89364524a61..31e09116e3a 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ApiResponse.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ApiResponse.java
@@ -1,7 +1,6 @@
 package io.swagger.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -12,14 +11,13 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-22T15:27:38.634-06:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:49:05.879+08:00")
 public class ApiResponse  {
   
   private Integer code = null;
   private String type = null;
   private String message = null;
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -31,7 +29,6 @@ public class ApiResponse  {
     this.code = code;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -43,7 +40,6 @@ public class ApiResponse  {
     this.type = type;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -55,7 +51,6 @@ public class ApiResponse  {
     this.message = message;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Cat.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Cat.java
new file mode 100644
index 00000000000..884c739d46d
--- /dev/null
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Cat.java
@@ -0,0 +1,72 @@
+package io.swagger.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.model.Animal;
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Objects;
+
+
+@ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-15T00:36:54.567+08:00")
+public class Cat extends Animal {
+  
+  private String className = null;
+  private Boolean declawed = null;
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("className")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("declawed")
+  public Boolean getDeclawed() {
+    return declawed;
+  }
+  public void setDeclawed(Boolean declawed) {
+    this.declawed = declawed;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Cat cat = (Cat) o;
+    return Objects.equals(className, cat.className) &&
+        Objects.equals(declawed, cat.declawed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className, declawed);
+  }
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Cat {\n");
+    sb.append("  " + super.toString()).append("\n");
+    sb.append("  className: ").append(className).append("\n");
+    sb.append("  declawed: ").append(declawed).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Category.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Category.java
index 6a928dfc593..a59702faace 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
@@ -11,13 +11,12 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:49:05.879+08:00")
 public class Category  {
   
   private Long id = null;
   private String name = null;
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -29,7 +28,6 @@ public class Category  {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -41,7 +39,6 @@ public class Category  {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Dog.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Dog.java
new file mode 100644
index 00000000000..856fb7a0e66
--- /dev/null
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Dog.java
@@ -0,0 +1,72 @@
+package io.swagger.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.model.Animal;
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Objects;
+
+
+@ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-15T00:36:54.567+08:00")
+public class Dog extends Animal {
+  
+  private String className = null;
+  private String breed = null;
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("className")
+  public String getClassName() {
+    return className;
+  }
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("breed")
+  public String getBreed() {
+    return breed;
+  }
+  public void setBreed(String breed) {
+    this.breed = breed;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Dog dog = (Dog) o;
+    return Objects.equals(className, dog.className) &&
+        Objects.equals(breed, dog.breed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className, breed);
+  }
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Dog {\n");
+    sb.append("  " + super.toString()).append("\n");
+    sb.append("  className: ").append(className).append("\n");
+    sb.append("  breed: ").append(breed).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/FormatTest.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/FormatTest.java
new file mode 100644
index 00000000000..309ffd11616
--- /dev/null
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/FormatTest.java
@@ -0,0 +1,213 @@
+package io.swagger.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Objects;
+
+
+@ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-15T00:36:54.567+08:00")
+public class FormatTest  {
+  
+  private Integer integer = null;
+  private Integer int32 = null;
+  private Long int64 = null;
+  private BigDecimal number = null;
+  private Float _float = null;
+  private Double _double = null;
+  private String string = null;
+  private byte[] _byte = null;
+  private byte[] binary = null;
+  private Date date = null;
+  private Date dateTime = null;
+  private String password = null;
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("integer")
+  public Integer getInteger() {
+    return integer;
+  }
+  public void setInteger(Integer integer) {
+    this.integer = integer;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("int32")
+  public Integer getInt32() {
+    return int32;
+  }
+  public void setInt32(Integer int32) {
+    this.int32 = int32;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("int64")
+  public Long getInt64() {
+    return int64;
+  }
+  public void setInt64(Long int64) {
+    this.int64 = int64;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("number")
+  public BigDecimal getNumber() {
+    return number;
+  }
+  public void setNumber(BigDecimal number) {
+    this.number = number;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("float")
+  public Float getFloat() {
+    return _float;
+  }
+  public void setFloat(Float _float) {
+    this._float = _float;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("double")
+  public Double getDouble() {
+    return _double;
+  }
+  public void setDouble(Double _double) {
+    this._double = _double;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("string")
+  public String getString() {
+    return string;
+  }
+  public void setString(String string) {
+    this.string = string;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("byte")
+  public byte[] getByte() {
+    return _byte;
+  }
+  public void setByte(byte[] _byte) {
+    this._byte = _byte;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("binary")
+  public byte[] getBinary() {
+    return binary;
+  }
+  public void setBinary(byte[] binary) {
+    this.binary = binary;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("date")
+  public Date getDate() {
+    return date;
+  }
+  public void setDate(Date date) {
+    this.date = date;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("dateTime")
+  public Date getDateTime() {
+    return dateTime;
+  }
+  public void setDateTime(Date dateTime) {
+    this.dateTime = dateTime;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("password")
+  public String getPassword() {
+    return password;
+  }
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FormatTest formatTest = (FormatTest) o;
+    return Objects.equals(integer, formatTest.integer) &&
+        Objects.equals(int32, formatTest.int32) &&
+        Objects.equals(int64, formatTest.int64) &&
+        Objects.equals(number, formatTest.number) &&
+        Objects.equals(_float, formatTest._float) &&
+        Objects.equals(_double, formatTest._double) &&
+        Objects.equals(string, formatTest.string) &&
+        Objects.equals(_byte, formatTest._byte) &&
+        Objects.equals(binary, formatTest.binary) &&
+        Objects.equals(date, formatTest.date) &&
+        Objects.equals(dateTime, formatTest.dateTime) &&
+        Objects.equals(password, formatTest.password);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, password);
+  }
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FormatTest {\n");
+    
+    sb.append("  integer: ").append(integer).append("\n");
+    sb.append("  int32: ").append(int32).append("\n");
+    sb.append("  int64: ").append(int64).append("\n");
+    sb.append("  number: ").append(number).append("\n");
+    sb.append("  _float: ").append(_float).append("\n");
+    sb.append("  _double: ").append(_double).append("\n");
+    sb.append("  string: ").append(string).append("\n");
+    sb.append("  _byte: ").append(_byte).append("\n");
+    sb.append("  binary: ").append(binary).append("\n");
+    sb.append("  date: ").append(date).append("\n");
+    sb.append("  dateTime: ").append(dateTime).append("\n");
+    sb.append("  password: ").append(password).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/spring-mvc/src/main/java/io/swagger/model/InlineResponse200.java
similarity index 53%
rename from samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Pet.java
rename to samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/InlineResponse200.java
index 1e62a0a60dd..9b7bd64697e 100644
--- a/samples/server/petstore/java-inflector/src/main/java/io/swagger/model/Pet.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/InlineResponse200.java
@@ -1,104 +1,36 @@
 package io.swagger.model;
 
-import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.model.Category;
 import io.swagger.model.Tag;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Objects;
 
 
-
-
-
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaInflectorServerCodegen", date = "2016-01-19T23:33:17.124+08:00")
-public class Pet   {
+@ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-15T00:36:54.567+08:00")
+public class InlineResponse200  {
   
+  private List<Tag> tags = new ArrayList<Tag>();
   private Long id = null;
-  private Category category = null;
+  private Object category = null;
+  public enum StatusEnum {
+     available,  pending,  sold, 
+  };
+  
+  private StatusEnum status = null;
   private String name = null;
   private List<String> photoUrls = new ArrayList<String>();
-  private List<Tag> tags = new ArrayList<Tag>();
 
-
-  public enum StatusEnum {
-    AVAILABLE("available"),
-    PENDING("pending"),
-    SOLD("sold");
-
-    private String value;
-
-    StatusEnum(String value) {
-      this.value = value;
-    }
-
-    @Override
-    @JsonValue
-    public String toString() {
-      return value;
-    }
-  }
-
-  private StatusEnum status = null;
-
-  
   /**
    **/
-  
-  @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() {
@@ -108,11 +40,31 @@ public class Pet   {
     this.tags = tags;
   }
 
-  
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("category")
+  public Object getCategory() {
+    return category;
+  }
+  public void setCategory(Object category) {
+    this.category = category;
+  }
+
   /**
    * pet status in the store
    **/
-  
   @ApiModelProperty(value = "pet status in the store")
   @JsonProperty("status")
   public StatusEnum getStatus() {
@@ -122,7 +74,28 @@ public class Pet   {
     this.status = status;
   }
 
-  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("photoUrls")
+  public List<String> getPhotoUrls() {
+    return photoUrls;
+  }
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -132,44 +105,32 @@ public class Pet   {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    Pet pet = (Pet) o;
-    return Objects.equals(id, pet.id) &&
-        Objects.equals(category, pet.category) &&
-        Objects.equals(name, pet.name) &&
-        Objects.equals(photoUrls, pet.photoUrls) &&
-        Objects.equals(tags, pet.tags) &&
-        Objects.equals(status, pet.status);
+    InlineResponse200 inlineResponse200 = (InlineResponse200) o;
+    return Objects.equals(tags, inlineResponse200.tags) &&
+        Objects.equals(id, inlineResponse200.id) &&
+        Objects.equals(category, inlineResponse200.category) &&
+        Objects.equals(status, inlineResponse200.status) &&
+        Objects.equals(name, inlineResponse200.name) &&
+        Objects.equals(photoUrls, inlineResponse200.photoUrls);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, category, name, photoUrls, tags, status);
+    return Objects.hash(tags, id, category, status, name, photoUrls);
   }
 
   @Override
-  public String toString() {
+  public String toString()  {
     StringBuilder sb = new StringBuilder();
-    sb.append("class Pet {\n");
+    sb.append("class InlineResponse200 {\n");
     
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
-    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("}");
+    sb.append("  tags: ").append(tags).append("\n");
+    sb.append("  id: ").append(id).append("\n");
+    sb.append("  category: ").append(category).append("\n");
+    sb.append("  status: ").append(status).append("\n");
+    sb.append("  name: ").append(name).append("\n");
+    sb.append("  photoUrls: ").append(photoUrls).append("\n");
+    sb.append("}\n");
     return sb.toString();
   }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
 }
-
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Model200Response.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Model200Response.java
new file mode 100644
index 00000000000..d0babbf10ba
--- /dev/null
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Model200Response.java
@@ -0,0 +1,60 @@
+package io.swagger.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Objects;
+
+
+/**
+ * Model for testing model name starting with number
+ **/
+@ApiModel(description = "Model for testing model name starting with number")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-15T00:36:54.567+08:00")
+public class Model200Response  {
+  
+  private Integer name = null;
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("name")
+  public Integer getName() {
+    return name;
+  }
+  public void setName(Integer name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Model200Response _200Response = (Model200Response) o;
+    return Objects.equals(name, _200Response.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name);
+  }
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Model200Response {\n");
+    
+    sb.append("  name: ").append(name).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ModelReturn.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ModelReturn.java
new file mode 100644
index 00000000000..04b1ea734f2
--- /dev/null
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ModelReturn.java
@@ -0,0 +1,60 @@
+package io.swagger.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Objects;
+
+
+/**
+ * Model for testing reserved words
+ **/
+@ApiModel(description = "Model for testing reserved words")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-15T00:36:54.567+08:00")
+public class ModelReturn  {
+  
+  private Integer _return = null;
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("return")
+  public Integer getReturn() {
+    return _return;
+  }
+  public void setReturn(Integer _return) {
+    this._return = _return;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ModelReturn _return = (ModelReturn) o;
+    return Objects.equals(_return, _return._return);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(_return);
+  }
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ModelReturn {\n");
+    
+    sb.append("  _return: ").append(_return).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Name.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Name.java
new file mode 100644
index 00000000000..475abe42028
--- /dev/null
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Name.java
@@ -0,0 +1,74 @@
+package io.swagger.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Objects;
+
+
+/**
+ * Model for testing model name same as property name
+ **/
+@ApiModel(description = "Model for testing model name same as property name")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-15T00:36:54.567+08:00")
+public class Name  {
+  
+  private Integer name = null;
+  private Integer snakeCase = null;
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
+  public Integer getName() {
+    return name;
+  }
+  public void setName(Integer name) {
+    this.name = name;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("snake_case")
+  public Integer getSnakeCase() {
+    return snakeCase;
+  }
+  public void setSnakeCase(Integer snakeCase) {
+    this.snakeCase = snakeCase;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Name name = (Name) o;
+    return Objects.equals(name, name.name) &&
+        Objects.equals(snakeCase, name.snakeCase);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, snakeCase);
+  }
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Name {\n");
+    
+    sb.append("  name: ").append(name).append("\n");
+    sb.append("  snakeCase: ").append(snakeCase).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
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 19c3a0ed7da..9dd2d718ba3 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Order.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Order.java
@@ -13,7 +13,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:49:05.879+08:00")
 public class Order  {
   
   private Long id = null;
@@ -25,9 +25,8 @@ public class Order  {
   };
   
   private StatusEnum status = null;
-  private Boolean complete = null;
+  private Boolean complete = false;
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -39,7 +38,6 @@ public class Order  {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -51,7 +49,6 @@ public class Order  {
     this.petId = petId;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -63,7 +60,6 @@ public class Order  {
     this.quantity = quantity;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -75,7 +71,6 @@ public class Order  {
     this.shipDate = shipDate;
   }
 
-  
   /**
    * Order Status
    **/
@@ -88,7 +83,6 @@ public class Order  {
     this.status = status;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -100,7 +94,6 @@ public class Order  {
     this.complete = complete;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
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 dfe4f8ab170..2a85f8f23c5 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
@@ -16,7 +16,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:49:05.879+08:00")
 public class Pet  {
   
   private Long id = null;
@@ -30,7 +30,6 @@ public class Pet  {
   
   private StatusEnum status = null;
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -42,7 +41,6 @@ public class Pet  {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -54,7 +52,6 @@ public class Pet  {
     this.category = category;
   }
 
-  
   /**
    **/
   @ApiModelProperty(required = true, value = "")
@@ -66,7 +63,6 @@ public class Pet  {
     this.name = name;
   }
 
-  
   /**
    **/
   @ApiModelProperty(required = true, value = "")
@@ -78,7 +74,6 @@ public class Pet  {
     this.photoUrls = photoUrls;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -90,7 +85,6 @@ public class Pet  {
     this.tags = tags;
   }
 
-  
   /**
    * pet status in the store
    **/
@@ -103,7 +97,6 @@ public class Pet  {
     this.status = status;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/SpecialModelName.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/SpecialModelName.java
new file mode 100644
index 00000000000..0aaad51d9f3
--- /dev/null
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/SpecialModelName.java
@@ -0,0 +1,57 @@
+package io.swagger.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Objects;
+
+
+@ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-15T00:36:54.567+08:00")
+public class SpecialModelName  {
+  
+  private Long specialPropertyName = null;
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("$special[property.name]")
+  public Long getSpecialPropertyName() {
+    return specialPropertyName;
+  }
+  public void setSpecialPropertyName(Long specialPropertyName) {
+    this.specialPropertyName = specialPropertyName;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    SpecialModelName specialModelName = (SpecialModelName) o;
+    return Objects.equals(specialPropertyName, specialModelName.specialPropertyName);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(specialPropertyName);
+  }
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class SpecialModelName {\n");
+    
+    sb.append("  specialPropertyName: ").append(specialPropertyName).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
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 af418119b39..911ea429dc7 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
@@ -11,13 +11,12 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:49:05.879+08:00")
 public class Tag  {
   
   private Long id = null;
   private String name = null;
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -29,7 +28,6 @@ public class Tag  {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -41,7 +39,6 @@ public class Tag  {
     this.name = name;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {
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 1862568a35e..1bb2c285432 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
@@ -11,7 +11,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-02-26T13:58:54.483Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-04-17T17:49:05.879+08:00")
 public class User  {
   
   private Long id = null;
@@ -23,7 +23,6 @@ public class User  {
   private String phone = null;
   private Integer userStatus = null;
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -35,7 +34,6 @@ public class User  {
     this.id = id;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -47,7 +45,6 @@ public class User  {
     this.username = username;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -59,7 +56,6 @@ public class User  {
     this.firstName = firstName;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -71,7 +67,6 @@ public class User  {
     this.lastName = lastName;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -83,7 +78,6 @@ public class User  {
     this.email = email;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -95,7 +89,6 @@ public class User  {
     this.password = password;
   }
 
-  
   /**
    **/
   @ApiModelProperty(value = "")
@@ -107,7 +100,6 @@ public class User  {
     this.phone = phone;
   }
 
-  
   /**
    * User Status
    **/
@@ -120,7 +112,6 @@ public class User  {
     this.userStatus = userStatus;
   }
 
-  
 
   @Override
   public boolean equals(Object o) {